[bug#49434] [PATCH 0/2] Update bootstrap tarballs

[bug#49434] [PATCH 0/2] Update bootstrap tarballs

[Efraim Flashner]

As part of the riscv64-linux bootstrap I found it necessary to update
the bootstrap tarballs. As part of the riscv64-linux patch series I will
put together a patch which changes (gnu packages bootstrap) to use
guile-3.0 when appropriate.


Efraim Flashner (2):
  gnu: bootstrap-tarballs: Build with gcc-7.
  gnu: bootstrap-tarballs: Use guile-3.0 bootstrap tarball.

 gnu/packages/make-bootstrap.scm | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)


base-commit: aa6e6fb2e9ea231d12d49a8925fddd8d2686ea94
-- 
2.32.0

[bug#49434] [PATCH 1/2] gnu: bootstrap-tarballs: Build with gcc-7.

[Efraim Flashner]

* gnu/packages/make-bootstrap.scm (gcc-for-bootstrap)[Inherit]: Inherit
from gcc-7.
[inputs]: Use package-inputs from gcc-7.
(package-with-relocatable-glibc)[native-inputs]: Have cross-gcc use
gcc-7.
(%gcc-static)[inherit]: Inherit from gcc-7.
[arguments]: Use package-arguments from gcc-7.
[inputs]: Replace isl-0.18 with isl. Use package-inputs from gcc-7.
[native-inputs]: Use package-native-inputs from gcc-7.
(%gcc-stripped)[inherit]: Inherit from gcc-7.
---
 gnu/packages/make-bootstrap.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index bf76d5052f..ff9376e91f 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@@ -94,13 +94,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
   (mlambdaq (glibc)
     "Return a variant of GCC that uses the bootstrap variant of GLIBC."
     (package
-      (inherit gcc-5)
+      (inherit gcc-7)
       (outputs '("out")) ;all in one so libgcc_s is easily found
       (inputs
        `( ;; Distinguish the name so we can refer to it below.
          ("bootstrap-libc" ,(glibc-for-bootstrap glibc))
          ("libc:static" ,(glibc-for-bootstrap glibc) "static")
-         ,@(package-inputs gcc-5))))))
+         ,@(package-inputs gcc-7))))))
 
 (define (package-with-relocatable-glibc p)
   "Return a variant of P that uses the libc as defined by
@@ -139,7 +139,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                              (cons (search-path-specification
                                     (variable "CROSS_CPLUS_INCLUDE_PATH")
                                     (files '("include")))
-                                   (package-search-paths gcc-5)))))
+                                   (package-search-paths gcc-7)))))
             ("cross-binutils" ,(cross-binutils target))
             ,@(%final-inputs)))
         `(("libc" ,(glibc-for-bootstrap glibc))
@@ -461,11 +461,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
 (define %gcc-static
   ;; A statically-linked GCC, with stripped-down functionality.
   (package-with-relocatable-glibc
-   (package (inherit gcc-5)
+   (package (inherit gcc-7)
      (name "gcc-static")
      (outputs '("out"))                           ; all in one
      (arguments
-      (substitute-keyword-arguments (package-arguments gcc-5)
+      (substitute-keyword-arguments (package-arguments gcc-7)
         ((#:modules modules %gnu-build-system-modules)
          `((srfi srfi-1)
            (srfi srfi-26)
@@ -515,8 +515,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                 #t))))))
      (inputs
       `(("zlib:static" ,zlib "static")
-        ("isl:static" ,isl-0.18 "static")
-        ,@(package-inputs gcc-5)))
+        ("isl:static" ,isl "static")
+        ,@(package-inputs gcc-7)))
      (native-inputs
       (if (%current-target-system)
           `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both
@@ -529,12 +529,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
             ("gmp-native" ,gmp)
             ("mpfr-native" ,mpfr)
             ("mpc-native" ,mpc)
-            ,@(package-native-inputs gcc-5))
-          (package-native-inputs gcc-5))))))
+            ,@(package-native-inputs gcc-7))
+          (package-native-inputs gcc-7))))))
 
 (define %gcc-stripped
   ;; The subset of GCC files needed for bootstrap.
-  (package (inherit gcc-5)
+  (package (inherit gcc-7)
     (name "gcc-stripped")
     (build-system trivial-build-system)
     (source #f)
-- 
2.32.0

[bug#49434] [PATCH 2/2] gnu: bootstrap-tarballs: Use guile-3.0 bootstrap tarball.

[Efraim Flashner]

* gnu/packages/make-bootstrap.scm (%guile-bootstrap-tarball): Use
guile-3.0.
(%guile-static-stripped): Remove variable.
---
 gnu/packages/make-bootstrap.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index ff9376e91f..d66acc2e70 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -55,7 +55,6 @@
             %mes-bootstrap-tarball
             %bootstrap-tarballs
 
-            %guile-static-stripped
             %guile-3.0-static-stripped))
 
 ;;; Commentary:
@@ -799,12 +798,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
     (outputs '("out"))
     (synopsis "Minimal statically-linked and relocatable Guile")))
 
-(define %guile-static-stripped
-  ;; A stripped static Guile binary, for use during bootstrap.
-  (make-guile-static-stripped %guile-static))
-
 (define %guile-3.0-static-stripped
-  ;; A stripped static Guile 3.0 binary, for use in initrds.
+  ;; A stripped static Guile 3.0 binary, for use in initrds
+  ;; and during bootstrap.
   (make-guile-static-stripped
    (make-guile-static guile-3.0
                       '("guile-2.2-default-utf8.patch"
@@ -867,7 +863,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
 
 (define %guile-bootstrap-tarball
   ;; A tarball with the statically-linked, relocatable Guile.
-  (tarball-package %guile-static-stripped))
+  (tarball-package %guile-3.0-static-stripped))
 
 (define %mescc-tools-bootstrap-tarball
   ;; A tarball with statically-linked MesCC binary seed.
-- 
2.32.0

[bug#49434] [PATCH 0/2] Update bootstrap tarballs

[Ludovic Courtès]

Hi!

s/bootstrap-tarballs/make-bootstrap/ in the commit’s subject line.

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

> * gnu/packages/make-bootstrap.scm (gcc-for-bootstrap)[Inherit]: Inherit
> from gcc-7.
> [inputs]: Use package-inputs from gcc-7.
> (package-with-relocatable-glibc)[native-inputs]: Have cross-gcc use
> gcc-7.
> (%gcc-static)[inherit]: Inherit from gcc-7.
> [arguments]: Use package-arguments from gcc-7.
> [inputs]: Replace isl-0.18 with isl. Use package-inputs from gcc-7.
> [native-inputs]: Use package-native-inputs from gcc-7.
> (%gcc-stripped)[inherit]: Inherit from gcc-7.

LGTM!  Unless I’m mistaken, this can go to ‘master’.

Ludo’.

[bug#49434] [PATCH 0/2] Update bootstrap tarballs

[Ludovic Courtès]

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

> * gnu/packages/make-bootstrap.scm (%guile-bootstrap-tarball): Use
> guile-3.0.
> (%guile-static-stripped): Remove variable.

Same comment regarding the commit’s subject line.

[...]

>  (define %guile-3.0-static-stripped
> -  ;; A stripped static Guile 3.0 binary, for use in initrds.
> +  ;; A stripped static Guile 3.0 binary, for use in initrds
> +  ;; and during bootstrap.

Maybe drop “-3.0” from the variable name?

It’ss worth checking whether this impacts the initrd code; “make
check-system TESTS=basic” should catch regressions.

Otherwise LGTM, thanks!

Ludo’.

[bug#49434] [PATCH 0/2] Update bootstrap tarballs

[Efraim Flashner]

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

On Tue, Jul 06, 2021 at 04:38:08PM +0200, Ludovic Courtès wrote:
> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > * gnu/packages/make-bootstrap.scm (%guile-bootstrap-tarball): Use
> > guile-3.0.
> > (%guile-static-stripped): Remove variable.
> 
> Same comment regarding the commit’s subject line.
> 
> [...]
> 
> >  (define %guile-3.0-static-stripped
> > -  ;; A stripped static Guile 3.0 binary, for use in initrds.
> > +  ;; A stripped static Guile 3.0 binary, for use in initrds
> > +  ;; and during bootstrap.
> 
> Maybe drop “-3.0” from the variable name?
> 
> It’ss worth checking whether this impacts the initrd code; “make
> check-system TESTS=basic” should catch regressions.
> 
> Otherwise LGTM, thanks!
> 
> Ludo’.

QEMU runs as PID 18
connected to QEMU's monitor
read QEMU monitor prompt
connected to guest REPL
%%%% Starting test basic  (Writing full log to "basic.log")
marionette is ready

;;; (services (console-font-tty1 term-tty5 file-systems loopback term-tty2 term-auto console-font-tty3 term-tty4 term-tty3 nscd marionette term-tty1 root user)
# of expected passes      27
# of skipped tests        1
successfully built /gnu/store/b5qh7nmw16xsn8h8da8vvy7pqqbkfxnj-basic.drv
/gnu/store/jjd04fjpsibwp7iyj3jggiam9z7av934-basic

I'll push it as a separate commit.

-- 
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#49434: [PATCH 0/2] Update bootstrap tarballs

[Efraim Flashner]

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

On Tue, Jul 06, 2021 at 04:36:44PM +0200, Ludovic Courtès wrote:
> Hi!
> 
> s/bootstrap-tarballs/make-bootstrap/ in the commit’s subject line.
> 
> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > * gnu/packages/make-bootstrap.scm (gcc-for-bootstrap)[Inherit]: Inherit
> > from gcc-7.
> > [inputs]: Use package-inputs from gcc-7.
> > (package-with-relocatable-glibc)[native-inputs]: Have cross-gcc use
> > gcc-7.
> > (%gcc-static)[inherit]: Inherit from gcc-7.
> > [arguments]: Use package-arguments from gcc-7.
> > [inputs]: Replace isl-0.18 with isl. Use package-inputs from gcc-7.
> > [native-inputs]: Use package-native-inputs from gcc-7.
> > (%gcc-stripped)[inherit]: Inherit from gcc-7.
> 
> LGTM!  Unless I’m mistaken, this can go to ‘master’.
> 
> Ludo’.

That was certainly the plan. Something with less churn at that level
makes it easier to work against.

Patches pushed! Thanks.

-- 
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 --]