diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | scripts/build-many-glibcs.py | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 94ffb74c98..f2cdcd7a66 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 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() |