From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58616) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCv7B-00070q-F1 for guix-patches@gnu.org; Tue, 24 Sep 2019 20:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCv78-0003jD-TH for guix-patches@gnu.org; Tue, 24 Sep 2019 20:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCv78-0003j0-OA for guix-patches@gnu.org; Tue, 24 Sep 2019 20:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iCv78-0005Rl-Fq for guix-patches@gnu.org; Tue, 24 Sep 2019 20:25:02 -0400 Subject: [bug#37466] [PATCH 2/4] gnu: Add heads. Resent-Message-ID: Date: Wed, 25 Sep 2019 02:24:39 +0200 From: Danny Milosavljevic Message-ID: <20190925022439.3c989874@scratchpost.org> In-Reply-To: <20190924164139.1d827100@scratchpost.org> References: <20190920010248.28082-1-dannym@scratchpost.org> <20190920073149.2933-1-dannym@scratchpost.org> <20190920073149.2933-2-dannym@scratchpost.org> <20190920140529.234c55ad@alma-ubu> <20190920154954.35713605@scratchpost.org> <20190924164018.082a3733@scratchpost.org> <20190924164139.1d827100@scratchpost.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/gBO_ZjAPq14DF+8+k_lB0kg"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Cc: 37466@debbugs.gnu.org --Sig_/gBO_ZjAPq14DF+8+k_lB0kg Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Better version: diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index 9128a4f426..01b9eeaa90 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -202,12 +202,13 @@ done (uri "https://www.coreboot.org/releases/coreboot-4.8.1.tar.xz") (sha256 (base32 "08xdd5drk8yd37a3z5hc81qmgsybv6201i28hcggxh980vdz9pgh"= )))) - ("linux" - ,(origin - (method url-fetch) - (uri "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.6= 2.tar.xz") - (sha256 - (base32 "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji"= )))) +; ("linux" +; ,(origin +; (method url-fetch) +; (uri "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.= 62.tar.xz") +; (sha256 +; (base32 "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji= ")))) + ("linux" ,linux-libre-4.14-source) ("musl" ; useless ,(origin (method url-fetch) @@ -422,13 +423,16 @@ done ;(invoke "tar" "-xf" source-file "-C" "build") )) (mkdir-p "packages") + (setenv "V" "1") ; verbose (setenv "GUIX_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "GUIX_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH= ")) (setenv "GUIX_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "GUIX_CPATH" (getenv "CPATH")) + (copy-file (assoc-ref inputs "linux") + "packages/linux-4.14.62.tar.xz.tmp") (for-each (lambda (name) (install-file* name "packages" ".tmp")) - '("linux" "coreboot-blobs" "coreboot" "busybox" "zl= ib" "mbedtls" "kexec-tools" "qrencode" "pciutils" "util-linux" "flashrom" "= popt" "lvm2" "cryptsetup" "libgpg-error" "libgcrypt" "libksba" "libassuan" = "npth" "libusb" "libusb-compat" "dropbear" "pinentry" "gnupg" "slang" "newt= " "musl")) + '("coreboot-blobs" "coreboot" "busybox" "zlib" "mbe= dtls" "kexec-tools" "qrencode" "pciutils" "util-linux" "flashrom" "popt" "l= vm2" "cryptsetup" "libgpg-error" "libgcrypt" "libksba" "libassuan" "npth" "= libusb" "libusb-compat" "dropbear" "pinentry" "gnupg" "slang" "newt" "musl"= )) (mkdir-p "build") (mkdir-p "build/musl-cross-git/tarballs") (mkdir-p "build/coreboot-4.8.1/util/crossgcc/tarballs") @@ -443,6 +447,9 @@ done (setenv "MUSL_DIR" (assoc-ref inputs "musl-cross")) (setenv "CROSS" (string-append (getenv "MUSL_DIR") "/crossgcc= /x86_64-linux-musl/bin/x86_64-musl-linux-")) ; Note: Useless (substitute* "Makefile" + ;; Disable checksum verification--we do it ourselves. + (("sha256sum --check") + "cat") ;; Disable our non-cross toolchain environment. (("CROSS_TOOLS_NOCC :=3D ") ; CPP=3D" (getenv "CROSS") "cpp CXXCPP=3D" (getenv "CROSS")= "cpp " @@ -461,11 +468,13 @@ done "CC_FOR_BUILD =3D $(HOSTCC)\n" ; for libgpg-= error "BUILD_CC =3D $(HOSTCC)\n")) ; for kexec-too= ls ;; Disable git, patch shebangs, and selectively re-enable ho= st compiler. + ;; (Note: $HOSTCC is too complicated for bash, for example + ;; HOSTCC=3D"a=3Db c=3Dd gcc", then issuing $HOSTCC won't w= ork). (("(git clone.*)." _ tar) - (format #f "(~a) && (cd $(build)/$($1_base_dir) && for s in= Makefile Makefile.in configure lib/configure config.sub config.guess tools= /install.sh tools/scripts/Makefile.include tools/power/cpupower/Makefile Ma= kefile.rules scripts/* applets/usage_compressed po/Makefile.in.in po/Makefi= le.in po/Makefile make.tmpl.in *-config.in src/*-config.in src/Makefile.in = applets/install.sh applets/busybox.mkll tests/pkits/* tests/openpgp/* tests= /fake-pinentries/fake-pinentry.sh tests/*/Makefile tests/inittests tests/ru= ntests tests/Makefile.in tests/runtest modules/test/runtests.sh src/test/ru= ntests.sh mkfiles/build.sh autoconf/* demo/Makefile.in slsh/Makefile.in uti= l/xcompile/xcompile util/genbuild_h/genbuild_h.sh ; do if [ -f \"$$$$s\" ] = ; then sed -i -e 's;/bin/sh\\>;~a/bin/sh;' -e 's;/bin/pwd\\>;pwd;' -e 's;/b= in/ln\\>;ln;' -e 's;/usr/bin/file\\>;file;' -e 's;/bin/false\\>;false;' -e = 's;/bin/bash\\>;~a/bin/bash;' -e 's;/usr/bin/env bash;~a/bin/bash;' -e 's;g= it clone;true clone;' -e 's;^TERMCAP=3D-ltermcap;TERMCAP=3D;' -e 's;^HOSTCC= .*$$$$;HOSTCC=3DC_INCLUDE_PATH=3D\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_P= ATH=3D\"$(GUIX_CPLUS_INCLUDE_PATH)\" CPATH=3D\"$(GUIX_CPATH)\" LIBRARY_PATH= =3D\"$(GUIX_LIBRARY_PATH)\" gcc;' \"$$$$s\" ; fi ; done) + (format #f "(~a) && (cd $(build)/$($1_base_dir) && for s in= Makefile Makefile.in configure lib/configure config.sub config.guess tools= /install.sh tools/scripts/Makefile.include tools/power/cpupower/Makefile Ma= kefile.rules scripts/* applets/usage_compressed applets/busybox.mkll applet= s/busybox.mksuid po/Makefile.in.in po/Makefile.in po/Makefile make.tmpl.in = *-config.in src/*-config.in src/Makefile.in applets/install.sh applets/busy= box.mkll tests/pkits/* tests/openpgp/* tests/fake-pinentries/fake-pinentry.= sh tests/*/Makefile tests/inittests tests/runtests tests/Makefile.in tests/= runtest modules/test/runtests.sh src/test/runtests.sh mkfiles/build.sh auto= conf/* demo/Makefile.in slsh/Makefile.in util/xcompile/xcompile util/genbui= ld_h/genbuild_h.sh ; do if [ -f \"$$$$s\" ] ; then sed -i -e 's;/bin/sh\\>;= ~a/bin/sh;' -e 's;/bin/pwd\\>;pwd;' -e 's;/bin/ln\\>;ln;' -e 's;/usr/bin/fi= le\\>;file;' -e 's;/bin/false\\>;false;' -e 's;/bin/bash\\>;~a/bin/bash;' -= e 's;/usr/bin/env bash;~a/bin/bash;' -e 's;git clone;true clone;' -e 's;^TE= RMCAP=3D-ltermcap;TERMCAP=3D;' -e 's;^HOSTCC.*$$$$;HOSTCC=3DC_INCLUDE_PATH= =3D\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_PATH=3D\"$(GUIX_CPLUS_INCLUDE_P= ATH)\" CPATH=3D\"$(GUIX_CPATH)\" LIBRARY_PATH=3D\"$(GUIX_LIBRARY_PATH)\" gc= c;' -e 's;^\\(\\$$$$HOSTCC[^|]*\\);(echo \\1 | bash);' \"$$$$s\" ; fi ; don= e) " "true" (assoc-ref inputs "bash") (assoc-ref inputs "bash") (assoc-ref in= puts "bash"))) (("(tar -xf.*)." _ tar) - (format #f "(~a) && (cd $(build)/$($1_base_dir) && for s in= Makefile Makefile.in configure lib/configure config.sub config.guess tools= /install.sh tools/scripts/Makefile.include tools/power/cpupower/Makefile Ma= kefile.rules scripts/* applets/usage_compressed po/Makefile.in.in po/Makefi= le.in po/Makefile make.tmpl.in *-config.in src/*-config.in src/Makefile.in = applets/install.sh applets/busybox.mkll tests/pkits/* tests/openpgp/* tests= /fake-pinentries/fake-pinentry.sh tests/*/Makefile tests/inittests tests/ru= ntests tests/Makefile.in tests/runtest modules/test/runtests.sh src/test/ru= ntests.sh mkfiles/build.sh autoconf/* demo/Makefile.in slsh/Makefile.in uti= l/xcompile/xcompile util/genbuild_h/genbuild_h.sh ; do if [ -f \"$$$$s\" ] = ; then sed -i -e 's;/bin/sh\\>;~a/bin/sh;' -e 's;^TERMCAP=3D-ltermcap;TERMC= AP=3D;' -e 's;/bin/pwd\\>;pwd;' -e 's;/bin/ln\\>;ln;' -e 's;/usr/bin/file\\= >;file;' -e 's;/bin/false\\>;false;' -e 's;/bin/bash\\>;~a/bin/bash;' -e 's= ;/usr/bin/env bash;~a/bin/bash;' -e 's;git clone;true clone;' -e 's;^HOSTCC= .*$$$$;HOSTCC=3DC_INCLUDE_PATH=3D\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_P= ATH=3D\"$(GUIX_CPLUS_INCLUDE_PATH)\" CPATH=3D\"$(GUIX_CPATH)\" LIBRARY_PATH= =3D\"$(GUIX_LIBRARY_PATH)\" gcc;' \"$$$$s\" ; fi ; done) + (format #f "(~a) && (cd $(build)/$($1_base_dir) && for s in= Makefile Makefile.in configure lib/configure config.sub config.guess tools= /install.sh tools/scripts/Makefile.include tools/power/cpupower/Makefile Ma= kefile.rules scripts/* applets/usage_compressed applets/busybox.mkll applet= s/busybox.mksuid po/Makefile.in.in po/Makefile.in po/Makefile make.tmpl.in = *-config.in src/*-config.in src/Makefile.in applets/install.sh applets/busy= box.mkll tests/pkits/* tests/openpgp/* tests/fake-pinentries/fake-pinentry.= sh tests/*/Makefile tests/inittests tests/runtests tests/Makefile.in tests/= runtest modules/test/runtests.sh src/test/runtests.sh mkfiles/build.sh auto= conf/* demo/Makefile.in slsh/Makefile.in util/xcompile/xcompile util/genbui= ld_h/genbuild_h.sh ; do if [ -f \"$$$$s\" ] ; then sed -i -e 's;/bin/sh\\>;= ~a/bin/sh;' -e 's;^TERMCAP=3D-ltermcap;TERMCAP=3D;' -e 's;/bin/pwd\\>;pwd;'= -e 's;/bin/ln\\>;ln;' -e 's;/usr/bin/file\\>;file;' -e 's;/bin/false\\>;fa= lse;' -e 's;/bin/bash\\>;~a/bin/bash;' -e 's;/usr/bin/env bash;~a/bin/bash;= ' -e 's;git clone;true clone;' -e 's;^HOSTCC.*$$$$;HOSTCC=3DC_INCLUDE_PATH= =3D\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_PATH=3D\"$(GUIX_CPLUS_INCLUDE_P= ATH)\" CPATH=3D\"$(GUIX_CPATH)\" LIBRARY_PATH=3D\"$(GUIX_LIBRARY_PATH)\" gc= c;' -e 's;^\\(\\$$$$HOSTCC[^|]*\\);(echo \\1 | bash);' \"$$$$s\" ; fi ; don= e) " tar (assoc-ref inputs "bash") (assoc-ref inputs "bash") (assoc-ref input= s "bash")))) ;(substitute* "modules/musl-cross" ; (("/bin/echo") "echo")) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 59874b097c..5b234a1ba9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -194,7 +194,7 @@ defconfig. Return the appropriate make target if appli= cable, otherwise return =20 (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.140" + "4.14.62" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) =20 @@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the = given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) =20 -(define-public linux-libre-4.14-version "4.14.142") +(define-public linux-libre-4.14-version "4.14.62") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz= 6"))) + (hash (base32 "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjj= i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) --Sig_/gBO_ZjAPq14DF+8+k_lB0kg Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl2Ks8cACgkQ5xo1VCww uqVYtQgAl3LkYQumV3//kaKRpVS309m4k/vZBV1EcB/4+/XRqP9991CDR07YTi9x /LbKNB15/xuwy/XOuAppl8VAHabvTMZafl7F1SzCFHcQka7QF7jF0/MuSkW5bVd0 ihyeppT3TOv79KgRXJNZtlhqbuWNodxDIkbvrZThkBVqFLSmict2wSwsHuIAGCpY HAb/3PIUHh5tZVeI5oWX/cIAvK/DFRJV+R1kdpCA4+7TxgezZ5W9XHRZSArmZIgc 60vw4mmgU5T64pt8H0YQhAlCG9zRmgEhLgk18gyd/N+5NysOQdcs7F4x/I2yHxIE aYuFTQhK5kzFm6S0lHiuJpnj8ZPwqg== =sl6l -----END PGP SIGNATURE----- --Sig_/gBO_ZjAPq14DF+8+k_lB0kg--