From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41987) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCm0x-0002e7-8B for guix-patches@gnu.org; Tue, 24 Sep 2019 10:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCm0v-0008Ul-Va for guix-patches@gnu.org; Tue, 24 Sep 2019 10:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59273) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCm0v-0008Ug-S0 for guix-patches@gnu.org; Tue, 24 Sep 2019 10:42:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iCm0v-00062q-Nh for guix-patches@gnu.org; Tue, 24 Sep 2019 10:42:01 -0400 Subject: [bug#37466] [PATCH 2/4] gnu: Add heads. Resent-Message-ID: Date: Tue, 24 Sep 2019 16:41:39 +0200 From: Danny Milosavljevic Message-ID: <20190924164139.1d827100@scratchpost.org> In-Reply-To: <20190924164018.082a3733@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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/nGoB9cM2SjB/kQ/H84.//=j"; 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_/nGoB9cM2SjB/kQ/H84.//=j Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable To use our linux-libre (with the mentioned problems): diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index 9128a4f426..e9c0b6b41c 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 " --Sig_/nGoB9cM2SjB/kQ/H84.//=j Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl2KKyMACgkQ5xo1VCww uqV4wQgAouQa5UpEq1aFDYw+R7xvcErVqcss/BSwi0AJKEYXNsOvGxBE1rzfR2Zt mWxHvaxf7oIp3eigZSAcBBaCNBZkcAENi+CTITTlv8y2OPFVLN7ztwOr4XOcTMTM sAcv3wsdnjptKnm4R+50w+PudA4WEFuXj0XlOYlKtQqHDfs+ZsImqNd15elaLgRH H0SC5ub7fGs5IDbfw4PyMnDzBjrZZLi7yEmV06j8J8JAB1/NpknrVDljVaaxoLtb fNxKjMp5aL9Zt9f5objk7y32Ng8znv1stB+0DvmIZsXXeG8LJAVajOuZblvw8gpI GPhN8opnhYXwWaPJNR6EZpiAZMFutg== =9stl -----END PGP SIGNATURE----- --Sig_/nGoB9cM2SjB/kQ/H84.//=j--