From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 13 Mar 2019 22:03:37 +0000 (+0000)
Subject: Use Linux 5.0 in build-many-glibcs.py.
X-Git-Tag: glibc-2.30~287
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c1041ee5b2889db7cf8bb75da05117c512b1191;p=thirdparty%2Fglibc.git

Use Linux 5.0 in build-many-glibcs.py.

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.

	* 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/ChangeLog b/ChangeLog
index 94ffb74c98c..f2cdcd7a667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-03-13  Joseph Myers  <joseph@codesourcery.com>
+
+	* scripts/build-many-glibcs.py (Context.checkout): Default Linux
+	version to 5.0.
+	(Context.checkout_tar): Handle variable major version for Linux
+	kernel.
+
 2019-03-13  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #24047]
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 54b84728e57..fd811af9b30 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()