From patchwork Mon Jun 1 11:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 22502 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 9CB3F27BBE3; Mon, 1 Jun 2020 12:09:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 67D7427BBE1 for ; Mon, 1 Jun 2020 12:09:08 +0100 (BST) Received: from localhost ([::1]:33400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfiJX-0006Ie-RR for patchwork@mira.cbaines.net; Mon, 01 Jun 2020 07:09:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfiJS-0006ID-53 for guix-patches@gnu.org; Mon, 01 Jun 2020 07:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51318) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfiJR-00016B-SD for guix-patches@gnu.org; Mon, 01 Jun 2020 07:09:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfiJR-0007Kc-M9 for guix-patches@gnu.org; Mon, 01 Jun 2020 07:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37466] [WIP v7 0/4] Add heads and co. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jun 2020 11:09: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 To: 37466@debbugs.gnu.org Received: via spool by 37466-submit@debbugs.gnu.org id=B37466.159100971128137 (code B ref 37466); Mon, 01 Jun 2020 11:09:01 +0000 Received: (at 37466) by debbugs.gnu.org; 1 Jun 2020 11:08:31 +0000 Received: from localhost ([127.0.0.1]:34631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfiIx-0007Jk-AM for submit@debbugs.gnu.org; Mon, 01 Jun 2020 07:08:31 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:33284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfiIv-0007Jb-VL for 37466@debbugs.gnu.org; Mon, 01 Jun 2020 07:08:30 -0400 Received: from localhost (128-244-187.fonira.net [185.128.244.187]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 726693368211 for <37466@debbugs.gnu.org>; Mon, 1 Jun 2020 13:08:28 +0200 (CEST) Date: Mon, 1 Jun 2020 13:08:26 +0200 From: Danny Milosavljevic Message-ID: <20200601130826.5021913a@scratchpost.org> In-Reply-To: <20200601105441.13726-1-dannym@scratchpost.org> References: <20190920010248.28082-1-dannym@scratchpost.org> <20200601105441.13726-1-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (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-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Extra fixes, will be in WIP v8: diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index 1153c6e24d..25940b8f38 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -625,6 +625,9 @@ servers.") (mkdir-p "build") (copy-recursively (assoc-ref inputs "linuxboot") "build/linuxboot-git") (copy-recursively (assoc-ref inputs "edk2") "build/linuxboot-git/edk2") + ;; File is used by Linuxboot (they do an existence check). + (call-with-output-file "build/linuxboot-git/edk2/.git" + (const #t)) (invoke "chmod" "-R" "u+w" "build/linuxboot-git") (chmod "build/linuxboot-git/Makefile" #o664) (substitute* "build/linuxboot-git/dxe/Makefile" @@ -641,7 +644,7 @@ servers.") (file-name "edk2-checkout") (sha256 (base32 "0crjx1hg1m5mir2qm96dbcc3glrnww3ni0bc9f370qmm337wzlhi")))) - ("libuuid" ,util-linux) ; TODO: Move to heads' internal dependencies (for edk2). + ("libuuid" ,util-linux "lib") ; TODO: Move to heads' internal dependencies (for edk2). ("nasm" ,nasm) ; TODO: Move to heads' internal dependencies (for edk2). ("python" ,python-2) ; TODO: Move to heads' internal dependencies (for edk2). ("acpica" ,acpica) ; TODO: Move to heads' internal dependencies (for edk2).