From: Danny Milosavljevic <dannym@scratchpost.org>
Cc: 37466@debbugs.gnu.org
Subject: [bug#37466] [PATCH 2/4] gnu: Add heads.
Date: Wed, 25 Sep 2019 02:24:39 +0200 [thread overview]
Message-ID: <20190925022439.3c989874@scratchpost.org> (raw)
In-Reply-To: <20190924164139.1d827100@scratchpost.org>
[-- Attachment #1: Type: text/plain, Size: 10263 bytes --]
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.62.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" "zlib" "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" "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"))
(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 := ")
; CPP=" (getenv "CROSS") "cpp CXXCPP=" (getenv "CROSS") "cpp "
@@ -461,11 +468,13 @@ done
"CC_FOR_BUILD = $(HOSTCC)\n" ; for libgpg-error
"BUILD_CC = $(HOSTCC)\n")) ; for kexec-tools
;; Disable git, patch shebangs, and selectively re-enable host compiler.
+ ;; (Note: $HOSTCC is too complicated for bash, for example
+ ;; HOSTCC="a=b c=d gcc", then issuing $HOSTCC won't work).
(("(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 Makefile.rules scripts/* applets/usage_compressed po/Makefile.in.in po/Makefile.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/runtests tests/Makefile.in tests/runtest modules/test/runtests.sh src/test/runtests.sh mkfiles/build.sh autoconf/* demo/Makefile.in slsh/Makefile.in util/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;/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;^TERMCAP=-ltermcap;TERMCAP=;' -e 's;^HOSTCC.*$$$$;HOSTCC=C_INCLUDE_PATH=\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_PATH=\"$(GUIX_CPLUS_INCLUDE_PATH)\" CPATH=\"$(GUIX_CPATH)\" LIBRARY_PATH=\"$(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 Makefile.rules scripts/* applets/usage_compressed applets/busybox.mkll applets/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/busybox.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 autoconf/* demo/Makefile.in slsh/Makefile.in util/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;/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;^TERMCAP=-ltermcap;TERMCAP=;' -e 's;^HOSTCC.*$$$$;HOSTCC=C_INCLUDE_PATH=\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_PATH=\"$(GUIX_CPLUS_INCLUDE_PATH)\" CPATH=\"$(GUIX_CPATH)\" LIBRARY_PATH=\"$(GUIX_LIBRARY_PATH)\" gcc;' -e 's;^\\(\\$$$$HOSTCC[^|]*\\);(echo \\1 | bash);' \"$$$$s\" ; fi ; done)
" "true" (assoc-ref inputs "bash") (assoc-ref inputs "bash") (assoc-ref inputs "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 Makefile.rules scripts/* applets/usage_compressed po/Makefile.in.in po/Makefile.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/runtests tests/Makefile.in tests/runtest modules/test/runtests.sh src/test/runtests.sh mkfiles/build.sh autoconf/* demo/Makefile.in slsh/Makefile.in util/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=-ltermcap;TERMCAP=;' -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=C_INCLUDE_PATH=\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_PATH=\"$(GUIX_CPLUS_INCLUDE_PATH)\" CPATH=\"$(GUIX_CPATH)\" LIBRARY_PATH=\"$(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 Makefile.rules scripts/* applets/usage_compressed applets/busybox.mkll applets/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/busybox.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 autoconf/* demo/Makefile.in slsh/Makefile.in util/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=-ltermcap;TERMCAP=;' -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=C_INCLUDE_PATH=\"$(GUIX_C_INCLUDE_PATH)\" CPLUS_INCLUDE_PATH=\"$(GUIX_CPLUS_INCLUDE_PATH)\" CPATH=\"$(GUIX_CPATH)\" LIBRARY_PATH=\"$(GUIX_LIBRARY_PATH)\" gcc;' -e 's;^\\(\\$$$$HOSTCC[^|]*\\);(echo \\1 | bash);' \"$$$$s\" ; fi ; done)
" tar (assoc-ref inputs "bash") (assoc-ref inputs "bash") (assoc-ref inputs "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 applicable, otherwise return
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
- "4.14.140"
+ "4.14.62"
(base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6")
(base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n")))
@@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
-(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 "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz6")))
+ (hash (base32 "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-09-25 0:25 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 1:02 [bug#37466] [PATCH 0/4] Add heads Danny Milosavljevic
2019-09-20 7:31 ` [bug#37466] [PATCH 1/4] gnu: Add musl-cross Danny Milosavljevic
2019-09-20 7:31 ` [bug#37466] [PATCH 2/4] gnu: Add heads Danny Milosavljevic
2019-09-20 12:05 ` Björn Höfling
2019-09-20 13:49 ` Danny Milosavljevic
2019-09-20 14:45 ` Julien Lepiller
2019-09-24 14:40 ` Danny Milosavljevic
2019-09-24 14:41 ` Danny Milosavljevic
2019-09-25 0:24 ` Danny Milosavljevic [this message]
2019-09-20 7:31 ` [bug#37466] [PATCH 3/4] gnu: Add heads-linuxboot Danny Milosavljevic
2019-09-20 7:31 ` [bug#37466] [PATCH 4/4] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 0/7] Add heads Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 1/7] gnu: Add musl-cross Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 2/7] gnu: Add heads Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 3/7] gnu: Add heads-linuxboot Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 4/7] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 5/7] gnu: Add heads-coreboot Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 6/7] gnu: Add heads-qemu-coreboot Danny Milosavljevic
2019-09-24 14:01 ` [bug#37466] [WIP v2 7/7] gnu: Add heads-kgpe-d16 Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 0/7] Add heads Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 1/7] gnu: Add musl-cross Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 2/7] gnu: Add heads Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 3/7] gnu: Add heads-linuxboot Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 4/7] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 5/7] gnu: Add heads-coreboot Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 6/7] gnu: Add heads-qemu-coreboot Danny Milosavljevic
2019-09-29 11:07 ` [bug#37466] [WIP v3 7/7] gnu: Add heads-kgpe-d16 Danny Milosavljevic
2019-10-02 21:15 ` [bug#37466] [WIP v4 0/7] Add heads Danny Milosavljevic
2019-10-02 21:15 ` [bug#37466] [WIP v4 1/7] gnu: Add musl-cross Danny Milosavljevic
2019-10-07 13:50 ` Danny Milosavljevic
2020-05-02 15:52 ` Danny Milosavljevic
2019-10-02 21:15 ` [bug#37466] [WIP v4 2/7] gnu: Add heads Danny Milosavljevic
2019-10-02 21:15 ` [bug#37466] [WIP v4 3/7] gnu: Add heads-linuxboot Danny Milosavljevic
2019-10-02 21:15 ` [bug#37466] [WIP v4 4/7] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2019-10-02 21:16 ` [bug#37466] [WIP v4 5/7] gnu: Add heads-coreboot Danny Milosavljevic
2019-10-02 21:16 ` [bug#37466] [WIP v4 6/7] gnu: Add heads-qemu-coreboot Danny Milosavljevic
2019-10-02 21:16 ` [bug#37466] [WIP v4 7/7] gnu: Add heads-kgpe-d16 Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 0/8] Add heads Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 1/8] gnu: Add elfutils@0.174 Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 2/8] gnu: Add heads Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 3/8] gnu: Add heads-linuxboot Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 4/8] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 5/8] gnu: Add heads-coreboot Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 6/8] gnu: Add heads-qemu-coreboot Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 7/8] gnu: Add heads-kgpe-d16 Danny Milosavljevic
2020-05-02 17:11 ` [bug#37466] [WIP v5 8/8] gnu: Add heads-diesel Danny Milosavljevic
2020-05-24 22:32 ` [bug#37466] [WIP v6 0/4] Add heads and co Danny Milosavljevic
2020-05-24 22:32 ` [bug#37466] [WIP v6 1/4] gnu: Add elfutils@0.174 Danny Milosavljevic
2020-05-24 22:32 ` [bug#37466] [WIP v6 2/4] gnu: Add heads Danny Milosavljevic
2020-05-24 22:32 ` [bug#37466] [WIP v6 3/4] gnu: Add heads-linuxboot Danny Milosavljevic
2020-05-24 22:32 ` [bug#37466] [WIP v6 4/4] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2020-06-01 10:54 ` [bug#37466] [WIP v7 0/4] Add heads and co Danny Milosavljevic
2020-06-01 10:54 ` [bug#37466] [WIP v7 1/4] gnu: Add elfutils@0.174 Danny Milosavljevic
2020-06-01 10:54 ` [bug#37466] [WIP v7 2/4] gnu: Add heads Danny Milosavljevic
2020-06-01 10:54 ` [bug#37466] [WIP v7 3/4] gnu: Add heads-linuxboot Danny Milosavljevic
2020-06-01 10:54 ` [bug#37466] [WIP v7 4/4] gnu: Add heads-qemu-linuxboot Danny Milosavljevic
2020-06-01 11:08 ` [bug#37466] [WIP v7 0/4] Add heads and co Danny Milosavljevic
2020-06-02 9:14 ` Efraim Flashner
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190925022439.3c989874@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=37466@debbugs.gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).