From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ENjqHX8b0WP7AQEAbAwnHQ (envelope-from ) for ; Wed, 25 Jan 2023 13:07:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OD3gHX8b0WMgPAEA9RJhRA (envelope-from ) for ; Wed, 25 Jan 2023 13:07:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2FF2B1BE9B for ; Wed, 25 Jan 2023 13:07:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKeYF-0005hl-Kj; Wed, 25 Jan 2023 07:06:51 -0500 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 1pKeXS-0005LL-Rz for guix-patches@gnu.org; Wed, 25 Jan 2023 07:06:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKeXS-0005sm-JL for guix-patches@gnu.org; Wed, 25 Jan 2023 07:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKeXS-0000oE-EF for guix-patches@gnu.org; Wed, 25 Jan 2023 07:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61057] [PATCH 1/3] gnu: flashrom: Update to 1.2.1. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Jan 2023 12:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61057 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61057@debbugs.gnu.org Received: via spool by 61057-submit@debbugs.gnu.org id=B61057.16746483193034 (code B ref 61057); Wed, 25 Jan 2023 12:06:02 +0000 Received: (at 61057) by debbugs.gnu.org; 25 Jan 2023 12:05:19 +0000 Received: from localhost ([127.0.0.1]:58488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKeWk-0000mr-EO for submit@debbugs.gnu.org; Wed, 25 Jan 2023 07:05:19 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:57908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKeWh-0000ma-MB for 61057@debbugs.gnu.org; Wed, 25 Jan 2023 07:05:16 -0500 Date: Wed, 25 Jan 2023 20:04:50 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1674648308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1L/F81ffLvUXrdYgCZmJr2H1tgBDJIpuGVNT6kIfDCs=; b=KZGC646WLw6PgwY2/yb9CYSzh28oGaeCsGblQ6/T6HAHwnjs0BDP/CvEdMWAuOeVxI/3ZZ TRDMHU9hmmTDOoJayeAIWmXe0O+D+FCxBukeHQVag+8+ip1oe82yM5VlUjPzPzSjlZH8a5 lmjDTCdbJs/720KWcvIIGMeo4WbTcaNnlqdwrl1fD1G6dhjqe7aXcG1WXZxpCXOjoXNsar 17BNM+eHfzZhS1nk9eAwkGTghNbXk7RJcvWbUXqEfTBHxW697SMoJ+HOkLA34IRYAfk7df t/kyOmi7L6z04M0h5wTuRDEWrIVx56znEq3DDZ3dfCYgAwG2aKTBMepBfcatng== Message-ID: <87o7qm3jml.wl-hako@ultrarare.space> In-Reply-To: <87r0vi3jr3.wl-hako@ultrarare.space> References: <87r0vi3jr3.wl-hako@ultrarare.space> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674648447; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=1L/F81ffLvUXrdYgCZmJr2H1tgBDJIpuGVNT6kIfDCs=; b=BvyJmfUSOi0Tj9GtJxLkuxFFah9TU5gPZaTnj58hEzhTNbyQaKxn5IE3pUV2QYTebZbPYx 72EWc/JD0W/aYll5x/NobNMZxkUdpMASMFkLp+uaA1qPVkOK3wr+cJW/WRFDeIqN1PAS1h hAY/1inUy1xk/IPKE/nQsIzPxquK/bxCnlwMuDa7XbSqanvuWHDU3i7LCY062QDNlShUgF UW74Iy6IdXArDShH1NdEJwsWfNStcE96TUw0lsMkvw7cPlJRxxGTC1+IRCc4nTJMDPywUs f1ugMDe9p+jSkVkqMlSSie9TLgDYx7J+NpozAKfr3tPh1FzfzOivsKDUx9BP/Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=KZGC646W; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674648447; a=rsa-sha256; cv=none; b=ccvvgUuJFmoSQ/+jrxwv4bX6btvI7LCCui2CdoOcuYcGAkXEnjIxXgu463g8GQm+9zRwe1 a5YgcxfvF7JIZkAwJ+MjaSTu06UnwsOGHiTJ2wB7UNMQSozEtVxIvciKHaTIwWY4udeeid kw+1iNUsmWSF9eZWpDOblzJ1CRefI+ohr+/FSHI4zzEaTBLfzSFEFVQ2piaDFIz+y7kGBX Lc1xJ4eXvuYXOMYIK1uCUFL8+Pa3IUn7aXsgyQJfdpKDLKtrAkFYL6fB1ph0leQVAMp017 wtRgI4hJlcqN1XHPbQApKgi1yYQEoXubwP4GxMF/Vcc2eqojYFq3YxOH2J7Z8Q== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=KZGC646W; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Spam-Score: -3.58 X-Spam-Score: -3.58 X-Migadu-Queue-Id: 2FF2B1BE9B X-TUID: 9qz0DQev1Kyc * gnu/packages/patches/flashrom-fix-building-on-aarch64.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/flashing-tools.scm (flashrom): Update to 1.2.1. [arguments]<#:phases>: Remove 'patch-exec-paths and 'patch-type-error phases. Actually, at least from 1.2, the exact "dmidecode" is not present in dmi.c. --- gnu/local.mk | 1 - gnu/packages/flashing-tools.scm | 22 +---- .../flashrom-fix-building-on-aarch64.patch | 89 ------------------- 3 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/flashrom-fix-building-on-aarch64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7fd658abac..778b725256 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1114,7 +1114,6 @@ dist_patch_DATA = \ %D%/packages/patches/firebird-riscv64-support-pt1.patch \ %D%/packages/patches/firebird-riscv64-support-pt2.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ - %D%/packages/patches/flashrom-fix-building-on-aarch64.patch \ %D%/packages/patches/flatpak-fix-path.patch \ %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \ %D%/packages/patches/fontconfig-cache-ignore-mtime.patch \ diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index e7165efe79..de4b477be8 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -58,7 +58,7 @@ (define-module (gnu packages flashing-tools) (define-public flashrom (package (name "flashrom") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append @@ -66,9 +66,7 @@ (define-public flashrom version ".tar.bz2")) (sha256 (base32 - "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71")) - (patches - (search-patches "flashrom-fix-building-on-aarch64.patch")))) + "0rbdqnxmcsr908rpjcachrx58lwl3fjm7lmvjn3rpj08xddzz9w9")))) (build-system gnu-build-system) (inputs (list dmidecode pciutils libusb libftdi)) (native-inputs (list pkg-config)) @@ -80,21 +78,7 @@ (define-public flashrom #:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-before 'build 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "dmi.c" - (("\"dmidecode\"") - (format #f "~S" - (search-input-file inputs "/sbin/dmidecode")))))) - (add-before 'build 'patch-type-error - (lambda _ - ;; See https://github.com/flashrom/flashrom/pull/133 - (substitute* "libflashrom.c" - (("supported_boards\\[i\\].working = binfo\\[i\\].working") - "supported_boards[i].working = (enum flashrom_test_state)binfo[i].working") - (("supported_chipsets\\[i\\].status = chipset\\[i\\].status") - "supported_chipsets[i].status = (enum flashrom_test_state)chipset[i].status"))))))) + (delete 'configure)))) ; no configure script (home-page "https://flashrom.org/") (synopsis "Identify, read, write, erase, and verify ROM/flash chips") (description diff --git a/gnu/packages/patches/flashrom-fix-building-on-aarch64.patch b/gnu/packages/patches/flashrom-fix-building-on-aarch64.patch deleted file mode 100644 index 9f54305b47..0000000000 --- a/gnu/packages/patches/flashrom-fix-building-on-aarch64.patch +++ /dev/null @@ -1,89 +0,0 @@ -commit da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d -Author: Pyry Kontio -Date: Mon Jul 6 12:57:35 2020 +0900 - - Makefile: Fix building on AArch64 NixOS - - The parsing of the output of archtest.c produced an unexpected - value on AArch64 NixOS. For example, the make variable ARCH was set to: - - ``` - bit outside of fd_set selected - arm - ``` - - This made the arch and OS checks fail. - - This commit simplifies the parsing, making it more robust. - - The C files archtest.c, endiantest.c and os.h used to set the - TARGET_OS, ARCH and ENDIAN variables, respectively, output - the result of the test as the final line, so just extracting - the final line and removing double quoting is enough. - - This commit also fixes a bug with debug_shell lacking escaping - single quotes, which prevented using the single quote in the - debug_shell calls. It used to work by accident before this fix; - the line in the call happened to contain a balanced pair of double - quotes and lacked other characters that needed escaping, which - didn't break the debug_shell, but this was accidental and very - brittle. - - Signed-off-by: Pyry Kontio - Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510 - Reviewed-on: https://review.coreboot.org/c/flashrom/+/43140 - Tested-by: build bot (Jenkins) - Reviewed-by: Angel Pons - -diff --git a/Makefile b/Makefile -index f3f7717e..e475cbdb 100644 ---- a/Makefile -+++ b/Makefile -@@ -83,7 +83,8 @@ dummy_for_make_3_80:=$(shell printf "Build started on %s\n\n" "$$(date)" >$(BUIL - - # Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr - # in the build details file together with the original stdout output. --debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) -+debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \ -+ { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) - - ############################################################################### - # General OS-specific settings. -@@ -106,7 +107,8 @@ endif - # IMPORTANT: The following line must be placed before TARGET_OS is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) -+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) - - ifeq ($(TARGET_OS), Darwin) - override CPPFLAGS += -I/opt/local/include -I/usr/local/include -@@ -490,8 +492,10 @@ endif - # IMPORTANT: The following line must be placed before ARCH is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) --override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#')) -+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) -+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ -+ | tail -1)) - - # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) - ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) -@@ -1299,12 +1303,12 @@ compiler: featuresavailable - @printf "Target arch is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) - @printf "%s\n" '$(ARCH)' - @printf "Target OS is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1) - @printf "%s\n" '$(TARGET_OS)' - ifeq ($(TARGET_OS), libpayload) - @$(CC) --version 2>&1 | grep -q coreboot || \ -- 2.39.1