From patchwork Tue Sep 24 14:41:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 15452 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C36AA1742D; Tue, 24 Sep 2019 16:34:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,MISSING_HEADERS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8317C1741F for ; Tue, 24 Sep 2019 16:34:55 +0100 (BST) Received: from localhost ([::1]:47210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCmq5-0003TP-Cz for patchwork@mira.cbaines.net; Tue, 24 Sep 2019 11:34:53 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#37466] [PATCH 2/4] gnu: Add heads. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Sep 2019 14:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch Received: via spool by 37466-submit@debbugs.gnu.org id=B37466.156933611023215 (code B ref 37466); Tue, 24 Sep 2019 14:42:01 +0000 Received: (at 37466) by debbugs.gnu.org; 24 Sep 2019 14:41:50 +0000 Received: from localhost ([127.0.0.1]:39858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iCm0i-00062H-Em for submit@debbugs.gnu.org; Tue, 24 Sep 2019 10:41:50 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:45580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iCm0f-000626-Td for 37466@debbugs.gnu.org; Tue, 24 Sep 2019 10:41:47 -0400 Received: from localhost (178.112.183.13.wireless.dyn.drei.com [178.112.183.13]) by dd26836.kasserver.com (Postfix) with ESMTPSA id DDD553360C4C; Tue, 24 Sep 2019 16:41:44 +0200 (CEST) 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> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 37466@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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.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 "