From: Mark H Weaver <mhw@netris.org>
To: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Cc: guix-devel@gnu.org, 30537@debbugs.gnu.org
Subject: bug#30537: glibc 2.26 refuses to run on CentOS 6.8
Date: Wed, 21 Feb 2018 18:12:31 -0500 [thread overview]
Message-ID: <87bmgiey3k.fsf__48078.8094028414$1519254862$gmane$org@netris.org> (raw)
In-Reply-To: <878tbosr7h.fsf@mdc-berlin.de> (Ricardo Wurmus's message of "Mon, 19 Feb 2018 20:41:07 +0100")
Hi Ricardo,
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:
> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:
>
>> Here’s a patch to graft the glibc to apply the patch to allow the 2.6.32
>> kernel. I’m going to apply this at work now.
>
> That patch had a couple of problems. Here’s a new version.
[...]
> diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
> index b2c1d232f..111bbbcec 100644
> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -12,6 +12,7 @@
> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -537,6 +538,7 @@ store.")
> ;; Note: Always use a dot after the minor version since various places rely
> ;; on "version-major+minor" to determine where locales are found.
> (version "2.26.105-g0890d5379c")
> + (replacement glibc-2.26-patched)
> (source (origin
> (method url-fetch)
> (uri (string-append "https://alpha.gnu.org/gnu/guix/mirror/"
> @@ -839,10 +841,20 @@ GLIBC/HURD for a Hurd host"
> ;; Below are old libc versions, which we use mostly to build locale data in
> ;; the old format (which the new libc cannot cope with.)
>
> +(define glibc-2.26-patched
> + (package
> + (inherit glibc)
> + (replacement #f)
> + (source (origin
> + (inherit (package-source glibc))
> + (patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch")
> + (origin-patches (package-source glibc))))))))
> +
> (define-public glibc-2.25
> (package
> (inherit glibc)
> (version "2.25")
> + (replacement #f)
> (source (origin
> (inherit (package-source glibc))
> (uri (string-append "mirror://gnu/glibc/glibc-"
> @@ -862,6 +874,7 @@ GLIBC/HURD for a Hurd host"
> (package
> (inherit glibc)
> (version "2.24")
> + (replacement #f)
> (source (origin
> (inherit (package-source glibc))
> (uri (string-append "mirror://gnu/glibc/glibc-"
> @@ -882,6 +895,7 @@ GLIBC/HURD for a Hurd host"
> (package
> (inherit glibc)
> (version "2.23")
> + (replacement #f)
> (source (origin
> (inherit (package-source glibc))
> (uri (string-append "mirror://gnu/glibc/glibc-"
> @@ -905,6 +919,7 @@ GLIBC/HURD for a Hurd host"
> (package
> (inherit glibc)
> (version "2.22")
> + (replacement #f)
> (source (origin
> (inherit (package-source glibc))
> (uri (string-append "mirror://gnu/glibc/glibc-"
These (replacement #f) fields should not be needed. 'replacement' is
now an 'innate' field of the package record type, which means that it is
not inherited.
> diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
> index 7286e954c..db43691fd 100644
> --- a/gnu/packages/commencement.scm
> +++ b/gnu/packages/commencement.scm
> @@ -4,6 +4,7 @@
> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -486,7 +487,7 @@ the bootstrap environment."
> ;; built just below; the only difference is that this one uses the
> ;; bootstrap Bash.
> (package-with-bootstrap-guile
> - (package (inherit glibc)
> + (package/inherit glibc
> (name "glibc-intermediate")
> (arguments
> `(#:guile ,%bootstrap-guile
> @@ -664,7 +665,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
>
> (define glibc-final
> ;; The final glibc, which embeds the statically-linked Bash built above.
> - (package (inherit glibc-final-with-bootstrap-bash)
> + (package/inherit glibc-final-with-bootstrap-bash
> (name "glibc")
> (inputs `(("static-bash" ,static-bash-for-glibc)
> ,@(alist-delete
We seem to be oscillating on the question of whether to graft these
early GLIBCs. In June 2017, I switched to using 'package/inherit' here
in commit 13f7f2fd2b208c29361ef2290f55911879a6adf2, and in October those
changes were reverted in commit 848f550f2c105326dc3be4033c8aaf35ec21cde4
by Efraim, although I'm not sure why.
It'll be painful to have *everything* grafted until the next
core-updates cycle, but I suppose it's necessary.
Thanks,
Mark
next prev parent reply other threads:[~2018-02-21 23:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 18:46 glibc 2.26 refuses to run on CentOS 6.8 Ricardo Wurmus
2018-02-19 18:49 ` Ricardo Wurmus
2018-02-19 19:09 ` Ricardo Wurmus
2018-02-19 19:28 ` Danny Milosavljevic
2018-02-19 21:22 ` Ricardo Wurmus
2018-02-19 22:46 ` Danny Milosavljevic
2018-02-19 19:41 ` bug#30537: " Ricardo Wurmus
2018-02-19 19:41 ` Ricardo Wurmus
2018-02-19 20:28 ` bug#30537: " Jan Nieuwenhuizen
2018-02-21 23:12 ` Mark H Weaver
2018-02-22 20:30 ` Efraim Flashner
2018-02-22 20:30 ` Efraim Flashner
2018-02-23 22:01 ` bug#30537: Grafts vs. early bootstrapping packages Ludovic Courtès
2018-02-21 23:12 ` Mark H Weaver [this message]
2018-02-20 1:22 ` bug#30537: glibc 2.26 refuses to run on CentOS 6.8 Leo Famulari
2018-02-20 11:52 ` Leo Famulari
2018-02-20 12:34 ` Ricardo Wurmus
2018-02-20 12:51 ` Leo Famulari
2018-02-20 14:33 ` Ricardo Wurmus
2018-02-20 17:55 ` Ricardo Wurmus
2018-02-20 9:39 ` Efraim Flashner
2018-02-23 22:26 ` Ludovic Courtès
2018-02-23 22:26 ` bug#30537: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='87bmgiey3k.fsf__48078.8094028414$1519254862$gmane$org@netris.org' \
--to=mhw@netris.org \
--cc=30537@debbugs.gnu.org \
--cc=guix-devel@gnu.org \
--cc=ricardo.wurmus@mdc-berlin.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.