From unknown Mon Jun 16 23:45:31 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#68530 <68530@debbugs.gnu.org> To: bug#68530 <68530@debbugs.gnu.org> Subject: Status: [PATCH 1/2] gnu: u-boot: Update to 2024.01.3. Reply-To: bug#68530 <68530@debbugs.gnu.org> Date: Tue, 17 Jun 2025 06:45:31 +0000 retitle 68530 [PATCH 1/2] gnu: u-boot: Update to 2024.01.3. reassign 68530 guix-patches submitter 68530 Herman Rimm severity 68530 normal tag 68530 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 17 07:48:10 2024 Received: (at submit) by debbugs.gnu.org; 17 Jan 2024 12:48:10 +0000 Received: from localhost ([127.0.0.1]:51091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ5Ky-0006vB-Vl for submit@debbugs.gnu.org; Wed, 17 Jan 2024 07:48:10 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ5Kw-0006tx-6Z for submit@debbugs.gnu.org; Wed, 17 Jan 2024 07:48:07 -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 1rQ5Ko-0007wE-Bw for guix-patches@gnu.org; Wed, 17 Jan 2024 07:47:58 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rQ5Kl-0003GI-KK for guix-patches@gnu.org; Wed, 17 Jan 2024 07:47:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1705495665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=almYduTFjpolfROm2bbO36AI5FIMKjXLBvvZ4MrHbWE=; b=hHGjttoL3mPb8OcLQQ4KawhF5CWyOPoi2wNu5Z82DYxEG2lc08E1qNyp1lHETk+i5b7QXF WQm+Lwf/eQVcZDL2WGhiOC+evunxTuwTFjy72DkrwS7lWVwY+cdLcotcmpHZe+3wnGH/2C 2LfRxgZjgHncsJD/ZJRreiNu6EmvL//2ZhTAT2Jyc4CPJojk1sY59L4J4N3CEnnnEAi74G aJhMOGOngOKD/AD26BPbkuvLI56XJD9vbtSfLtxva4nzwyxSh1f3fAJef0YCYfPB4ijyhG P2d9+wpWcBVM/p9C9ZVP8IH2L8Ks8tJKLXbfm9sHSiUwRwawjKiPdjpS+FpuJw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f8e7b049 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 17 Jan 2024 12:47:45 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: u-boot: Update to 2024.01.3. Date: Wed, 17 Jan 2024 13:47:30 +0100 Message-ID: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/local.mk: Deregister patch. * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01.3. [source]: remove patman patch. * gnu/packages/patches/u-boot-patman-change-id.patch: Delete file. Change-Id: I44c0cd313986a6b94f786431e00fbeee82b26d20 --- The OpenSSL patch is incomplete, see build errors for variable added in [PATCH 2/2], from #60043 by phodina. It is not obvious where to add the #if-directives to make it compile. gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 7 +- .../patches/u-boot-patman-change-id.patch | 232 ------------------ 3 files changed, 3 insertions(+), 237 deletions(-) delete mode 100644 gnu/packages/patches/u-boot-patman-change-id.patch diff --git a/gnu/local.mk b/gnu/local.mk index 34bed91fc3..98bf04b1e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2097,7 +2097,6 @@ dist_patch_DATA = \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ - %D%/packages/patches/u-boot-patman-change-id.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c73a0e665d..151b42210c 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -719,19 +719,18 @@ (define %u-boot-allow-disabling-openssl-patch (define u-boot (package (name "u-boot") - (version "2023.10") + (version "2024.01") (source (origin (patches (list %u-boot-rockchip-inno-usb-patch - %u-boot-allow-disabling-openssl-patch - (search-patch "u-boot-patman-change-id.patch"))) + %u-boot-allow-disabling-openssl-patch)) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" "u-boot-" version ".tar.bz2")) (sha256 (base32 - "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0")))) + "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) (build-system gnu-build-system) (native-inputs (list bison diff --git a/gnu/packages/patches/u-boot-patman-change-id.patch b/gnu/packages/patches/u-boot-patman-change-id.patch deleted file mode 100644 index 354aee2755..0000000000 --- a/gnu/packages/patches/u-boot-patman-change-id.patch +++ /dev/null @@ -1,232 +0,0 @@ -Upstream status: https://patchwork.ozlabs.org/project/uboot/patch/20231013030633.7191-1-maxim.cournoyer@gmail.com/ - -From f83a5e07b0934e38cbee923e0c5b7fc0a890926c Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Thu, 12 Oct 2023 17:04:25 -0400 -Subject: [PATCH] patman: Add a 'keep_change_id' setting - -A Change-Id can be useful for traceability purposes, and some projects -may wish to have them preserved. This change makes it configurable -via a new 'keep_change_id' setting. - -Series-version: 2 -Series-changes: 2 -- Add missing argument to send parser ---- - tools/patman/__main__.py | 2 ++ - tools/patman/control.py | 12 +++++++++--- - tools/patman/patchstream.py | 17 ++++++++++++----- - tools/patman/patman.rst | 11 ++++++----- - tools/patman/test_checkpatch.py | 16 ++++++++++++++++ - 5 files changed, 45 insertions(+), 13 deletions(-) - -diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py -index 8eba5d3486..197ac1aad1 100755 ---- a/tools/patman/__main__.py -+++ b/tools/patman/__main__.py -@@ -103,6 +103,8 @@ send.add_argument('--no-signoff', action='store_false', dest='add_signoff', - default=True, help="Don't add Signed-off-by to patches") - send.add_argument('--smtp-server', type=str, - help="Specify the SMTP server to 'git send-email'") -+send.add_argument('--keep-change-id', action='store_true', -+ help='Preserve Change-Id tags in patches to send.') - - send.add_argument('patchfiles', nargs='*') - -diff --git a/tools/patman/control.py b/tools/patman/control.py -index 916ddf8fcf..b292da9dc2 100644 ---- a/tools/patman/control.py -+++ b/tools/patman/control.py -@@ -16,11 +16,14 @@ from patman import gitutil - from patman import patchstream - from u_boot_pylib import terminal - -+ - def setup(): - """Do required setup before doing anything""" - gitutil.setup() - --def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): -+ -+def prepare_patches(col, branch, count, start, end, ignore_binary, signoff, -+ keep_change_id=False): - """Figure out what patches to generate, then generate them - - The patch files are written to the current directory, e.g. 0001_xxx.patch -@@ -35,6 +38,7 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): - end (int): End patch to use (0=last one in series, 1=one before that, - etc.) - ignore_binary (bool): Don't generate patches for binary files -+ keep_change_id (bool): Preserve the Change-Id tag. - - Returns: - Tuple: -@@ -59,11 +63,12 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): - branch, start, to_do, ignore_binary, series, signoff) - - # Fix up the patch files to our liking, and insert the cover letter -- patchstream.fix_patches(series, patch_files) -+ patchstream.fix_patches(series, patch_files, keep_change_id) - if cover_fname and series.get('cover'): - patchstream.insert_cover_letter(cover_fname, series, to_do) - return series, cover_fname, patch_files - -+ - def check_patches(series, patch_files, run_checkpatch, verbose, use_tree): - """Run some checks on a set of patches - -@@ -166,7 +171,8 @@ def send(args): - col = terminal.Color() - series, cover_fname, patch_files = prepare_patches( - col, args.branch, args.count, args.start, args.end, -- args.ignore_binary, args.add_signoff) -+ args.ignore_binary, args.add_signoff, -+ keep_change_id=args.keep_change_id) - ok = check_patches(series, patch_files, args.check_patch, - args.verbose, args.check_patch_use_tree) - -diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py -index f91669a940..e2e2a83e67 100644 ---- a/tools/patman/patchstream.py -+++ b/tools/patman/patchstream.py -@@ -68,6 +68,7 @@ STATE_PATCH_SUBJECT = 1 # In patch subject (first line of log for a commit) - STATE_PATCH_HEADER = 2 # In patch header (after the subject) - STATE_DIFFS = 3 # In the diff part (past --- line) - -+ - class PatchStream: - """Class for detecting/injecting tags in a patch or series of patches - -@@ -76,7 +77,7 @@ class PatchStream: - unwanted tags or inject additional ones. These correspond to the two - phases of processing. - """ -- def __init__(self, series, is_log=False): -+ def __init__(self, series, is_log=False, keep_change_id=False): - self.skip_blank = False # True to skip a single blank line - self.found_test = False # Found a TEST= line - self.lines_after_test = 0 # Number of lines found after TEST= -@@ -86,6 +87,7 @@ class PatchStream: - self.section = [] # The current section...END section - self.series = series # Info about the patch series - self.is_log = is_log # True if indent like git log -+ self.keep_change_id = keep_change_id # True to keep Change-Id tags - self.in_change = None # Name of the change list we are in - self.change_version = 0 # Non-zero if we are in a change list - self.change_lines = [] # Lines of the current change -@@ -452,6 +454,8 @@ class PatchStream: - - # Detect Change-Id tags - elif change_id_match: -+ if self.keep_change_id: -+ out = [line] - value = change_id_match.group(1) - if self.is_log: - if self.commit.change_id: -@@ -763,7 +767,7 @@ def get_metadata_for_test(text): - pst.finalise() - return series - --def fix_patch(backup_dir, fname, series, cmt): -+def fix_patch(backup_dir, fname, series, cmt, keep_change_id=False): - """Fix up a patch file, by adding/removing as required. - - We remove our tags from the patch file, insert changes lists, etc. -@@ -776,6 +780,7 @@ def fix_patch(backup_dir, fname, series, cmt): - fname (str): Filename to patch file to process - series (Series): Series information about this patch set - cmt (Commit): Commit object for this patch file -+ keep_change_id (bool): Keep the Change-Id tag. - - Return: - list: A list of errors, each str, or [] if all ok. -@@ -783,7 +788,7 @@ def fix_patch(backup_dir, fname, series, cmt): - handle, tmpname = tempfile.mkstemp() - outfd = os.fdopen(handle, 'w', encoding='utf-8') - infd = open(fname, 'r', encoding='utf-8') -- pst = PatchStream(series) -+ pst = PatchStream(series, keep_change_id=keep_change_id) - pst.commit = cmt - pst.process_stream(infd, outfd) - infd.close() -@@ -795,7 +800,7 @@ def fix_patch(backup_dir, fname, series, cmt): - shutil.move(tmpname, fname) - return cmt.warn - --def fix_patches(series, fnames): -+def fix_patches(series, fnames, keep_change_id=False): - """Fix up a list of patches identified by filenames - - The patch files are processed in place, and overwritten. -@@ -803,6 +808,7 @@ def fix_patches(series, fnames): - Args: - series (Series): The Series object - fnames (:type: list of str): List of patch files to process -+ keep_change_id (bool): Keep the Change-Id tag. - """ - # Current workflow creates patches, so we shouldn't need a backup - backup_dir = None #tempfile.mkdtemp('clean-patch') -@@ -811,7 +817,8 @@ def fix_patches(series, fnames): - cmt = series.commits[count] - cmt.patch = fname - cmt.count = count -- result = fix_patch(backup_dir, fname, series, cmt) -+ result = fix_patch(backup_dir, fname, series, cmt, -+ keep_change_id=keep_change_id) - if result: - print('%d warning%s for %s:' % - (len(result), 's' if len(result) > 1 else '', fname)) -diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst -index 038b651ee8..a8b317eed6 100644 ---- a/tools/patman/patman.rst -+++ b/tools/patman/patman.rst -@@ -371,11 +371,12 @@ Series-process-log: sort, uniq - Separate each tag with a comma. - - Change-Id: -- This tag is stripped out but is used to generate the Message-Id -- of the emails that will be sent. When you keep the Change-Id the -- same you are asserting that this is a slightly different version -- (but logically the same patch) as other patches that have been -- sent out with the same Change-Id. -+ This tag is used to generate the Message-Id of the emails that -+ will be sent. When you keep the Change-Id the same you are -+ asserting that this is a slightly different version (but logically -+ the same patch) as other patches that have been sent out with the -+ same Change-Id. The Change-Id tag line is removed from outgoing -+ patches, unless the `keep_change_id` settings is set to `True`. - - Various other tags are silently removed, like these Chrome OS and - Gerrit tags:: -diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py -index a8bb364e42..59a53ef8ca 100644 ---- a/tools/patman/test_checkpatch.py -+++ b/tools/patman/test_checkpatch.py -@@ -160,6 +160,22 @@ Signed-off-by: Simon Glass - - rc = os.system('diff -u %s %s' % (inname, expname)) - self.assertEqual(rc, 0) -+ os.remove(inname) -+ -+ # Test whether the keep_change_id settings works. -+ inhandle, inname = tempfile.mkstemp() -+ infd = os.fdopen(inhandle, 'w', encoding='utf-8') -+ infd.write(data) -+ infd.close() -+ -+ patchstream.fix_patch(None, inname, series.Series(), com, -+ keep_change_id=True) -+ -+ with open(inname, 'r') as f: -+ content = f.read() -+ self.assertIn( -+ 'Change-Id: I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413', -+ content) - - os.remove(inname) - os.remove(expname) - -base-commit: f9a47ac8d97da2b3aaf463f268a9a872a8d921df --- -2.41.0 - base-commit: b3e0a973bca6fe5de7356f3d70c4b7d468b0a759 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 17 09:00:17 2024 Received: (at 68530) by debbugs.gnu.org; 17 Jan 2024 14:00:17 +0000 Received: from localhost ([127.0.0.1]:51141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ6Sm-0003Ou-ST for submit@debbugs.gnu.org; Wed, 17 Jan 2024 09:00:17 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:32845 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ6Sk-0002zd-26 for 68530@debbugs.gnu.org; Wed, 17 Jan 2024 09:00:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1705500006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=S0jPfkG7pyHYdw+/65585gHuac5Om3xiOmWi8XTVntw=; b=gPmWpzD48aXExOz63cQESmFOInfuSoSaOnAoFcD+3nemv+gpDyTSejSeoQiMNUyM3D/23H JFJoVSclqXKnMNVft+AE88mlEJZ53lFP8gRw8nmUgfU2812mGVmRQ1vFJrdupGPkoJ6Erx YhiKFXVADTq578GhUS/OIna9CKqtvsMDy48AHk2P7xyr01xWEOebC6Sqb3cNz6GBHToy6Z KGol6YKDIHEI5WHdQ27NEWFT32KIj8kBh8Tz0EEaRh/ChHByAK/U+WPoHz9kq0llKwqCSa 06CAFb6VtqvXcmguEiaT6nL+HXdYV3P/a1WMATlz1kdOC1EVzTm9z7kMrHiIgQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id ef6b8658 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 17 Jan 2024 14:00:06 +0000 (UTC) From: Herman Rimm To: 68530@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Add u-boot-amlogic. Date: Wed, 17 Jan 2024 14:59:58 +0100 Message-ID: <5b7310aaa70a66eb3060d6f7cb0324b7eba0b30a.1705499841.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.5 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Petr Hodina * gnu/packages/bootloaders.scm (u-boot-amlogic): New variable. --- gnu/packages/bootloaders.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 151b42210c..b354af06c8 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -894,6 +894,8 @@ ( [...] Content analysis details: (3.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68530 Cc: Petr Hodina X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Petr Hodina * gnu/packages/bootloaders.scm (u-boot-amlogic): New variable. --- gnu/packages/bootloaders.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 151b42210c..b354af06c8 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -894,6 +894,8 @@ ( [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager From: Petr Hodina * gnu/packages/bootloaders.scm (u-boot-amlogic): New variable. --- gnu/packages/bootloaders.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 151b42210c..b354af06c8 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -894,6 +894,8 @@ (define-public u-boot-tools (lambda* (#:key make-flags test-target #:allow-other-keys) (invoke "test/image/test-imagetools.sh"))) ;; Only run full test suite on x86_64 systems, as many tests + + ;; assume x86_64. ,@(if (string-match "^x86_64-linux" (or (%current-target-system) @@ -1134,6 +1136,14 @@ (define*-public (make-u-boot-sunxi64-package board triplet scp-firmware (modify-inputs (package-inputs base) (append arm-trusted-firmware-sun50i-a64)))))) +(define %u-boot-amlogic-description-64-bit + "This is a common 64-bit build of U-Boot for all 64-bit capable Amlogic s905x +variants.") + +(define-public u-boot-amlogic + (make-u-boot-package "p212" "aarch64-linux-gnu" + #:append-description %u-boot-amlogic-description-64-bit)) + (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu" (delay crust-pine64-plus))) base-commit: b3e0a973bca6fe5de7356f3d70c4b7d468b0a759 prerequisite-patch-id: 582e61fddcf1ea430f1701460aae6707d59f69e3 prerequisite-patch-id: 9ec82bb85c0838f430d24e332fce35aa7ed9ca9e prerequisite-patch-id: 57819e880d0c809667f6bf8626606b1babe63481 prerequisite-patch-id: 72858fea23cbc98dbc83cab4b714244f03685450 prerequisite-patch-id: cee17e48bf50155b92c8ea2218b01e4c7e3ce13d -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 17 14:13:40 2024 Received: (at 68530) by debbugs.gnu.org; 17 Jan 2024 19:13:40 +0000 Received: from localhost ([127.0.0.1]:53522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQBM4-00014l-5L for submit@debbugs.gnu.org; Wed, 17 Jan 2024 14:13:40 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:39966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQBM1-00014Q-1T for 68530@debbugs.gnu.org; Wed, 17 Jan 2024 14:13:38 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 6D4CF1AB93; Wed, 17 Jan 2024 11:13:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1705518806; bh=YqOz24Txp171prBB61iQTQgVv+5hzo0CVAeNrnuFF/E=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=KOhJg/ztd90CCwX6bJkoZhcRE28A3iTGuMO4edjWwwfdQhRFHFg3a7f44kVAoL22N ODRcJiCzLo3C/WU6LvE8SPePuXyLZ2WwenibxXdmLAdCa4jFCGXAxWNfKX5ZGcVUSX uxiH/WZCgq/WG6Pcl2rFuddPud6Gk1V+4Y+92FacGqDu4GbAZ27tDjQe5fkfuspo/C JR6PYW8J97uofu1kdrnZbzULbG/YdnEhYaqUYxkEdbEvibibeuLQ6RvcoPVQld3+Hw MUG2TCKSn2HzD0XDWSDGyUxSFKGqeY5Lq+0LOQZBkmAiPdv8Z4vApuVWmEbnP1faI7 rykICDpffNmpg== From: Vagrant Cascadian To: Herman Rimm , 68530@debbugs.gnu.org Subject: Re: [bug#68530] [PATCH 2/2] gnu: Add u-boot-amlogic. In-Reply-To: <5b7310aaa70a66eb3060d6f7cb0324b7eba0b30a.1705499841.git.herman@rimm.ee> References: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> <5b7310aaa70a66eb3060d6f7cb0324b7eba0b30a.1705499841.git.herman@rimm.ee> Date: Wed, 17 Jan 2024 11:13:19 -0800 Message-ID: <87sf2vbwog.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68530 Cc: Petr Hodina , Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-01-17, Herman Rimm wrote: > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index 151b42210c..b354af06c8 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -894,6 +894,8 @@ (define-public u-boot-tools > (lambda* (#:key make-flags test-target #:allow-other-keys) > (invoke "test/image/test-imagetools.sh"))) > ;; Only run full test suite on x86_64 systems, as many tests > + > + > ;; assume x86_64. > ,@(if (string-match "^x86_64-linux" > (or (%current-target-system) Is this whitespace change needed for some reason? > @@ -1134,6 +1136,14 @@ (define*-public (make-u-boot-sunxi64-package board= triplet scp-firmware > (modify-inputs (package-inputs base) > (append arm-trusted-firmware-sun50i-a64)))))) >=20=20 > +(define %u-boot-amlogic-description-64-bit > + "This is a common 64-bit build of U-Boot for all 64-bit capable Amlogi= c s905x > +variants.") > + > +(define-public u-boot-amlogic > + (make-u-boot-package "p212" "aarch64-linux-gnu" > + #:append-description %u-boot-amlogic-description-= 64-bit)) > + This should be called u-boot-p212. There are numerous other potential amlogic platforms... Although, an even bigger issues is that amlogic platforms all to my knowledge require some non-free components in order to sign the binaries before installing them, see the documentation in u-boot sources: doc/board/amlogic/p212.rst live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZagmzwAKCRDcUY/If5cW qr0eAQC81xvnvhm6GJZPkVNQcc2WVckx5HHhJN1tIALKw45CugD/dj1gGENXo1B3 lkma4qleh0eorddflQJ7+Cjj3rApJAc= =v8pm -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 17 15:00:14 2024 Received: (at 68530) by debbugs.gnu.org; 17 Jan 2024 20:00:14 +0000 Received: from localhost ([127.0.0.1]:53568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQC57-0002dy-FG for submit@debbugs.gnu.org; Wed, 17 Jan 2024 15:00:14 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:58052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQC54-0002B4-G3 for 68530@debbugs.gnu.org; Wed, 17 Jan 2024 15:00:11 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 096F51AB95; Wed, 17 Jan 2024 12:00:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1705521600; bh=fvHA58YLUgyuIdZNWMCXU/DBe4KyRS0dyg2WzQNYCA0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=hlvmVU0YbxHH0cGkIWlfMB1JlRHMwADvVgsXQZ3bPg+NzHtMp5rBBsfMg8EZrNqtT M+2p+YElx4xdwii/aJ6QjPyZEKONgwHsxJ1ZOe+taWd7zvsKUm1KBWXWABsDRR+Ycm 8Z5V/FvRLXGIb54kBX5+QEToWEDUbpc47Wzhi8u4D2L96wLI54k8c95Smxx5kDEcGa FSJ5VlqP0AoGCaxx+pmWXPnKI839wVl10HwtfWvhrXaS6RlUbUNDfuJXDgvf1qqI+B HVAwKXLIX2+DSMXKJa5n82ZOQ0sMBfntXsEDr0EroukYJ8QeTsvVaz1kdqbvOhK/fj CkeUzd6ocWdXQ== From: Vagrant Cascadian To: Herman Rimm , 68530@debbugs.gnu.org Subject: Re: [bug#68530] [PATCH 1/2] gnu: u-boot: Update to 2024.01.3. In-Reply-To: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> References: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> Date: Wed, 17 Jan 2024 11:59:53 -0800 Message-ID: <87jzo7buiu.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68530 Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-01-17, Herman Rimm wrote: > * gnu/local.mk: Deregister patch. > * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01.3. > [source]: remove patman patch. > * gnu/packages/patches/u-boot-patman-change-id.patch: Delete file. The subject and commit refer to version 2024.01.3, but the code only refers to version 2024.01. > The OpenSSL patch is incomplete, see build errors for variable added in > [PATCH 2/2], from #60043 by phodina. It is not obvious where to add the > #if-directives to make it compile. These two commits were included in upstream git, which might be relevent or helpful? 03e598263e3878b6f5d58f5525577903edadc644 tools: fix build without LIBCRYPTO= support b646a1053fda188bfb054acc98aa73bb23b158b1 tools: kwbimage: Allow disabling b= uild on non-mvebu platforms Those two issues aside, this otherwise looks good. Thanks for working on it! live well, vagrant > > gnu/local.mk | 1 - > gnu/packages/bootloaders.scm | 7 +- > .../patches/u-boot-patman-change-id.patch | 232 ------------------ > 3 files changed, 3 insertions(+), 237 deletions(-) > delete mode 100644 gnu/packages/patches/u-boot-patman-change-id.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 34bed91fc3..98bf04b1e1 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -2097,7 +2097,6 @@ dist_patch_DATA =3D \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ > %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ > - %D%/packages/patches/u-boot-patman-change-id.patch \ > %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ > %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ > %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index c73a0e665d..151b42210c 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -719,19 +719,18 @@ (define %u-boot-allow-disabling-openssl-patch > (define u-boot > (package > (name "u-boot") > - (version "2023.10") > + (version "2024.01") > (source (origin > (patches > (list %u-boot-rockchip-inno-usb-patch > - %u-boot-allow-disabling-openssl-patch > - (search-patch "u-boot-patman-change-id.patch"))) > + %u-boot-allow-disabling-openssl-patch)) > (method url-fetch) > (uri (string-append > "https://ftp.denx.de/pub/u-boot/" > "u-boot-" version ".tar.bz2")) > (sha256 > (base32 > - "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0"))= )) > + "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr"))= )) > (build-system gnu-build-system) > (native-inputs > (list bison > diff --git a/gnu/packages/patches/u-boot-patman-change-id.patch b/gnu/pac= kages/patches/u-boot-patman-change-id.patch > deleted file mode 100644 > index 354aee2755..0000000000 > --- a/gnu/packages/patches/u-boot-patman-change-id.patch > +++ /dev/null > @@ -1,232 +0,0 @@ > -Upstream status: https://patchwork.ozlabs.org/project/uboot/patch/202310= 13030633.7191-1-maxim.cournoyer@gmail.com/ > - > -From f83a5e07b0934e38cbee923e0c5b7fc0a890926c Mon Sep 17 00:00:00 2001 > -From: Maxim Cournoyer > -Date: Thu, 12 Oct 2023 17:04:25 -0400 > -Subject: [PATCH] patman: Add a 'keep_change_id' setting > - > -A Change-Id can be useful for traceability purposes, and some projects > -may wish to have them preserved. This change makes it configurable > -via a new 'keep_change_id' setting. > - > -Series-version: 2 > -Series-changes: 2 > -- Add missing argument to send parser > ---- > - tools/patman/__main__.py | 2 ++ > - tools/patman/control.py | 12 +++++++++--- > - tools/patman/patchstream.py | 17 ++++++++++++----- > - tools/patman/patman.rst | 11 ++++++----- > - tools/patman/test_checkpatch.py | 16 ++++++++++++++++ > - 5 files changed, 45 insertions(+), 13 deletions(-) > - > -diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py > -index 8eba5d3486..197ac1aad1 100755 > ---- a/tools/patman/__main__.py > -+++ b/tools/patman/__main__.py > -@@ -103,6 +103,8 @@ send.add_argument('--no-signoff', action=3D'store_fa= lse', dest=3D'add_signoff', > - default=3DTrue, help=3D"Don't add Signed-off-by to pa= tches") > - send.add_argument('--smtp-server', type=3Dstr, > - help=3D"Specify the SMTP server to 'git send-email'") > -+send.add_argument('--keep-change-id', action=3D'store_true', > -+ help=3D'Preserve Change-Id tags in patches to send.') > -=20 > - send.add_argument('patchfiles', nargs=3D'*') > -=20 > -diff --git a/tools/patman/control.py b/tools/patman/control.py > -index 916ddf8fcf..b292da9dc2 100644 > ---- a/tools/patman/control.py > -+++ b/tools/patman/control.py > -@@ -16,11 +16,14 @@ from patman import gitutil > - from patman import patchstream > - from u_boot_pylib import terminal > -=20 > -+ > - def setup(): > - """Do required setup before doing anything""" > - gitutil.setup() > -=20 > --def prepare_patches(col, branch, count, start, end, ignore_binary, sign= off): > -+ > -+def prepare_patches(col, branch, count, start, end, ignore_binary, sign= off, > -+ keep_change_id=3DFalse): > - """Figure out what patches to generate, then generate them > -=20 > - The patch files are written to the current directory, e.g. 0001_xxx= .patch > -@@ -35,6 +38,7 @@ def prepare_patches(col, branch, count, start, end, ig= nore_binary, signoff): > - end (int): End patch to use (0=3Dlast one in series, 1=3Done be= fore that, > - etc.) > - ignore_binary (bool): Don't generate patches for binary files > -+ keep_change_id (bool): Preserve the Change-Id tag. > -=20 > - Returns: > - Tuple: > -@@ -59,11 +63,12 @@ def prepare_patches(col, branch, count, start, end, = ignore_binary, signoff): > - branch, start, to_do, ignore_binary, series, signoff) > -=20 > - # Fix up the patch files to our liking, and insert the cover letter > -- patchstream.fix_patches(series, patch_files) > -+ patchstream.fix_patches(series, patch_files, keep_change_id) > - if cover_fname and series.get('cover'): > - patchstream.insert_cover_letter(cover_fname, series, to_do) > - return series, cover_fname, patch_files > -=20 > -+ > - def check_patches(series, patch_files, run_checkpatch, verbose, use_tre= e): > - """Run some checks on a set of patches > -=20 > -@@ -166,7 +171,8 @@ def send(args): > - col =3D terminal.Color() > - series, cover_fname, patch_files =3D prepare_patches( > - col, args.branch, args.count, args.start, args.end, > -- args.ignore_binary, args.add_signoff) > -+ args.ignore_binary, args.add_signoff, > -+ keep_change_id=3Dargs.keep_change_id) > - ok =3D check_patches(series, patch_files, args.check_patch, > - args.verbose, args.check_patch_use_tree) > -=20 > -diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py > -index f91669a940..e2e2a83e67 100644 > ---- a/tools/patman/patchstream.py > -+++ b/tools/patman/patchstream.py > -@@ -68,6 +68,7 @@ STATE_PATCH_SUBJECT =3D 1 # In patch subject (firs= t line of log for a commit) > - STATE_PATCH_HEADER =3D 2 # In patch header (after the subject) > - STATE_DIFFS =3D 3 # In the diff part (past --- line) > -=20 > -+ > - class PatchStream: > - """Class for detecting/injecting tags in a patch or series of patch= es > -=20 > -@@ -76,7 +77,7 @@ class PatchStream: > - unwanted tags or inject additional ones. These correspond to the two > - phases of processing. > - """ > -- def __init__(self, series, is_log=3DFalse): > -+ def __init__(self, series, is_log=3DFalse, keep_change_id=3DFalse): > - self.skip_blank =3D False # True to skip a single blan= k line > - self.found_test =3D False # Found a TEST=3D line > - self.lines_after_test =3D 0 # Number of lines found afte= r TEST=3D > -@@ -86,6 +87,7 @@ class PatchStream: > - self.section =3D [] # The current section...END = section > - self.series =3D series # Info about the patch series > - self.is_log =3D is_log # True if indent like git log > -+ self.keep_change_id =3D keep_change_id # True to keep Change-I= d tags > - self.in_change =3D None # Name of the change list we= are in > - self.change_version =3D 0 # Non-zero if we are in a ch= ange list > - self.change_lines =3D [] # Lines of the current change > -@@ -452,6 +454,8 @@ class PatchStream: > -=20 > - # Detect Change-Id tags > - elif change_id_match: > -+ if self.keep_change_id: > -+ out =3D [line] > - value =3D change_id_match.group(1) > - if self.is_log: > - if self.commit.change_id: > -@@ -763,7 +767,7 @@ def get_metadata_for_test(text): > - pst.finalise() > - return series > -=20 > --def fix_patch(backup_dir, fname, series, cmt): > -+def fix_patch(backup_dir, fname, series, cmt, keep_change_id=3DFalse): > - """Fix up a patch file, by adding/removing as required. > -=20 > - We remove our tags from the patch file, insert changes lists, etc. > -@@ -776,6 +780,7 @@ def fix_patch(backup_dir, fname, series, cmt): > - fname (str): Filename to patch file to process > - series (Series): Series information about this patch set > - cmt (Commit): Commit object for this patch file > -+ keep_change_id (bool): Keep the Change-Id tag. > -=20 > - Return: > - list: A list of errors, each str, or [] if all ok. > -@@ -783,7 +788,7 @@ def fix_patch(backup_dir, fname, series, cmt): > - handle, tmpname =3D tempfile.mkstemp() > - outfd =3D os.fdopen(handle, 'w', encoding=3D'utf-8') > - infd =3D open(fname, 'r', encoding=3D'utf-8') > -- pst =3D PatchStream(series) > -+ pst =3D PatchStream(series, keep_change_id=3Dkeep_change_id) > - pst.commit =3D cmt > - pst.process_stream(infd, outfd) > - infd.close() > -@@ -795,7 +800,7 @@ def fix_patch(backup_dir, fname, series, cmt): > - shutil.move(tmpname, fname) > - return cmt.warn > -=20 > --def fix_patches(series, fnames): > -+def fix_patches(series, fnames, keep_change_id=3DFalse): > - """Fix up a list of patches identified by filenames > -=20 > - The patch files are processed in place, and overwritten. > -@@ -803,6 +808,7 @@ def fix_patches(series, fnames): > - Args: > - series (Series): The Series object > - fnames (:type: list of str): List of patch files to process > -+ keep_change_id (bool): Keep the Change-Id tag. > - """ > - # Current workflow creates patches, so we shouldn't need a backup > - backup_dir =3D None #tempfile.mkdtemp('clean-patch') > -@@ -811,7 +817,8 @@ def fix_patches(series, fnames): > - cmt =3D series.commits[count] > - cmt.patch =3D fname > - cmt.count =3D count > -- result =3D fix_patch(backup_dir, fname, series, cmt) > -+ result =3D fix_patch(backup_dir, fname, series, cmt, > -+ keep_change_id=3Dkeep_change_id) > - if result: > - print('%d warning%s for %s:' % > - (len(result), 's' if len(result) > 1 else '', fname)) > -diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst > -index 038b651ee8..a8b317eed6 100644 > ---- a/tools/patman/patman.rst > -+++ b/tools/patman/patman.rst > -@@ -371,11 +371,12 @@ Series-process-log: sort, uniq > - Separate each tag with a comma. > -=20 > - Change-Id: > -- This tag is stripped out but is used to generate the Message-Id > -- of the emails that will be sent. When you keep the Change-Id the > -- same you are asserting that this is a slightly different version > -- (but logically the same patch) as other patches that have been > -- sent out with the same Change-Id. > -+ This tag is used to generate the Message-Id of the emails that > -+ will be sent. When you keep the Change-Id the same you are > -+ asserting that this is a slightly different version (but logically > -+ the same patch) as other patches that have been sent out with the > -+ same Change-Id. The Change-Id tag line is removed from outgoing > -+ patches, unless the `keep_change_id` settings is set to `True`. > -=20 > - Various other tags are silently removed, like these Chrome OS and > - Gerrit tags:: > -diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpa= tch.py > -index a8bb364e42..59a53ef8ca 100644 > ---- a/tools/patman/test_checkpatch.py > -+++ b/tools/patman/test_checkpatch.py > -@@ -160,6 +160,22 @@ Signed-off-by: Simon Glass > -=20 > - rc =3D os.system('diff -u %s %s' % (inname, expname)) > - self.assertEqual(rc, 0) > -+ os.remove(inname) > -+ > -+ # Test whether the keep_change_id settings works. > -+ inhandle, inname =3D tempfile.mkstemp() > -+ infd =3D os.fdopen(inhandle, 'w', encoding=3D'utf-8') > -+ infd.write(data) > -+ infd.close() > -+ > -+ patchstream.fix_patch(None, inname, series.Series(), com, > -+ keep_change_id=3DTrue) > -+ > -+ with open(inname, 'r') as f: > -+ content =3D f.read() > -+ self.assertIn( > -+ 'Change-Id: I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413', > -+ content) > -=20 > - os.remove(inname) > - os.remove(expname) > - > -base-commit: f9a47ac8d97da2b3aaf463f268a9a872a8d921df > ---=20 > -2.41.0 > - > > base-commit: b3e0a973bca6fe5de7356f3d70c4b7d468b0a759 > --=20 > 2.41.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZagxuQAKCRDcUY/If5cW qgL3AQDejZSJR5UFqBtx8fFv78/EActKuGLRqu0KggYMW26IJwEAm1/KQzTg8C6d F5wRyqKKFgZIRzU57R/tos5rjMiJ1Qo= =Hwzh -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 11:04:17 2024 Received: (at 68530) by debbugs.gnu.org; 18 Jan 2024 16:04:17 +0000 Received: from localhost ([127.0.0.1]:56510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQUsK-0000lW-Mv for submit@debbugs.gnu.org; Thu, 18 Jan 2024 11:04:17 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:57501 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQUsI-0000lB-D4 for 68530@debbugs.gnu.org; Thu, 18 Jan 2024 11:04:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1705593845; h=from:from: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; bh=MrdaDsx+SQHgKD3ax2KOOPjVFL1c7FusVPnnAAjh4TE=; b=QFnhWAieBkXTUoQ42jRdmqSu2P63CG2gHaKPPh9n6SYiXOlaC/bCEpjNc7OAJDh5QRIIRw X+4NENttIRJv+/MFws0dBtOLExsuGCDtDR9Y+H2uBDEYQx5Y91LH6pchyi9EYnTaJkjI6p jC0dEl72dWbIXamI6EEsODinzEpBJtV5fywQjapI6uqJvOStoOa+mtOFoMmWkqzZrqixgz riwXGIvkaDA59P5u91nKcXTSb3HNjPoZmDYGOhXDwhtY0MmesgWnbc8Xqn2xJwS1f/nCVp 5aRap1SLRMAtz1ubLdXECWoXzhcQqDxv6d/lBEg/Hbi01KEPMI384zVELvMJGA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 44778e30 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 Jan 2024 16:04:05 +0000 (UTC) Date: Thu, 18 Jan 2024 17:03:58 +0100 From: Herman Rimm To: Vagrant Cascadian , 68530@debbugs.gnu.org Subject: Re: [bug#68530] [PATCH 1/2] gnu: u-boot: Update to 2024.01.3. Message-ID: References: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> <87jzo7buiu.fsf@wireframe> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87jzo7buiu.fsf@wireframe> X-Spam-Score: 3.5 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Wed, Jan 17, 2024 at 11:59:53AM -0800, Vagrant Cascadian wrote: > These two commits were included in upstream git, which might be > relevent or helpful? > > 03e598263e3878b6f5d58f5525577903edadc644 tools: fix build without LIBCRYPTO support > b646a1053fda188bfb054 [...] Content analysis details: (3.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68530 Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Wed, Jan 17, 2024 at 11:59:53AM -0800, Vagrant Cascadian wrote: > These two commits were included in upstream git, which might be > relevent or helpful? > > 03e598263e3878b6f5d58f5525577903edadc644 tools: fix build without LIBCRYPTO support > b646a1053fda188bfb054 [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager On Wed, Jan 17, 2024 at 11:59:53AM -0800, Vagrant Cascadian wrote: > These two commits were included in upstream git, which might be > relevent or helpful? > > 03e598263e3878b6f5d58f5525577903edadc644 tools: fix build without LIBCRYPTO support > b646a1053fda188bfb054acc98aa73bb23b158b1 tools: kwbimage: Allow disabling build on non-mvebu platforms Nice find! I have included 03e5982 as a patch, which fixes the u-boot-amlogic-p212 build errors. > Although, an even bigger issues is that amlogic platforms all to my > knowledge require some non-free components in order to sign the binaries > before installing them, see the documentation in u-boot sources: Yes, I think it would be more useful to add u-boot-amlogic-p212 and the tools from #60043 to a non-official channel together with the non-free stuff. Cheers, Herman From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 11:12:51 2024 Received: (at 68530) by debbugs.gnu.org; 18 Jan 2024 16:12:51 +0000 Received: from localhost ([127.0.0.1]:56522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQV0b-000139-OK for submit@debbugs.gnu.org; Thu, 18 Jan 2024 11:12:51 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:35269 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQV0Y-00012h-NC for 68530@debbugs.gnu.org; Thu, 18 Jan 2024 11:12:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1705594357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=nKFa5mggIEQESNFep9ibXvwSZpZgM0FhGqdqn9a/Xew=; b=Ze6Df8agpOXfWE8uhN3C+Hb52f5cs8QrNCvcHMcYJ2FHVxYbQWnXZZQPRhJPWb76Fy9mZB 6qvJ+QSaK3ac91liTLM0V5fOqg7J5KEUCnzUQnH5w9YtvddMwzYNk0l5rwNRAMA7svhmtk ahpSvNTRTTtso+I27fmTOn2U7/8pS0rLD/n145hU6tyouZZwjNlreBfyuTZO1fPZkvPYIJ seZUzjBq9aJqjLmxBegxr7n1+/FOXu0W0tO6s2mmRFfLgPivRKAXONBzftV201aTLPPboe mzkMqyCYxh7niJ8JA7/F+/xIEksmVeDeEhIbPsFBy4emct/Lql6J21zgO5obXg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 330d6bbd (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 Jan 2024 16:12:37 +0000 (UTC) From: Herman Rimm To: 68530@debbugs.gnu.org Subject: [PATCH v2] gnu: u-boot: Update to 2024.01. Date: Thu, 18 Jan 2024 17:11:02 +0100 Message-ID: <776ce797ccb78a313b1d7bd5b952b37c09149db5.1705594261.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 3.5 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/local.mk: Replace patch. * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. [source]: replace patman patch with new patch. * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: R [...] Content analysis details: (3.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_IP Message was received from an IP address 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68530 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/local.mk: Replace patch. * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. [source]: replace patman patch with new patch. * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: R [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/local.mk: Replace patch. * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. [source]: replace patman patch with new patch. * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Remove upstreamed diffs. * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Add file. * gnu/packages/patches/u-boot-patman-change-id.patch: Delete file. Change-Id: I5a21d4cd645449ff669f17cdabe5313870bec46f --- gnu/local.mk | 2 +- gnu/packages/bootloaders.scm | 12 +- .../u-boot-allow-disabling-openssl.patch | 64 +---- .../u-boot-build-without-libcrypto.patch | 123 ++++++++++ .../patches/u-boot-patman-change-id.patch | 232 ------------------ 5 files changed, 134 insertions(+), 299 deletions(-) create mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.patch delete mode 100644 gnu/packages/patches/u-boot-patman-change-id.patch diff --git a/gnu/local.mk b/gnu/local.mk index 34bed91fc3..96faa813c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2096,8 +2096,8 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ + %D%/packages/patches/u-boot-build-without-libcrypto.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ - %D%/packages/patches/u-boot-patman-change-id.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c73a0e665d..986f0ac035 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -716,22 +716,26 @@ (define %u-boot-allow-disabling-openssl-patch ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html (search-patch "u-boot-allow-disabling-openssl.patch")) +(define %u-boot-build-without-libcrypto-patch + ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. + (search-patch "u-boot-build-without-libcrypto.patch")) + (define u-boot (package (name "u-boot") - (version "2023.10") + (version "2024.01") (source (origin (patches (list %u-boot-rockchip-inno-usb-patch - %u-boot-allow-disabling-openssl-patch - (search-patch "u-boot-patman-change-id.patch"))) + %u-boot-build-without-libcrypto-patch + %u-boot-allow-disabling-openssl-patch)) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" "u-boot-" version ".tar.bz2")) (sha256 (base32 - "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0")))) + "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr")))) (build-system gnu-build-system) (native-inputs (list bison diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch index 708ed81e93..9201f9a51d 100644 --- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch +++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch @@ -8,7 +8,8 @@ This reverts commit b4f3cc2c42d97967a3a3c8796c340f6b07ecccac. Addendum 2022-12-08, Ricardo Wurmus: This patch has been updated to introduce CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl. -Addendum 2023-10-17, Herman Rimm: Update patch for u-boot v2023.10. +Addendum 2024-01-18, Herman Rimm: Patch updated to leave out upstreamed +diffs with CONFIG_FIT_PRELOAD. diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 4dce495ff0..976174ae77 100644 @@ -145,64 +146,3 @@ index 4dce495ff0..976174ae77 100644 /* Calculate and set the header checksum */ main_hdr->checksum = image_checksum8(main_hdr, headersz); ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -14,8 +14,10 @@ - #include - #include - -+#ifdef CONFIG_FIT_PRELOAD - #include - #include -+#endif - - /** - * fit_set_hash_value - set hash value in requested has node -@@ -1119,6 +1121,7 @@ static int fit_config_add_verification_data(const char *keydir, - return 0; - } - -+#ifdef CONFIG_FIT_PRELOAD - /* - * 0) open file (open) - * 1) read certificate (PEM_read_X509) -@@ -1227,6 +1230,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit) - out: - return ret; - } -+#endif - - int fit_cipher_data(const char *keydir, void *keydest, void *fit, - const char *comment, int require_keys, ---- a/tools/fit_image.c -+++ b/tools/fit_image.c -@@ -61,9 +61,10 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc, - ret = fit_set_timestamp(ptr, 0, time); - } - -+#ifdef CONFIG_FIT_PRELOAD - if (!ret) - ret = fit_pre_load_data(params->keydir, dest_blob, ptr); -- -+#endif - if (!ret) { - ret = fit_cipher_data(params->keydir, dest_blob, ptr, - params->comment, ---- a/include/image.h -+++ b/include/image.h -@@ -1182,6 +1182,7 @@ int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value, - - int fit_set_timestamp(void *fit, int noffset, time_t timestamp); - -+#ifdef CONFIG_FIT_PRELOAD - /** - * fit_pre_load_data() - add public key to fdt blob - * -@@ -1196,6 +1197,7 @@ int fit_set_timestamp(void *fit, int noffset, time_t timestamp); - * < 0, on failure - */ - int fit_pre_load_data(const char *keydir, void *keydest, void *fit); -+#endif - - int fit_cipher_data(const char *keydir, void *keydest, void *fit, - const char *comment, int require_keys, diff --git a/gnu/packages/patches/u-boot-build-without-libcrypto.patch b/gnu/packages/patches/u-boot-build-without-libcrypto.patch new file mode 100644 index 0000000000..d56588941c --- /dev/null +++ b/gnu/packages/patches/u-boot-build-without-libcrypto.patch @@ -0,0 +1,123 @@ +From 03e598263e3878b6f5d58f5525577903edadc644 Mon Sep 17 00:00:00 2001 +From: Paul-Erwan Rio +Date: Thu, 21 Dec 2023 08:26:11 +0100 +Subject: [PATCH] tools: fix build without LIBCRYPTO support + +Commit cb9faa6f98ae ("tools: Use a single target-independent config to +enable OpenSSL") introduced a target-independent configuration to build +crypto features in host tools. + +But since commit 2c21256b27d7 ("hash: Use Kconfig to enable hashing in +host tools and SPL") the build without OpenSSL is broken, due to FIT +signature/encryption features. Add missing conditional compilation +tokens to fix this. + +Signed-off-by: Paul-Erwan Rio +Tested-by: Alexander Dahl +Cc: Simon Glass +Reviewed-by: Tom Rini +Reviewed-by: Simon Glass +--- + include/image.h | 2 +- + tools/Kconfig | 1 + + tools/fit_image.c | 2 +- + tools/image-host.c | 4 ++++ + tools/mkimage.c | 5 +++-- + 5 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/include/image.h b/include/image.h +index 432ec927b1..21de70f0c9 100644 +--- a/include/image.h ++++ b/include/image.h +@@ -1465,7 +1465,7 @@ int calculate_hash(const void *data, int data_len, const char *algo, + * device + */ + #if defined(USE_HOSTCC) +-# if defined(CONFIG_FIT_SIGNATURE) ++# if CONFIG_IS_ENABLED(FIT_SIGNATURE) + # define IMAGE_ENABLE_SIGN 1 + # define FIT_IMAGE_ENABLE_VERIFY 1 + # include +diff --git a/tools/Kconfig b/tools/Kconfig +index f8632cd59d..f01ed783e6 100644 +--- a/tools/Kconfig ++++ b/tools/Kconfig +@@ -51,6 +51,7 @@ config TOOLS_FIT_RSASSA_PSS + Support the rsassa-pss signature scheme in the tools builds + + config TOOLS_FIT_SIGNATURE ++ depends on TOOLS_LIBCRYPTO + def_bool y + help + Enable signature verification of FIT uImages in the tools builds +diff --git a/tools/fit_image.c b/tools/fit_image.c +index 71e031c855..beef1fa86e 100644 +--- a/tools/fit_image.c ++++ b/tools/fit_image.c +@@ -61,7 +61,7 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc, + ret = fit_set_timestamp(ptr, 0, time); + } + +- if (!ret) ++ if (CONFIG_IS_ENABLED(FIT_SIGNATURE) && !ret) + ret = fit_pre_load_data(params->keydir, dest_blob, ptr); + + if (!ret) { +diff --git a/tools/image-host.c b/tools/image-host.c +index ca4950312f..90bc9f905f 100644 +--- a/tools/image-host.c ++++ b/tools/image-host.c +@@ -14,8 +14,10 @@ + #include + #include + ++#if CONFIG_IS_ENABLED(FIT_SIGNATURE) + #include + #include ++#endif + + /** + * fit_set_hash_value - set hash value in requested has node +@@ -1131,6 +1133,7 @@ static int fit_config_add_verification_data(const char *keydir, + return 0; + } + ++#if CONFIG_IS_ENABLED(FIT_SIGNATURE) + /* + * 0) open file (open) + * 1) read certificate (PEM_read_X509) +@@ -1239,6 +1242,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit) + out: + return ret; + } ++#endif + + int fit_cipher_data(const char *keydir, void *keydest, void *fit, + const char *comment, int require_keys, +diff --git a/tools/mkimage.c b/tools/mkimage.c +index 6dfe3e1d42..ac62ebbde9 100644 +--- a/tools/mkimage.c ++++ b/tools/mkimage.c +@@ -115,7 +115,7 @@ static void usage(const char *msg) + " -B => align size in hex for FIT structure and header\n" + " -b => append the device tree binary to the FIT\n" + " -t => update the timestamp in the FIT\n"); +-#ifdef CONFIG_FIT_SIGNATURE ++#if CONFIG_IS_ENABLED(FIT_SIGNATURE) + fprintf(stderr, + "Signing / verified boot options: [-k keydir] [-K dtb] [ -c ] [-p addr] [-r] [-N engine]\n" + " -k => set directory containing private keys\n" +@@ -130,8 +130,9 @@ static void usage(const char *msg) + " -o => algorithm to use for signing\n"); + #else + fprintf(stderr, +- "Signing / verified boot not supported (CONFIG_FIT_SIGNATURE undefined)\n"); ++ "Signing / verified boot not supported (CONFIG_TOOLS_FIT_SIGNATURE undefined)\n"); + #endif ++ + fprintf(stderr, " %s -V ==> print version information and exit\n", + params.cmdname); + fprintf(stderr, "Use '-T list' to see a list of available image types\n"); +-- +2.41.0 + diff --git a/gnu/packages/patches/u-boot-patman-change-id.patch b/gnu/packages/patches/u-boot-patman-change-id.patch deleted file mode 100644 index 354aee2755..0000000000 --- a/gnu/packages/patches/u-boot-patman-change-id.patch +++ /dev/null @@ -1,232 +0,0 @@ -Upstream status: https://patchwork.ozlabs.org/project/uboot/patch/20231013030633.7191-1-maxim.cournoyer@gmail.com/ - -From f83a5e07b0934e38cbee923e0c5b7fc0a890926c Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Thu, 12 Oct 2023 17:04:25 -0400 -Subject: [PATCH] patman: Add a 'keep_change_id' setting - -A Change-Id can be useful for traceability purposes, and some projects -may wish to have them preserved. This change makes it configurable -via a new 'keep_change_id' setting. - -Series-version: 2 -Series-changes: 2 -- Add missing argument to send parser ---- - tools/patman/__main__.py | 2 ++ - tools/patman/control.py | 12 +++++++++--- - tools/patman/patchstream.py | 17 ++++++++++++----- - tools/patman/patman.rst | 11 ++++++----- - tools/patman/test_checkpatch.py | 16 ++++++++++++++++ - 5 files changed, 45 insertions(+), 13 deletions(-) - -diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py -index 8eba5d3486..197ac1aad1 100755 ---- a/tools/patman/__main__.py -+++ b/tools/patman/__main__.py -@@ -103,6 +103,8 @@ send.add_argument('--no-signoff', action='store_false', dest='add_signoff', - default=True, help="Don't add Signed-off-by to patches") - send.add_argument('--smtp-server', type=str, - help="Specify the SMTP server to 'git send-email'") -+send.add_argument('--keep-change-id', action='store_true', -+ help='Preserve Change-Id tags in patches to send.') - - send.add_argument('patchfiles', nargs='*') - -diff --git a/tools/patman/control.py b/tools/patman/control.py -index 916ddf8fcf..b292da9dc2 100644 ---- a/tools/patman/control.py -+++ b/tools/patman/control.py -@@ -16,11 +16,14 @@ from patman import gitutil - from patman import patchstream - from u_boot_pylib import terminal - -+ - def setup(): - """Do required setup before doing anything""" - gitutil.setup() - --def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): -+ -+def prepare_patches(col, branch, count, start, end, ignore_binary, signoff, -+ keep_change_id=False): - """Figure out what patches to generate, then generate them - - The patch files are written to the current directory, e.g. 0001_xxx.patch -@@ -35,6 +38,7 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): - end (int): End patch to use (0=last one in series, 1=one before that, - etc.) - ignore_binary (bool): Don't generate patches for binary files -+ keep_change_id (bool): Preserve the Change-Id tag. - - Returns: - Tuple: -@@ -59,11 +63,12 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): - branch, start, to_do, ignore_binary, series, signoff) - - # Fix up the patch files to our liking, and insert the cover letter -- patchstream.fix_patches(series, patch_files) -+ patchstream.fix_patches(series, patch_files, keep_change_id) - if cover_fname and series.get('cover'): - patchstream.insert_cover_letter(cover_fname, series, to_do) - return series, cover_fname, patch_files - -+ - def check_patches(series, patch_files, run_checkpatch, verbose, use_tree): - """Run some checks on a set of patches - -@@ -166,7 +171,8 @@ def send(args): - col = terminal.Color() - series, cover_fname, patch_files = prepare_patches( - col, args.branch, args.count, args.start, args.end, -- args.ignore_binary, args.add_signoff) -+ args.ignore_binary, args.add_signoff, -+ keep_change_id=args.keep_change_id) - ok = check_patches(series, patch_files, args.check_patch, - args.verbose, args.check_patch_use_tree) - -diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py -index f91669a940..e2e2a83e67 100644 ---- a/tools/patman/patchstream.py -+++ b/tools/patman/patchstream.py -@@ -68,6 +68,7 @@ STATE_PATCH_SUBJECT = 1 # In patch subject (first line of log for a commit) - STATE_PATCH_HEADER = 2 # In patch header (after the subject) - STATE_DIFFS = 3 # In the diff part (past --- line) - -+ - class PatchStream: - """Class for detecting/injecting tags in a patch or series of patches - -@@ -76,7 +77,7 @@ class PatchStream: - unwanted tags or inject additional ones. These correspond to the two - phases of processing. - """ -- def __init__(self, series, is_log=False): -+ def __init__(self, series, is_log=False, keep_change_id=False): - self.skip_blank = False # True to skip a single blank line - self.found_test = False # Found a TEST= line - self.lines_after_test = 0 # Number of lines found after TEST= -@@ -86,6 +87,7 @@ class PatchStream: - self.section = [] # The current section...END section - self.series = series # Info about the patch series - self.is_log = is_log # True if indent like git log -+ self.keep_change_id = keep_change_id # True to keep Change-Id tags - self.in_change = None # Name of the change list we are in - self.change_version = 0 # Non-zero if we are in a change list - self.change_lines = [] # Lines of the current change -@@ -452,6 +454,8 @@ class PatchStream: - - # Detect Change-Id tags - elif change_id_match: -+ if self.keep_change_id: -+ out = [line] - value = change_id_match.group(1) - if self.is_log: - if self.commit.change_id: -@@ -763,7 +767,7 @@ def get_metadata_for_test(text): - pst.finalise() - return series - --def fix_patch(backup_dir, fname, series, cmt): -+def fix_patch(backup_dir, fname, series, cmt, keep_change_id=False): - """Fix up a patch file, by adding/removing as required. - - We remove our tags from the patch file, insert changes lists, etc. -@@ -776,6 +780,7 @@ def fix_patch(backup_dir, fname, series, cmt): - fname (str): Filename to patch file to process - series (Series): Series information about this patch set - cmt (Commit): Commit object for this patch file -+ keep_change_id (bool): Keep the Change-Id tag. - - Return: - list: A list of errors, each str, or [] if all ok. -@@ -783,7 +788,7 @@ def fix_patch(backup_dir, fname, series, cmt): - handle, tmpname = tempfile.mkstemp() - outfd = os.fdopen(handle, 'w', encoding='utf-8') - infd = open(fname, 'r', encoding='utf-8') -- pst = PatchStream(series) -+ pst = PatchStream(series, keep_change_id=keep_change_id) - pst.commit = cmt - pst.process_stream(infd, outfd) - infd.close() -@@ -795,7 +800,7 @@ def fix_patch(backup_dir, fname, series, cmt): - shutil.move(tmpname, fname) - return cmt.warn - --def fix_patches(series, fnames): -+def fix_patches(series, fnames, keep_change_id=False): - """Fix up a list of patches identified by filenames - - The patch files are processed in place, and overwritten. -@@ -803,6 +808,7 @@ def fix_patches(series, fnames): - Args: - series (Series): The Series object - fnames (:type: list of str): List of patch files to process -+ keep_change_id (bool): Keep the Change-Id tag. - """ - # Current workflow creates patches, so we shouldn't need a backup - backup_dir = None #tempfile.mkdtemp('clean-patch') -@@ -811,7 +817,8 @@ def fix_patches(series, fnames): - cmt = series.commits[count] - cmt.patch = fname - cmt.count = count -- result = fix_patch(backup_dir, fname, series, cmt) -+ result = fix_patch(backup_dir, fname, series, cmt, -+ keep_change_id=keep_change_id) - if result: - print('%d warning%s for %s:' % - (len(result), 's' if len(result) > 1 else '', fname)) -diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst -index 038b651ee8..a8b317eed6 100644 ---- a/tools/patman/patman.rst -+++ b/tools/patman/patman.rst -@@ -371,11 +371,12 @@ Series-process-log: sort, uniq - Separate each tag with a comma. - - Change-Id: -- This tag is stripped out but is used to generate the Message-Id -- of the emails that will be sent. When you keep the Change-Id the -- same you are asserting that this is a slightly different version -- (but logically the same patch) as other patches that have been -- sent out with the same Change-Id. -+ This tag is used to generate the Message-Id of the emails that -+ will be sent. When you keep the Change-Id the same you are -+ asserting that this is a slightly different version (but logically -+ the same patch) as other patches that have been sent out with the -+ same Change-Id. The Change-Id tag line is removed from outgoing -+ patches, unless the `keep_change_id` settings is set to `True`. - - Various other tags are silently removed, like these Chrome OS and - Gerrit tags:: -diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py -index a8bb364e42..59a53ef8ca 100644 ---- a/tools/patman/test_checkpatch.py -+++ b/tools/patman/test_checkpatch.py -@@ -160,6 +160,22 @@ Signed-off-by: Simon Glass - - rc = os.system('diff -u %s %s' % (inname, expname)) - self.assertEqual(rc, 0) -+ os.remove(inname) -+ -+ # Test whether the keep_change_id settings works. -+ inhandle, inname = tempfile.mkstemp() -+ infd = os.fdopen(inhandle, 'w', encoding='utf-8') -+ infd.write(data) -+ infd.close() -+ -+ patchstream.fix_patch(None, inname, series.Series(), com, -+ keep_change_id=True) -+ -+ with open(inname, 'r') as f: -+ content = f.read() -+ self.assertIn( -+ 'Change-Id: I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413', -+ content) - - os.remove(inname) - os.remove(expname) - -base-commit: f9a47ac8d97da2b3aaf463f268a9a872a8d921df --- -2.41.0 - base-commit: a7a0b5dc59fc5f877d5aaf468667d1b8c35c33bb -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 13:15:13 2024 Received: (at 68530) by debbugs.gnu.org; 18 Jan 2024 18:15:13 +0000 Received: from localhost ([127.0.0.1]:56621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQWv1-0001EE-S8 for submit@debbugs.gnu.org; Thu, 18 Jan 2024 13:15:13 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:44696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQWuy-0000tE-CG for 68530@debbugs.gnu.org; Thu, 18 Jan 2024 13:15:10 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 933721AB95; Thu, 18 Jan 2024 10:14:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1705601697; bh=VA8DE3VV+Vcq2/gbkPH3KWtB7roHNfnNS2zDMCLhhpY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=KfhNI2P3/0nSsRmTkMpGGYmsXs9wj/dmT9MWFAUhvkY9Ch666oNq074o3cjHumFAA HgyAnfzO0TQiK3XpNCtQcbtdP7gybvAAQa4rym3K0gAGBn6hrlMz2ljfAu+oMHx/3z nsM1txAyCs1mD0i0x0iUlabIQb/Bb/cnqlCYHDDX92DSV2VwxKEOyXxxYsAYJZcCbN /4SvQivFGaT4aSKs60UYyaPyOcwDEltzcP1g2YmoDPbImoILiVMFGoo+Jx8VaM9dd8 9jRPazq2Qg9w+bg+LagTXWv0Q+xn990RD8E+4a6CzCUuEwGNbTzCiHnj2Pdl3grQQ1 DqpKfZYE0FoSg== From: Vagrant Cascadian To: Herman Rimm , 68530@debbugs.gnu.org Subject: Re: [bug#68530] [PATCH v2] gnu: u-boot: Update to 2024.01. In-Reply-To: <776ce797ccb78a313b1d7bd5b952b37c09149db5.1705594261.git.herman@rimm.ee> References: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> <776ce797ccb78a313b1d7bd5b952b37c09149db5.1705594261.git.herman@rimm.ee> Date: Thu, 18 Jan 2024 10:14:51 -0800 Message-ID: <878r4mbjac.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68530 Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-01-18, Herman Rimm wrote: > * gnu/local.mk: Replace patch. > * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. > [source]: replace patman patch with new patch. This might just be me, but the patman patch is not really being replaced by some other patch; it is dropping the obsolete patman patch that was upstreamed, and adding a new patch (that also happens to be from upstream, yay!). Maybe I would suggest: * gnu/local.mk: Register and de-register patches. * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. [source]: Remove patman patch, add build-without-libcrypto patch. Another convention that seems common is to list the newly added and removed files first, for example: * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. [source]: Remove patman patch, add build-without-libcrypto patch. * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Remove upstreamed diffs. * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Add file. * gnu/packages/patches/u-boot-patman-change-id.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Add patch, remove patch. I think I like that better! Opinions are likely to vary. That said, everything seems to build fine; I am inclined to push these changes! :) live well, vagrant > Change-Id: I5a21d4cd645449ff669f17cdabe5313870bec46f > --- > gnu/local.mk | 2 +- > gnu/packages/bootloaders.scm | 12 +- > .../u-boot-allow-disabling-openssl.patch | 64 +---- > .../u-boot-build-without-libcrypto.patch | 123 ++++++++++ > .../patches/u-boot-patman-change-id.patch | 232 ------------------ > 5 files changed, 134 insertions(+), 299 deletions(-) > create mode 100644 gnu/packages/patches/u-boot-build-without-libcrypto.p= atch > delete mode 100644 gnu/packages/patches/u-boot-patman-change-id.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 34bed91fc3..96faa813c9 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -2096,8 +2096,8 @@ dist_patch_DATA =3D \ > %D%/packages/patches/tuxpaint-stamps-path.patch \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ > + %D%/packages/patches/u-boot-build-without-libcrypto.patch \ > %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ > - %D%/packages/patches/u-boot-patman-change-id.patch \ > %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ > %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ > %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index c73a0e665d..986f0ac035 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -716,22 +716,26 @@ (define %u-boot-allow-disabling-openssl-patch > ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html > (search-patch "u-boot-allow-disabling-openssl.patch")) >=20=20 > +(define %u-boot-build-without-libcrypto-patch > + ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. > + (search-patch "u-boot-build-without-libcrypto.patch")) > + > (define u-boot > (package > (name "u-boot") > - (version "2023.10") > + (version "2024.01") > (source (origin > (patches > (list %u-boot-rockchip-inno-usb-patch > - %u-boot-allow-disabling-openssl-patch > - (search-patch "u-boot-patman-change-id.patch"))) > + %u-boot-build-without-libcrypto-patch > + %u-boot-allow-disabling-openssl-patch)) > (method url-fetch) > (uri (string-append > "https://ftp.denx.de/pub/u-boot/" > "u-boot-" version ".tar.bz2")) > (sha256 > (base32 > - "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0"))= )) > + "1czmpszalc6b8cj9j7q6cxcy19lnijv3916w3dag6yr3xpqi35mr"))= )) > (build-system gnu-build-system) > (native-inputs > (list bison > diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/= gnu/packages/patches/u-boot-allow-disabling-openssl.patch > index 708ed81e93..9201f9a51d 100644 > --- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch > +++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch > @@ -8,7 +8,8 @@ This reverts commit b4f3cc2c42d97967a3a3c8796c340f6b07ecc= cac. > Addendum 2022-12-08, Ricardo Wurmus: This patch has been updated to intr= oduce > CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl. >=20=20 > -Addendum 2023-10-17, Herman Rimm: Update patch for u-boot v2023.10. > +Addendum 2024-01-18, Herman Rimm: Patch updated to leave out upstreamed > +diffs with CONFIG_FIT_PRELOAD. >=20=20 > diff --git a/tools/kwbimage.c b/tools/kwbimage.c > index 4dce495ff0..976174ae77 100644 > @@ -145,64 +146,3 @@ index 4dce495ff0..976174ae77 100644 >=20=20=20 > /* Calculate and set the header checksum */ > main_hdr->checksum =3D image_checksum8(main_hdr, headersz); > ---- a/tools/image-host.c > -+++ b/tools/image-host.c > -@@ -14,8 +14,10 @@ > - #include > - #include > -=20 > -+#ifdef CONFIG_FIT_PRELOAD > - #include > - #include > -+#endif > -=20 > - /** > - * fit_set_hash_value - set hash value in requested has node > -@@ -1119,6 +1121,7 @@ static int fit_config_add_verification_data(const = char *keydir, > - return 0; > - } > -=20 > -+#ifdef CONFIG_FIT_PRELOAD > - /* > - * 0) open file (open) > - * 1) read certificate (PEM_read_X509) > -@@ -1227,6 +1230,7 @@ int fit_pre_load_data(const char *keydir, void *ke= ydest, void *fit) > - out: > - return ret; > - } > -+#endif > -=20 > - int fit_cipher_data(const char *keydir, void *keydest, void *fit, > - const char *comment, int require_keys, > ---- a/tools/fit_image.c > -+++ b/tools/fit_image.c > -@@ -61,9 +61,10 @@ static int fit_add_file_data(struct image_tool_params= *params, size_t size_inc, > - ret =3D fit_set_timestamp(ptr, 0, time); > - } > -=20 > -+#ifdef CONFIG_FIT_PRELOAD > - if (!ret) > - ret =3D fit_pre_load_data(params->keydir, dest_blob, ptr); > -- > -+#endif > - if (!ret) { > - ret =3D fit_cipher_data(params->keydir, dest_blob, ptr, > - params->comment, > ---- a/include/image.h > -+++ b/include/image.h > -@@ -1182,6 +1182,7 @@ int fit_image_hash_get_value(const void *fit, int = noffset, uint8_t **value, > -=20 > - int fit_set_timestamp(void *fit, int noffset, time_t timestamp); > -=20 > -+#ifdef CONFIG_FIT_PRELOAD > - /** > - * fit_pre_load_data() - add public key to fdt blob > - * > -@@ -1196,6 +1197,7 @@ int fit_set_timestamp(void *fit, int noffset, time= _t timestamp); > - * < 0, on failure > - */ > - int fit_pre_load_data(const char *keydir, void *keydest, void *fit); > -+#endif > -=20 > - int fit_cipher_data(const char *keydir, void *keydest, void *fit, > - const char *comment, int require_keys, > diff --git a/gnu/packages/patches/u-boot-build-without-libcrypto.patch b/= gnu/packages/patches/u-boot-build-without-libcrypto.patch > new file mode 100644 > index 0000000000..d56588941c > --- /dev/null > +++ b/gnu/packages/patches/u-boot-build-without-libcrypto.patch > @@ -0,0 +1,123 @@ > +From 03e598263e3878b6f5d58f5525577903edadc644 Mon Sep 17 00:00:00 2001 > +From: Paul-Erwan Rio > +Date: Thu, 21 Dec 2023 08:26:11 +0100 > +Subject: [PATCH] tools: fix build without LIBCRYPTO support > + > +Commit cb9faa6f98ae ("tools: Use a single target-independent config to > +enable OpenSSL") introduced a target-independent configuration to build > +crypto features in host tools. > + > +But since commit 2c21256b27d7 ("hash: Use Kconfig to enable hashing in > +host tools and SPL") the build without OpenSSL is broken, due to FIT > +signature/encryption features. Add missing conditional compilation > +tokens to fix this. > + > +Signed-off-by: Paul-Erwan Rio > +Tested-by: Alexander Dahl > +Cc: Simon Glass > +Reviewed-by: Tom Rini > +Reviewed-by: Simon Glass > +--- > + include/image.h | 2 +- > + tools/Kconfig | 1 + > + tools/fit_image.c | 2 +- > + tools/image-host.c | 4 ++++ > + tools/mkimage.c | 5 +++-- > + 5 files changed, 10 insertions(+), 4 deletions(-) > + > +diff --git a/include/image.h b/include/image.h > +index 432ec927b1..21de70f0c9 100644 > +--- a/include/image.h > ++++ b/include/image.h > +@@ -1465,7 +1465,7 @@ int calculate_hash(const void *data, int data_len,= const char *algo, > + * device > + */ > + #if defined(USE_HOSTCC) > +-# if defined(CONFIG_FIT_SIGNATURE) > ++# if CONFIG_IS_ENABLED(FIT_SIGNATURE) > + # define IMAGE_ENABLE_SIGN 1 > + # define FIT_IMAGE_ENABLE_VERIFY 1 > + # include > +diff --git a/tools/Kconfig b/tools/Kconfig > +index f8632cd59d..f01ed783e6 100644 > +--- a/tools/Kconfig > ++++ b/tools/Kconfig > +@@ -51,6 +51,7 @@ config TOOLS_FIT_RSASSA_PSS > + Support the rsassa-pss signature scheme in the tools builds > +=20 > + config TOOLS_FIT_SIGNATURE > ++ depends on TOOLS_LIBCRYPTO > + def_bool y > + help > + Enable signature verification of FIT uImages in the tools builds > +diff --git a/tools/fit_image.c b/tools/fit_image.c > +index 71e031c855..beef1fa86e 100644 > +--- a/tools/fit_image.c > ++++ b/tools/fit_image.c > +@@ -61,7 +61,7 @@ static int fit_add_file_data(struct image_tool_params = *params, size_t size_inc, > + ret =3D fit_set_timestamp(ptr, 0, time); > + } > +=20 > +- if (!ret) > ++ if (CONFIG_IS_ENABLED(FIT_SIGNATURE) && !ret) > + ret =3D fit_pre_load_data(params->keydir, dest_blob, ptr); > +=20 > + if (!ret) { > +diff --git a/tools/image-host.c b/tools/image-host.c > +index ca4950312f..90bc9f905f 100644 > +--- a/tools/image-host.c > ++++ b/tools/image-host.c > +@@ -14,8 +14,10 @@ > + #include > + #include > +=20 > ++#if CONFIG_IS_ENABLED(FIT_SIGNATURE) > + #include > + #include > ++#endif > +=20 > + /** > + * fit_set_hash_value - set hash value in requested has node > +@@ -1131,6 +1133,7 @@ static int fit_config_add_verification_data(const = char *keydir, > + return 0; > + } > +=20 > ++#if CONFIG_IS_ENABLED(FIT_SIGNATURE) > + /* > + * 0) open file (open) > + * 1) read certificate (PEM_read_X509) > +@@ -1239,6 +1242,7 @@ int fit_pre_load_data(const char *keydir, void *ke= ydest, void *fit) > + out: > + return ret; > + } > ++#endif > +=20 > + int fit_cipher_data(const char *keydir, void *keydest, void *fit, > + const char *comment, int require_keys, > +diff --git a/tools/mkimage.c b/tools/mkimage.c > +index 6dfe3e1d42..ac62ebbde9 100644 > +--- a/tools/mkimage.c > ++++ b/tools/mkimage.c > +@@ -115,7 +115,7 @@ static void usage(const char *msg) > + " -B =3D> align size in hex for FIT structure and header\n" > + " -b =3D> append the device tree binary to the FIT\n" > + " -t =3D> update the timestamp in the FIT\n"); > +-#ifdef CONFIG_FIT_SIGNATURE > ++#if CONFIG_IS_ENABLED(FIT_SIGNATURE) > + fprintf(stderr, > + "Signing / verified boot options: [-k keydir] [-K dtb] [ -c = ] [-p addr] [-r] [-N engine]\n" > + " -k =3D> set directory containing private keys\n" > +@@ -130,8 +130,9 @@ static void usage(const char *msg) > + " -o =3D> algorithm to use for signing\n"); > + #else > + fprintf(stderr, > +- "Signing / verified boot not supported (CONFIG_FIT_SIGNATURE undefine= d)\n"); > ++ "Signing / verified boot not supported (CONFIG_TOOLS_FIT_SIGNATURE un= defined)\n"); > + #endif > ++ > + fprintf(stderr, " %s -V =3D=3D> print version information and ex= it\n", > + params.cmdname); > + fprintf(stderr, "Use '-T list' to see a list of available image types\= n"); > +--=20 > +2.41.0 > + > diff --git a/gnu/packages/patches/u-boot-patman-change-id.patch b/gnu/pac= kages/patches/u-boot-patman-change-id.patch > deleted file mode 100644 > index 354aee2755..0000000000 > --- a/gnu/packages/patches/u-boot-patman-change-id.patch > +++ /dev/null > @@ -1,232 +0,0 @@ > -Upstream status: https://patchwork.ozlabs.org/project/uboot/patch/202310= 13030633.7191-1-maxim.cournoyer@gmail.com/ > - > -From f83a5e07b0934e38cbee923e0c5b7fc0a890926c Mon Sep 17 00:00:00 2001 > -From: Maxim Cournoyer > -Date: Thu, 12 Oct 2023 17:04:25 -0400 > -Subject: [PATCH] patman: Add a 'keep_change_id' setting > - > -A Change-Id can be useful for traceability purposes, and some projects > -may wish to have them preserved. This change makes it configurable > -via a new 'keep_change_id' setting. > - > -Series-version: 2 > -Series-changes: 2 > -- Add missing argument to send parser > ---- > - tools/patman/__main__.py | 2 ++ > - tools/patman/control.py | 12 +++++++++--- > - tools/patman/patchstream.py | 17 ++++++++++++----- > - tools/patman/patman.rst | 11 ++++++----- > - tools/patman/test_checkpatch.py | 16 ++++++++++++++++ > - 5 files changed, 45 insertions(+), 13 deletions(-) > - > -diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py > -index 8eba5d3486..197ac1aad1 100755 > ---- a/tools/patman/__main__.py > -+++ b/tools/patman/__main__.py > -@@ -103,6 +103,8 @@ send.add_argument('--no-signoff', action=3D'store_fa= lse', dest=3D'add_signoff', > - default=3DTrue, help=3D"Don't add Signed-off-by to pa= tches") > - send.add_argument('--smtp-server', type=3Dstr, > - help=3D"Specify the SMTP server to 'git send-email'") > -+send.add_argument('--keep-change-id', action=3D'store_true', > -+ help=3D'Preserve Change-Id tags in patches to send.') > -=20 > - send.add_argument('patchfiles', nargs=3D'*') > -=20 > -diff --git a/tools/patman/control.py b/tools/patman/control.py > -index 916ddf8fcf..b292da9dc2 100644 > ---- a/tools/patman/control.py > -+++ b/tools/patman/control.py > -@@ -16,11 +16,14 @@ from patman import gitutil > - from patman import patchstream > - from u_boot_pylib import terminal > -=20 > -+ > - def setup(): > - """Do required setup before doing anything""" > - gitutil.setup() > -=20 > --def prepare_patches(col, branch, count, start, end, ignore_binary, sign= off): > -+ > -+def prepare_patches(col, branch, count, start, end, ignore_binary, sign= off, > -+ keep_change_id=3DFalse): > - """Figure out what patches to generate, then generate them > -=20 > - The patch files are written to the current directory, e.g. 0001_xxx= .patch > -@@ -35,6 +38,7 @@ def prepare_patches(col, branch, count, start, end, ig= nore_binary, signoff): > - end (int): End patch to use (0=3Dlast one in series, 1=3Done be= fore that, > - etc.) > - ignore_binary (bool): Don't generate patches for binary files > -+ keep_change_id (bool): Preserve the Change-Id tag. > -=20 > - Returns: > - Tuple: > -@@ -59,11 +63,12 @@ def prepare_patches(col, branch, count, start, end, = ignore_binary, signoff): > - branch, start, to_do, ignore_binary, series, signoff) > -=20 > - # Fix up the patch files to our liking, and insert the cover letter > -- patchstream.fix_patches(series, patch_files) > -+ patchstream.fix_patches(series, patch_files, keep_change_id) > - if cover_fname and series.get('cover'): > - patchstream.insert_cover_letter(cover_fname, series, to_do) > - return series, cover_fname, patch_files > -=20 > -+ > - def check_patches(series, patch_files, run_checkpatch, verbose, use_tre= e): > - """Run some checks on a set of patches > -=20 > -@@ -166,7 +171,8 @@ def send(args): > - col =3D terminal.Color() > - series, cover_fname, patch_files =3D prepare_patches( > - col, args.branch, args.count, args.start, args.end, > -- args.ignore_binary, args.add_signoff) > -+ args.ignore_binary, args.add_signoff, > -+ keep_change_id=3Dargs.keep_change_id) > - ok =3D check_patches(series, patch_files, args.check_patch, > - args.verbose, args.check_patch_use_tree) > -=20 > -diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py > -index f91669a940..e2e2a83e67 100644 > ---- a/tools/patman/patchstream.py > -+++ b/tools/patman/patchstream.py > -@@ -68,6 +68,7 @@ STATE_PATCH_SUBJECT =3D 1 # In patch subject (firs= t line of log for a commit) > - STATE_PATCH_HEADER =3D 2 # In patch header (after the subject) > - STATE_DIFFS =3D 3 # In the diff part (past --- line) > -=20 > -+ > - class PatchStream: > - """Class for detecting/injecting tags in a patch or series of patch= es > -=20 > -@@ -76,7 +77,7 @@ class PatchStream: > - unwanted tags or inject additional ones. These correspond to the two > - phases of processing. > - """ > -- def __init__(self, series, is_log=3DFalse): > -+ def __init__(self, series, is_log=3DFalse, keep_change_id=3DFalse): > - self.skip_blank =3D False # True to skip a single blan= k line > - self.found_test =3D False # Found a TEST=3D line > - self.lines_after_test =3D 0 # Number of lines found afte= r TEST=3D > -@@ -86,6 +87,7 @@ class PatchStream: > - self.section =3D [] # The current section...END = section > - self.series =3D series # Info about the patch series > - self.is_log =3D is_log # True if indent like git log > -+ self.keep_change_id =3D keep_change_id # True to keep Change-I= d tags > - self.in_change =3D None # Name of the change list we= are in > - self.change_version =3D 0 # Non-zero if we are in a ch= ange list > - self.change_lines =3D [] # Lines of the current change > -@@ -452,6 +454,8 @@ class PatchStream: > -=20 > - # Detect Change-Id tags > - elif change_id_match: > -+ if self.keep_change_id: > -+ out =3D [line] > - value =3D change_id_match.group(1) > - if self.is_log: > - if self.commit.change_id: > -@@ -763,7 +767,7 @@ def get_metadata_for_test(text): > - pst.finalise() > - return series > -=20 > --def fix_patch(backup_dir, fname, series, cmt): > -+def fix_patch(backup_dir, fname, series, cmt, keep_change_id=3DFalse): > - """Fix up a patch file, by adding/removing as required. > -=20 > - We remove our tags from the patch file, insert changes lists, etc. > -@@ -776,6 +780,7 @@ def fix_patch(backup_dir, fname, series, cmt): > - fname (str): Filename to patch file to process > - series (Series): Series information about this patch set > - cmt (Commit): Commit object for this patch file > -+ keep_change_id (bool): Keep the Change-Id tag. > -=20 > - Return: > - list: A list of errors, each str, or [] if all ok. > -@@ -783,7 +788,7 @@ def fix_patch(backup_dir, fname, series, cmt): > - handle, tmpname =3D tempfile.mkstemp() > - outfd =3D os.fdopen(handle, 'w', encoding=3D'utf-8') > - infd =3D open(fname, 'r', encoding=3D'utf-8') > -- pst =3D PatchStream(series) > -+ pst =3D PatchStream(series, keep_change_id=3Dkeep_change_id) > - pst.commit =3D cmt > - pst.process_stream(infd, outfd) > - infd.close() > -@@ -795,7 +800,7 @@ def fix_patch(backup_dir, fname, series, cmt): > - shutil.move(tmpname, fname) > - return cmt.warn > -=20 > --def fix_patches(series, fnames): > -+def fix_patches(series, fnames, keep_change_id=3DFalse): > - """Fix up a list of patches identified by filenames > -=20 > - The patch files are processed in place, and overwritten. > -@@ -803,6 +808,7 @@ def fix_patches(series, fnames): > - Args: > - series (Series): The Series object > - fnames (:type: list of str): List of patch files to process > -+ keep_change_id (bool): Keep the Change-Id tag. > - """ > - # Current workflow creates patches, so we shouldn't need a backup > - backup_dir =3D None #tempfile.mkdtemp('clean-patch') > -@@ -811,7 +817,8 @@ def fix_patches(series, fnames): > - cmt =3D series.commits[count] > - cmt.patch =3D fname > - cmt.count =3D count > -- result =3D fix_patch(backup_dir, fname, series, cmt) > -+ result =3D fix_patch(backup_dir, fname, series, cmt, > -+ keep_change_id=3Dkeep_change_id) > - if result: > - print('%d warning%s for %s:' % > - (len(result), 's' if len(result) > 1 else '', fname)) > -diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst > -index 038b651ee8..a8b317eed6 100644 > ---- a/tools/patman/patman.rst > -+++ b/tools/patman/patman.rst > -@@ -371,11 +371,12 @@ Series-process-log: sort, uniq > - Separate each tag with a comma. > -=20 > - Change-Id: > -- This tag is stripped out but is used to generate the Message-Id > -- of the emails that will be sent. When you keep the Change-Id the > -- same you are asserting that this is a slightly different version > -- (but logically the same patch) as other patches that have been > -- sent out with the same Change-Id. > -+ This tag is used to generate the Message-Id of the emails that > -+ will be sent. When you keep the Change-Id the same you are > -+ asserting that this is a slightly different version (but logically > -+ the same patch) as other patches that have been sent out with the > -+ same Change-Id. The Change-Id tag line is removed from outgoing > -+ patches, unless the `keep_change_id` settings is set to `True`. > -=20 > - Various other tags are silently removed, like these Chrome OS and > - Gerrit tags:: > -diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpa= tch.py > -index a8bb364e42..59a53ef8ca 100644 > ---- a/tools/patman/test_checkpatch.py > -+++ b/tools/patman/test_checkpatch.py > -@@ -160,6 +160,22 @@ Signed-off-by: Simon Glass > -=20 > - rc =3D os.system('diff -u %s %s' % (inname, expname)) > - self.assertEqual(rc, 0) > -+ os.remove(inname) > -+ > -+ # Test whether the keep_change_id settings works. > -+ inhandle, inname =3D tempfile.mkstemp() > -+ infd =3D os.fdopen(inhandle, 'w', encoding=3D'utf-8') > -+ infd.write(data) > -+ infd.close() > -+ > -+ patchstream.fix_patch(None, inname, series.Series(), com, > -+ keep_change_id=3DTrue) > -+ > -+ with open(inname, 'r') as f: > -+ content =3D f.read() > -+ self.assertIn( > -+ 'Change-Id: I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413', > -+ content) > -=20 > - os.remove(inname) > - os.remove(expname) > - > -base-commit: f9a47ac8d97da2b3aaf463f268a9a872a8d921df > ---=20 > -2.41.0 > - > > base-commit: a7a0b5dc59fc5f877d5aaf468667d1b8c35c33bb > --=20 > 2.41.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZalqmwAKCRDcUY/If5cW qsWDAPsE9BdjWMpgoXieJoth9LVuqEATVm900UuHhGs8nWOHrgEAuYt2Zivdu8av dk2GSWJ08Sok6KnVqRtyjWlJb1maGg4= =ou8T -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 13:23:19 2024 Received: (at 68530-done) by debbugs.gnu.org; 18 Jan 2024 18:23:19 +0000 Received: from localhost ([127.0.0.1]:56630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQX2t-0003kE-Av for submit@debbugs.gnu.org; Thu, 18 Jan 2024 13:23:19 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:60606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQX2r-0003jx-Tn for 68530-done@debbugs.gnu.org; Thu, 18 Jan 2024 13:23:18 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 549941AB95; Thu, 18 Jan 2024 10:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1705602187; bh=HEtEtuWrzjkQsManXBke9aYoiIejEbzdZFSc6lj7BA0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=YDI/pkm8ACCNRHSi56FDvhjWdYmO6tzr/9ovZ/ALIdwxmnFKzwwpJdQrRp0GHTBgu rgaH3vEn7oYAHU3Z2BMO7+kzhbOczsK7eAznJdm0XZHaNpOiSKhaPjJXWg4ZgY5UYX UN4F3Jo1jyTNQeaTpl0VnWkQXNZcDBtX85XoQ5Nq0zBTDIT7HHiAda2FxGNVq9RGhH dMWwsTat9KWKVJMEcL2ACGQHcnIyAHAZrSu7e3ag6EAUEah7n7U1D5fdkt2yNbwuco NNZ1pVpD248giJPAiTrU0JPPNwvNIm6yQfdz5bsnrLE0JZrYuWbbhnllEmGMd3TiAO IItrX2zc9Cgxw== From: Vagrant Cascadian To: Herman Rimm , 68530-done@debbugs.gnu.org Subject: Re: [bug#68530] [PATCH v2] gnu: u-boot: Update to 2024.01. In-Reply-To: <878r4mbjac.fsf@wireframe> References: <2c214416d9beaaa59343048e8df0ebb50fb9913e.1705493796.git.herman@rimm.ee> <776ce797ccb78a313b1d7bd5b952b37c09149db5.1705594261.git.herman@rimm.ee> <878r4mbjac.fsf@wireframe> Date: Thu, 18 Jan 2024 10:23:04 -0800 Message-ID: <875xzqbiwn.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68530-done Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2024-01-18, Vagrant Cascadian wrote: > * gnu/packages/bootloaders.scm (u-boot): Update to 2024.01. > [source]: Remove patman patch, add build-without-libcrypto patch. > * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Remove > upstreamed diffs. > * gnu/packages/patches/u-boot-build-without-libcrypto.patch: Add file. > * gnu/packages/patches/u-boot-patman-change-id.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Add patch, remove patch. > > I think I like that better! Opinions are likely to vary. > > That said, everything seems to build fine; I am inclined to push these > changes! :) Pushed as 3e3975275bbab84d58f7740e9680b265769aa580. Thanks! live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZalsiAAKCRDcUY/If5cW qjjWAQDa2hbcDINhQ2nlXKL9xeLZrWQ8FabhKfGsgPUHf3qOTgEA1v0MR4KMzOcL HJsmwnRtOmo6kp1SFAKYD/coS9lj/Qk= =7LE0 -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 16 23:45:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 16 Feb 2024 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator