From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id MA7pHh4yqGW1kgAAe85BDQ:P1 (envelope-from ) for ; Wed, 17 Jan 2024 21:01:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id MA7pHh4yqGW1kgAAe85BDQ (envelope-from ) for ; Wed, 17 Jan 2024 21:01:34 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=hlvmVU0Y; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705521694; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=+IA1BmmcGhjtAL73Tj4da4/3B0vsmaLzVktGjuJuX2A=; b=KmKWca5oPpuFYEzsr5sJoBbFspi/7rGAxsufqlEWayLZ4NH/tLTf2xsIk2h1rR3y/h1ZVp gKV9e/fvWFr1dffbP3oavyoz/23Pno8riHAywea7vETfQL1uWt3lF16I1ntHLhVRnVlGO0 JP0rp0wZVmQstZAOFzPiGgp9HeH/M57cnZKqBX3Neof9fp6TxfZniro72cH2st1Hv5jQog ndWGi8kGCZA8YFk0F2xntPDFo24tBut/mQHSKxwEaWfw3Si5SVnqp1W7agCW/mpOw83ltW UbQvGnKlTQPH+8JBdxmKPRoDL2d5/mLblHTH/wFV3Y8I95XObI0pP4+PQ+aP+Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=hlvmVU0Y; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705521694; a=rsa-sha256; cv=none; b=a1TJRc5ndyHFb/ehzeTJVYukNYZQcaFbCZaaGMCm8URQMo0dX/kPf8Elb5f0t8Cpn5J0kB QnBLGJSOZGHZ2o1NLulcuMOrpmq9oXYZvWL01icwFY4CLIREH5CA4+ga+R9/U8tl5mOW5H luau0tuOnLz7fL4SBPWP9VCzToXK9KikALkwUawhjCpZBjoM0s2pxb/oRM1Fa+/IOR5Ysz 9k4nxVCpBmvbHt13LCS+WRFJQEPWG9iYjAcgLmLA0G8ACniHon83zSE1debSkGqOjTW4SR XKVOB6c9fzCFKOo/UEjBcFS8vTxs555EGCINqfhAksp4b4iIxrAlVn64q/jvbg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5FF465E3EB for ; Wed, 17 Jan 2024 21:01:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQC5y-0000Ul-V6; Wed, 17 Jan 2024 15:01: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 1rQC5t-0000Sw-Tu for guix-patches@gnu.org; Wed, 17 Jan 2024 15:01:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQC5t-00083q-Id for guix-patches@gnu.org; Wed, 17 Jan 2024 15:01:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQC5u-00041t-HT for guix-patches@gnu.org; Wed, 17 Jan 2024 15:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68530] [PATCH 1/2] gnu: u-boot: Update to 2024.01.3. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68530 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Herman Rimm , 68530@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 68530-submit@debbugs.gnu.org id=B68530.170552161410345 (code B ref 68530); Wed, 17 Jan 2024 20:01:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.78 X-Migadu-Queue-Id: 5FF465E3EB X-Spam-Score: -3.78 X-Migadu-Scanner: mx11.migadu.com X-TUID: 7A4phNnUX3Du --=-=-= 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----- --=-=-=--