From patchwork Mon May 13 08:21:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 27427 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 3446627BBEA; Mon, 13 May 2024 09:24:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1618027BBE2 for ; Mon, 13 May 2024 09:24:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qya-0002r6-59; Mon, 13 May 2024 04:24:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6QyY-0002nj-N2 for guix-patches@gnu.org; Mon, 13 May 2024 04:24:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6QyY-00018a-Dl for guix-patches@gnu.org; Mon, 13 May 2024 04:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QyY-0001So-Ms; Mon, 13 May 2024 04:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 02/11] gnu: edk2-tools: Enable submodules. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70913 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70913@debbugs.gnu.org Cc: Efraim Flashner , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886375602 (code B ref 70913); Mon, 13 May 2024 08:24:02 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:23:57 +0000 Received: from localhost ([127.0.0.1]:59409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyR-0001Ry-0K for submit@debbugs.gnu.org; Mon, 13 May 2024 04:23:57 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:58834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyL-0001RZ-J7 for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:23:52 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-34ef66c0178so2771513f8f.1 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588563; x=1716193363; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=zHQZWjnT3m5qLCUPmPnuafbdArCV14i6L8LPuuBmaoM=; b=VV3Fcx8YjGRI24t9K+YIQs6wp+/x0r3ZlwK28cey/4+S6ptUZSJBZN0tP2NgQNZiaF YeyxJdN3doNVVukhxmTTdpkR7PkbZFqbDrr0FCzvbxU1d4GHezVX9UrtQFNf6xaNUG+u I4jth7oHMohyFOXRtMOV4cAUiqlPwaEBzCmFY6fUoYs+hrvrOfMdKKYt4Vd4mXPgF+yb qEcG/88PhkCaXkYUnN/q1v0w9UKutTVZ5jhAGpuYjSTWq15YDV3sR84ac+70SVWs1NKT MvwRHxZNGTaWC9Ftp6I67ZrdQFkT1DHcx6EahVHU2o5wWNFpeCeBSmJW8jiXjTadkFtB jjBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588563; x=1716193363; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zHQZWjnT3m5qLCUPmPnuafbdArCV14i6L8LPuuBmaoM=; b=gvBcAcWzNUoRhgjOexEhQjJTIcra24vxniWV7FttzrqqMFPiTQm9iBEVdqrbsOoIAj c8aXUl1ayU3XOsRkOjwq6i4SgVdq0H/F/38/kHT/K72n9r1GIzJz6Cc4ygSSyg4CPoPP AjtAXC5k1tOuqSGtXPvRovTaFQK7tuaqMmbXH5aWmNrykrm1KE9nKt0Vi02nLm8WoVhj Rm/4nMXxEL47ztn6xLSQtTx7AWOoRAW1IuUPWTb8nMV13wnj6w0oAM4J3+Dj81iUdxLU 7havkPrkAs5K/kpyyW9IVEbLOUPVTv1sEzh/3Tg2epp7QkR6UcjV3weUOxBQFC7g4AJB SGBw== X-Gm-Message-State: AOJu0Yx++bOOVB76KdANxWwN71aFD3tCuSLJRCgo4KCVZ1JyeSonm4qu Yk0VWUAzU9OtCYtb5XtxXCqIp49SwHeg4X0SRBheEvgWU44BnpaiJ+4gSrgQ X-Google-Smtp-Source: AGHT+IG79erE7YCD7qVxeTlPoURrQoc8mrJj+WRNFlCR4oi0g2xJmnH8AchPvO7hRLnLpZYIbx2NPA== X-Received: by 2002:a05:6000:1968:b0:34f:96ba:ca3a with SMTP id ffacd0b85a97d-3504a61c7cemr10798541f8f.13.1715588562892; Mon, 13 May 2024 01:22:42 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502bbc5654sm10566636f8f.115.2024.05.13.01.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:42 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:51 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (edk2-tools)[source]: Checkout submodules. [arguments]: Don't disable building brotli or xz compression. Change-Id: I8b318373e38767e1a309e9e385f1626429bfbb20 --- gnu/packages/firmware.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 62753e3769..f3bb51bcb1 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -819,11 +819,13 @@ (define-public edk2-tools (method git-fetch) (uri (git-reference (url "https://github.com/tianocore/edk2") - (commit (string-append "edk2-stable" version)))) + (commit (string-append "edk2-stable" version)) + ;; EDK2 makes extensive use of submodules. + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "1x0h89cz3ihihcp4n93bw708q9r3icprb8cjsrrfcgq10clavdzx")))) + "0y7jfpijgi099znhzjklnsczn0k0vm1d1qznq9x2a2sa0glydsin")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -835,15 +837,6 @@ (define-public edk2-tools (add-after 'unpack 'change-directory (lambda _ (chdir "BaseTools"))) - (add-after 'change-directory 'disable-some-tools - (lambda _ - ;; Disable building brotli and xz, since we package them - ;; separately, and it would require fetching submodules. - (substitute* "Source/C/GNUmakefile" - (("^[[:blank:]]+BrotliCompress[[:blank:]]+\\\\") - "\\") - (("^[[:blank:]]+LzmaCompress[[:blank:]]+\\\\") - "\\")))) (replace 'build (lambda* (#:key (make-flags #~'()) #:allow-other-keys) ;; The default build target also runs tests.