[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 355 bytes --]

I was experimenting with creating bootstrap-tarballs for powerpc-linux
and it turns out that 'a.out.h' is no longer in the linux headers.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: 0001-make-bootstrap-Adjust-copied-linux-headers.patch --]
[-- Type: text/plain, Size: 1026 bytes --]

From 1a4f163ca174d5edc09db0dacd2ff188ee4cc1ae Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 5 Nov 2019 14:55:05 +0200
Subject: [PATCH] make-bootstrap: Adjust copied linux headers.

* guix/build/make-bootstrap.scm (copy-linux-headers): Remove header
file 'a.out.h' is no longer part of the linux kernel headers.
---
 guix/build/make-bootstrap.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
index e5ef1d6d2b..0d29338ce3 100644
--- a/guix/build/make-bootstrap.scm
+++ b/guix/build/make-bootstrap.scm
@@ -47,7 +47,6 @@ bootstrap libc."
                 (install-file (pk 'src (string-append kernel-headers "/include/linux/" file))
                               (pk 'dest (string-append incdir "/linux"))))
               '(
-                "a.out.h"               ; for 2.2.5
                 "atalk.h"               ; for 2.2.5
                 "errno.h"
                 "falloc.h"
-- 
2.24.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[Ludovic Courtès]

Hello,

Efraim Flashner <efraim@flashner.co.il> skribis:

> I was experimenting with creating bootstrap-tarballs for powerpc-linux
> and it turns out that 'a.out.h' is no longer in the linux headers.

It works for me though:

--8<---------------cut here---------------start------------->8---
$ guix build -e '(@@ (gnu packages make-bootstrap) %linux-libre-headers-stripped)'
/gnu/store/bz4g5bh2mkihh1w38qg99phlnl7drfv3-linux-libre-headers-stripped-4.19.56
$ guix describe
Generacio 115	Nov 11 2019 21:33:10	(nuna)
  guix a2161c8
    repository URL: https://git.savannah.gnu.org/git/guix.git
    branch: master
    commit: a2161c861f8c971c5b9e547f1997be4b1d4ba529
--8<---------------cut here---------------end--------------->8---

Or is it something you noticed after upgrading ‘linux-libre-headers’?

Thanks,
Ludo’.

[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 3051 bytes --]

On Wed, Nov 13, 2019 at 11:14:29PM +0100, Ludovic Courtès wrote:
> Hello,
> 
> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > I was experimenting with creating bootstrap-tarballs for powerpc-linux
> > and it turns out that 'a.out.h' is no longer in the linux headers.
> 
> It works for me though:
> 
> --8<---------------cut here---------------start------------->8---
> $ guix build -e '(@@ (gnu packages make-bootstrap) %linux-libre-headers-stripped)'
> /gnu/store/bz4g5bh2mkihh1w38qg99phlnl7drfv3-linux-libre-headers-stripped-4.19.56
> $ guix describe
> Generacio 115	Nov 11 2019 21:33:10	(nuna)
>   guix a2161c8
>     repository URL: https://git.savannah.gnu.org/git/guix.git
>     branch: master
>     commit: a2161c861f8c971c5b9e547f1997be4b1d4ba529
> --8<---------------cut here---------------end--------------->8---
> 
> Or is it something you noticed after upgrading ‘linux-libre-headers’?
> 

I can't find the actual package piece to make it happen, but it happens
when building the glibc-stripped:

guix build --no-grafts --no-build-hook bootstrap-tarballs --target=powerpc-linux-gnu
The following derivations will be built:
   /gnu/store/4g4gzgzamm6drrw1vasgpmk1l8i4ysm1-bootstrap-tarballs-0.drv
   /gnu/store/70b1109af993j8gwc4axnjc73w1w9bbh-glibc-stripped-tarball-2.29.drv
   /gnu/store/m37c7qf2ga428f7kx1ingbm2cswmimw6-glibc-stripped-2.29.drv
builder for `/gnu/store/qmdvsqm62181mhgd7h2rjqw0adkqdayz-glibc-stripped-2.29' failed previously (cached)
build of /gnu/store/m37c7qf2ga428f7kx1ingbm2cswmimw6-glibc-stripped-2.29.drv failed
View build log at '/var/log/guix/drvs/m3/7c7qf2ga428f7kx1ingbm2cswmimw6-glibc-stripped-2.29.drv.gz'.
cannot build derivation `/gnu/store/70b1109af993j8gwc4axnjc73w1w9bbh-glibc-stripped-tarball-2.29.drv': 1 dependencies couldn't be built
cannot build derivation `/gnu/store/4g4gzgzamm6drrw1vasgpmk1l8i4ysm1-bootstrap-tarballs-0.drv': 1 dependencies couldn't be built
guix build: error: build of `/gnu/store/4g4gzgzamm6drrw1vasgpmk1l8i4ysm1-bootstrap-tarballs-0.drv' failed

;;; (src "/gnu/store/391glyjmliibp0xi1mq8mq6ad02cgyl1-linux-libre-headers-4.19.56/include/linux/a.out.h")

;;; (dest "/gnu/store/qmdvsqm62181mhgd7h2rjqw0adkqdayz-glibc-stripped-2.29/include/linux")
Backtrace:
           4 (primitive-load "/gnu/store/89bq4a8mbg36gjmqi7b0h0a80yz?")
In ice-9/eval.scm:
   191:35  3 (_ _)
In /gnu/store/q7w7k3mngscbzzdqmj57726radqzagn4-module-import/guix/build/make-bootstrap.scm:
     46:4  2 (copy-linux-headers _ "/gnu/store/391glyjmliibp0xi1mq8m?")
In srfi/srfi-1.scm:
    640:9  1 (for-each #<procedure 7fffef04f840 at /gnu/store/q7w7k?> ?)
In unknown file:
           0 (copy-file "/gnu/store/391glyjmliibp0xi1mq8mq6ad02cgyl?" ?)

ERROR: In procedure copy-file:
In procedure copy-file: No such file or directory


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[Ludovic Courtès]

Hello,

Efraim Flashner <efraim@flashner.co.il> skribis:

> I can't find the actual package piece to make it happen, but it happens
> when building the glibc-stripped:
>
> guix build --no-grafts --no-build-hook bootstrap-tarballs --target=powerpc-linux-gnu
> The following derivations will be built:
>    /gnu/store/4g4gzgzamm6drrw1vasgpmk1l8i4ysm1-bootstrap-tarballs-0.drv
>    /gnu/store/70b1109af993j8gwc4axnjc73w1w9bbh-glibc-stripped-tarball-2.29.drv
>    /gnu/store/m37c7qf2ga428f7kx1ingbm2cswmimw6-glibc-stripped-2.29.drv
> builder for `/gnu/store/qmdvsqm62181mhgd7h2rjqw0adkqdayz-glibc-stripped-2.29' failed previously (cached)
> build of /gnu/store/m37c7qf2ga428f7kx1ingbm2cswmimw6-glibc-stripped-2.29.drv failed
> View build log at '/var/log/guix/drvs/m3/7c7qf2ga428f7kx1ingbm2cswmimw6-glibc-stripped-2.29.drv.gz'.
> cannot build derivation `/gnu/store/70b1109af993j8gwc4axnjc73w1w9bbh-glibc-stripped-tarball-2.29.drv': 1 dependencies couldn't be built
> cannot build derivation `/gnu/store/4g4gzgzamm6drrw1vasgpmk1l8i4ysm1-bootstrap-tarballs-0.drv': 1 dependencies couldn't be built
> guix build: error: build of `/gnu/store/4g4gzgzamm6drrw1vasgpmk1l8i4ysm1-bootstrap-tarballs-0.drv' failed
>
> ;;; (src "/gnu/store/391glyjmliibp0xi1mq8mq6ad02cgyl1-linux-libre-headers-4.19.56/include/linux/a.out.h")
>
> ;;; (dest "/gnu/store/qmdvsqm62181mhgd7h2rjqw0adkqdayz-glibc-stripped-2.29/include/linux")
> Backtrace:
>            4 (primitive-load "/gnu/store/89bq4a8mbg36gjmqi7b0h0a80yz?")
> In ice-9/eval.scm:
>    191:35  3 (_ _)
> In /gnu/store/q7w7k3mngscbzzdqmj57726radqzagn4-module-import/guix/build/make-bootstrap.scm:
>      46:4  2 (copy-linux-headers _ "/gnu/store/391glyjmliibp0xi1mq8m?")
> In srfi/srfi-1.scm:
>     640:9  1 (for-each #<procedure 7fffef04f840 at /gnu/store/q7w7k?> ?)
> In unknown file:
>            0 (copy-file "/gnu/store/391glyjmliibp0xi1mq8mq6ad02cgyl?" ?)
>
> ERROR: In procedure copy-file:
> In procedure copy-file: No such file or directory

Oh, got it; the problem shows up only when cross-compiling, it seems.

So I guess you can go ahead and push.  If this ‘a.out’ file turns out to
be needed somewhere during bootstrap, which seems unlikely, we can
always revisit this issue.

Thank you!

Ludo’.

bug#38069: [PATCH]: Adjust make-bootstrap linux headers

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

Ok. Patch pushed


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[Ludovic Courtès]

Hello,

Efraim Flashner <efraim@flashner.co.il> skribis:

> From 1a4f163ca174d5edc09db0dacd2ff188ee4cc1ae Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> Date: Tue, 5 Nov 2019 14:55:05 +0200
> Subject: [PATCH] make-bootstrap: Adjust copied linux headers.
>
> * guix/build/make-bootstrap.scm (copy-linux-headers): Remove header
> file 'a.out.h' is no longer part of the linux kernel headers.
> ---
>  guix/build/make-bootstrap.scm | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
> index e5ef1d6d2b..0d29338ce3 100644
> --- a/guix/build/make-bootstrap.scm
> +++ b/guix/build/make-bootstrap.scm
> @@ -47,7 +47,6 @@ bootstrap libc."
>                  (install-file (pk 'src (string-append kernel-headers "/include/linux/" file))
>                                (pk 'dest (string-append incdir "/linux"))))
>                '(
> -                "a.out.h"               ; for 2.2.5

Looking at the comment here, which was added by Janneke, I suspect this
header is actually required to build glibc 2.2.5 in commencement.scm.
Did I get it right, Janneke?

If so, perhaps we should reinstate it and simply add a

  when (file-exists? file)

guard before calling ‘install-file’?

Thanks,
Ludo’.

[bug#38069] [PATCH]: Adjust make-bootstrap linux headers

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> Ok. Patch pushed

Cool, thank you!

Ludo’.