From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SGdOFlqRGGSqNwEASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 18:01:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WBdTFVqRGGTDoAAAG6o9tA (envelope-from ) for ; Mon, 20 Mar 2023 18:01:14 +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 11F8B3919F for ; Mon, 20 Mar 2023 18:01:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peIsS-0000VJ-0B; Mon, 20 Mar 2023 13:00:56 -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 1peIsI-0000Sn-48 for guix-devel@gnu.org; Mon, 20 Mar 2023 13:00:54 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peIsF-0003QI-GS for guix-devel@gnu.org; Mon, 20 Mar 2023 13:00:45 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id ACF091C36; Mon, 20 Mar 2023 18:00:40 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N-AbEdyGjqzo; Mon, 20 Mar 2023 18:00:39 +0100 (CET) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 62C8B378; Mon, 20 Mar 2023 18:00:39 +0100 (CET) Date: Mon, 20 Mar 2023 18:00:37 +0100 From: Andreas Enge To: Josselin Poiret Cc: guix-devel@gnu.org Subject: Re: Gnome dans core-updates Message-ID: References: <87cz55rtb8.fsf@jpoiret.xyz> <87a608su8s.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="rGgwUDfCFQWonjBk" Content-Disposition: inline In-Reply-To: <87a608su8s.fsf@jpoiret.xyz> Received-SPF: pass client-ip=185.233.100.1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679331674; a=rsa-sha256; cv=none; b=M4Ybsctavxleq6bojWn2zVdwGviH/oLx8Q/v7CBkw4XcnX6SoUK0rVlLaPptljQED5NVIv etJX2hiWAlWJ+Behg+nj1zwM8EbksxSIzUCrYsCTw84U2AhWGMtWyc9BFJRuPr2whW5rg3 ua9exGW7BLRdiiH7+8C6B54H1ARR5JW2DIrZXcNpvODgNoUdAoq72kVLs3tBA+Ld9xPjdE tWvUZhLsA/wVSk6S4yemZOPPm/eiw7+rxr90T4RlRJMUw3dhIBJM1BcrJQ4xD/ADLpWKdk AzJCV5LzvdjVBqNzGCwee+zNLr71WHtwxX+Ev2O/fuJjs17L/cAGUV+EPd16SA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679331674; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=JcCSApDLPAhSLbuYQzH3loha4rTj8BjomKS5ABr0OcI=; b=Ksds/D25uU0LGsjaQKmcMKTGJ/N03lJnpq4LEeSYEWgP9yUAxWg+XCDnOUDnowa+btj94W tloWRjkCuuaIaDiHiMiDwLJ/0mKxaYYqc3J+tfMKkbgGfNLOscJ2CV2UWLPCrwfCij3bEg dsEVKw9O1wq1tLBQR6V/EzlpUenX5KFjgLGoiSRsMcygxjK/cYYfFGiepZkvzbg2rYFW6p 7+8Y0WC/Un9MYXTLDnC+GSxR9Z+QOcHe62UzfgLgkgWE4VMKgu6weErcqQubZw3t/M4GGp Ed2kYBVwYbbKtkX2sNNcso2su0GEaDaEabacQvTQSUN4EC6hlZidDxLgCbIOcA== X-Migadu-Spam-Score: -2.56 X-Spam-Score: -2.56 X-Migadu-Queue-Id: 11F8B3919F Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: eYN4WfQLYWFi --rGgwUDfCFQWonjBk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Am Sun, Mar 19, 2023 at 03:14:59PM +0100 schrieb Josselin Poiret: > I agree with you, but given that upstream has already closed a > discussion on this topic with a clear stance, I don't really want to > re-open anything. We could go with that solution for now? If it is indeed a solution... Here is how far I got, patch attached. I updated the source code to the latest commit. The patch to src/util/geniso does not apply any more (in fact, the complete file has disappeared). The build fails, relatedly: [GENFSIMG] bin/ipxe.iso util/genfsimg: could not find isolinux.bin make[2]: *** [arch/x86/Makefile.pcbios:61: bin/ipxe.iso] Error 1 ... error: in phase 'build': uncaught exception: ... build of /gnu/store/z9fs06nl38g2q1ss9wf1vbxp60011izj-ipxe-1.21.1-0.09e8a15.drv failed View build log at '/var/log/guix/drvs/z9/fs06nl38g2q1ss9wf1vbxp60011izj-ipxe-1.21.1-0.09e8a15.drv.gz'. See also here: https://github.com/ipxe/ipxe/issues/775 isolinux.bin is supposed to be installed by syslinux, but it is not. If you could have a more informed look, that would be great. Andreas --rGgwUDfCFQWonjBk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-ipex-Update-to-latest-master-commit.patch" >From 6b4ed4a924994ee5ea12a38d91288238e34e33a2 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 20 Mar 2023 17:42:15 +0100 Subject: [PATCH] gnu: ipex: Update to latest master commit. * gnu/packages/bootloaders.scm (ipex): Update to latest master commit. Remove patch. * gnu/packages/patches/ipxe-reproducible-geniso.patch: Remove file. * gnu/packages/bootloaders.scm (dist_patch_DATA): Unregister patch. --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 13 ++-- .../patches/ipxe-reproducible-geniso.patch | 77 ------------------- 3 files changed, 8 insertions(+), 83 deletions(-) delete mode 100644 gnu/packages/patches/ipxe-reproducible-geniso.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43b7e4ceb3..4f6e100c55 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1338,7 +1338,6 @@ dist_patch_DATA = \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/iputils-libcap-compat.patch \ - %D%/packages/patches/ipxe-reproducible-geniso.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b1276f90dd..85da7aed55 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1706,20 +1706,23 @@ (define-public ipxe ;; ;; TODO: Bump this timestamp at each modifications of the package (not only ;; for updates) by running: date +%s. - (let ((timestamp "1671715380")) + (let ((timestamp "1671715380") + (commit "09e8a154084c57311463408e3f2e412c305a9638") + (revision "0")) (package (name "ipxe") - (version "1.21.1") + (version (string-append "1.21.1" + "-" revision "." + (string-take commit 7))) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ipxe/ipxe") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name name version)) - (patches (search-patches "ipxe-reproducible-geniso.patch")) (sha256 (base32 - "1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9")))) + "0578qnq69pyvm1j7ykcd763mly9phgnlsdyai1npsg455kf6q1m4")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/ipxe-reproducible-geniso.patch b/gnu/packages/patches/ipxe-reproducible-geniso.patch deleted file mode 100644 index ff6aa1da94..0000000000 --- a/gnu/packages/patches/ipxe-reproducible-geniso.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001 -From: Brice Waegeneire -Date: Fri, 5 Jun 2020 14:38:43 +0200 -Subject: [PATCH] [geniso] Make it reproducible - -Some timestamps get embedded in the generated ISO, making it -unreproducible so we overwrite those timestamps to be at the UNIX epoch. ---- - src/util/geniso | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/util/geniso b/src/util/geniso -index ff090d4a..e032ffb0 100755 ---- a/src/util/geniso -+++ b/src/util/geniso -@@ -11,6 +11,13 @@ function help() { - echo " -o FILE save iso image to file" - } - -+function reset_timestamp() { -+ for f in "$1"/*; do -+ touch -t 197001010100 "$f" -+ done -+ touch -t 197001010100 "$1" -+} -+ - LEGACY=0 - FIRST="" - -@@ -37,8 +44,9 @@ if [ -z "${OUT}" ]; then - exit 1 - fi - --# There should either be mkisofs or the compatible genisoimage program --for command in genisoimage mkisofs; do -+# There should either be mkisofs, xorriso or the compatible genisoimage -+# program -+for command in xorriso genisoimage mkisofs; do - if ${command} --version >/dev/null 2>/dev/null; then - mkisofs=(${command}) - break -@@ -46,8 +54,10 @@ for command in genisoimage mkisofs; do - done - - if [ -z "${mkisofs}" ]; then -- echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2 -+ echo "${0}: mkisofs, xorriso or genisoimage not found, please install or set PATH" >&2 - exit 1 -+elif [ "$mkisofs" = "xorriso" ]; then -+ mkisofs+=(-as mkisofs) - fi - - dir=$(mktemp -d bin/iso.dir.XXXXXX) -@@ -115,6 +125,8 @@ case "${LEGACY}" in - exit 1 - fi - -+ reset_timestamp "$dir" -+ - # generate the iso image - "${mkisofs[@]}" -b boot.img -output ${OUT} ${dir} - ;; -@@ -127,6 +139,12 @@ case "${LEGACY}" in - cp ${LDLINUX_C32} ${dir} - fi - -+ reset_timestamp "$dir" -+ -+ if [ "${mkisofs[0]}" = "xorriso" ]; then -+ mkisofs+=(-isohybrid-mbr "$SYSLINUX_MBR_DISK_PATH") -+ fi -+ - # generate the iso image - "${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir} - --- -2.26.2 -- 2.39.2 --rGgwUDfCFQWonjBk--