From patchwork Wed Mar 13 22:04:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 31849 Received: (qmail 65884 invoked by alias); 13 Mar 2019 22:04:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 65874 invoked by uid 89); 13 Mar 2019 22:04:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: relay1.mentorg.com Date: Wed, 13 Mar 2019 22:04:13 +0000 From: Joseph Myers To: Subject: Use Linux 5.0 in build-many-glibcs.py [committed] Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 This patch makes build-many-glibcs.py use Linux 5.0 in place of 4.20 (now that the test change required to avoid false positives with ulong in kernel headers has been committed). This includes adjusting the logic to compute a tarball URL to handle different major version numbers (rather than changing the path to hardcode v5.x in place of v4.x, as someone might still wish to check out a v4.x version). Tested that build-many-glibcs.py successfully checks out Linux 5.0 sources after this patch. 2019-03-13 Joseph Myers * scripts/build-many-glibcs.py (Context.checkout): Default Linux version to 5.0. (Context.checkout_tar): Handle variable major version for Linux kernel. diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 54b84728e5..fd811af9b3 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -714,7 +714,7 @@ class Context(object): 'gcc': 'vcs-8', 'glibc': 'vcs-mainline', 'gmp': '6.1.2', - 'linux': '4.20', + 'linux': '5.0', 'mpc': '1.1.0', 'mpfr': '4.0.2', 'mig': 'vcs-mainline', @@ -889,7 +889,7 @@ class Context(object): url_map = {'binutils': 'https://ftp.gnu.org/gnu/binutils/binutils-%(version)s.tar.bz2', 'gcc': 'https://ftp.gnu.org/gnu/gcc/gcc-%(version)s/gcc-%(version)s.tar.gz', 'gmp': 'https://ftp.gnu.org/gnu/gmp/gmp-%(version)s.tar.xz', - 'linux': 'https://www.kernel.org/pub/linux/kernel/v4.x/linux-%(version)s.tar.xz', + 'linux': 'https://www.kernel.org/pub/linux/kernel/v%(major)s.x/linux-%(version)s.tar.xz', 'mpc': 'https://ftp.gnu.org/gnu/mpc/mpc-%(version)s.tar.gz', 'mpfr': 'https://ftp.gnu.org/gnu/mpfr/mpfr-%(version)s.tar.xz', 'mig': 'https://ftp.gnu.org/gnu/mig/mig-%(version)s.tar.bz2', @@ -898,7 +898,8 @@ class Context(object): if component not in url_map: print('error: component %s coming from tarball' % component) exit(1) - url = url_map[component] % {'version': version} + version_major = version.split('.')[0] + url = url_map[component] % {'version': version, 'major': version_major} filename = os.path.join(self.srcdir, url.split('/')[-1]) response = urllib.request.urlopen(url) data = response.read()