From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 21 Jun 2023 12:01:15 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qBueK-00FVxq-Eg for lore@lore.pengutronix.de; Wed, 21 Jun 2023 12:01:15 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qBueI-0001cw-ET; Wed, 21 Jun 2023 12:01:14 +0200 Received: from mail-be0deu01on2045.outbound.protection.outlook.com ([40.107.127.45] helo=DEU01-BE0-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qBudq-0001bt-KI; Wed, 21 Jun 2023 12:00:47 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EGhQ+sNK3e6QWufsrt+BeNsbTeDlUSVzITsEuM1mWBgcCPH81hgWF6VBUYWFgoJdrxlUipyHXUUJwwTIqBJcMNFWaZ8fkc9q5ysWfmj6/huX5H7n3T9AzIoMe3o/EEUFBMqUW9uE1SMM0gTdnibTZgyNrBkXASooh3O3ILW4SI41thDGJXffG6FybOpu2xOFHTLAu88fefikcKb1lVmN1RmMHmmKle929D2gYcSpEcqnPcGcmHy94Yd87h6Lq0VR883aaB5YTvhza/WOi7XxhmTqnxs7+8bZgqk01mbdyyWE1nipGfTBGGV0NayprpaX8db4/GMWbtb1Y4YbJjrXJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vzn4v5X7+Lq0mHX4f5cMu6eOE+VrpMV/6iO6elB3LE4=; b=YjGNjzMGVE9saMnMoo85MVJpHMRphQIf55E9+eM1nFaLoPGxMAPFUH1C5NrhKmBvDHqWFe6rOEkDVyTP7TIwqpHv88SpH1jpJ+hgDbpzpnFU/TGY5RBpp2i0e8x0H4rpmmlso9g4GQ4Qvb5KCinQ2u6+UiiqoR6zHv3XlhJzVOH09LV3HqkYhiRhukgx1Qp5Uh+VtCB6q4mF2jaLsp7gHbXwEbbxuuXM1t69Bn4BlKedihJ0Ggo8Kw4YBRLZWrNcjoEpSjUbEk5zo7yKkeo8Inj4tvkmEMfCT7ncb/lrRNaqXB4tEVgHkaIK9pgtGVrp92ShfStsBxO1AoOmhdmK0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eckelmann.de; dmarc=pass action=none header.from=eckelmann.de; dkim=pass header.d=eckelmann.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eckelmann.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vzn4v5X7+Lq0mHX4f5cMu6eOE+VrpMV/6iO6elB3LE4=; b=lc+bJXKNzc+KIHpDHLvmCAIcBhhpESrJY20CV7iyhIQrMl7sYIwbYQp+WBsUihz4b9DlCp9PFji0045NQ9XY0SWupWKEJcSNc0YZuAjY8zcxloGyC3bbGssO0hgH7EF1b6qIAJ038FZS6bXIkZ3ZQWCAg07wEh1aNicwWWK7evU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eckelmann.de; Received: from BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:69::5) by FR2P281MB0092.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.35; Wed, 21 Jun 2023 10:00:43 +0000 Received: from BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM ([fe80::e23b:be0c:420f:11b3]) by BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM ([fe80::e23b:be0c:420f:11b3%4]) with mapi id 15.20.6521.023; Wed, 21 Jun 2023 10:00:43 +0000 Date: Wed, 21 Jun 2023 12:00:38 +0200 From: Thorsten Scherer To: Michael Olbrich Message-ID: <20230621100038.dcwtbebtyeyygguy@nb821.eckelmann.group> References: <20230619130210.5302-1-t.scherer@eckelmann.de> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: FR0P281CA0179.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b4::19) To BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:69::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BE1P281MB2529:EE_|FR2P281MB0092:EE_ X-MS-Office365-Filtering-Correlation-Id: ca78fb1b-1e0c-488a-55df-08db723e6087 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Emz4bQ+iHrSNdI3yQNAtEPav3xySgi6kU6MCtcgrLm/z4JZEQT15nAKuQ+fXZurm90Te0cHyN5z7sdeOvMDxN5M5NA6P8mtcIyrt/uSF7qCvAlxBjlmCeVXamTmI6q787w5snhLaapkFSXWW8US8e1DD1fEhnCK2zMDtjHoovmJUI50mV9q+rzxpPHLwGcezzGEErcGYcfylrTAxFpNsW0eXdv0MCeRuhHGABbUjdCj5xKgP7aBUN81BMGDCwtauXWkZ5h00WQoEImr2o2SOXCiyt8Pn18/mw3QJqlxCCkUu7E0vUEpDobxHfOJtCkcnOrof7dQzYYCcWTEHKPTXbfuAaTu9aLKFXE22Nwj00g1KukAUlDmENSiz1UDtPi9q59n7vMyNsGsRLn4SPyhMoKa92NTPB8pC5MoJq5ejQ1IWEcx4Mt+1YmWcRGPEuQtEgzhwnW6LzkhxDeRXEHi9gZPWfc+Yfot2IsPmdzinOBKgP8jqlEp8glFUWehiAX274TWin/rODQPeCPeQz5viMAWmyG14qFpCyPtinpYg2p0D8ZFMmkFB/giS8gnTS/qXvuHWGzs8eDE+u7KoyI02PKqElRJQOlkFQKbzpOfITow= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(376002)(136003)(366004)(346002)(39840400004)(451199021)(9686003)(41300700001)(8936002)(8676002)(38100700002)(6666004)(83380400001)(6506007)(26005)(6512007)(186003)(478600001)(6486002)(966005)(86362001)(316002)(3716004)(66476007)(450100002)(4326008)(1076003)(6916009)(66946007)(66556008)(2906002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m5fAoNGyG7D2Yjh14ErPkRSad/l1NUAJ1pxgsB3GB22HUqpwcuM/kiOk+yrz?= =?us-ascii?Q?dQCiZt6Zd+v81iuq79KF4VhzPCCHj5of0ej7+zJi5v9RREoEt2sfS4uh3rL2?= =?us-ascii?Q?whNlm8BLKm9ozgX4CPJGMCBk3O2D5WCG00avLeYBq+yLFYrjRG7UwILGNJGl?= =?us-ascii?Q?XpRMed6ZzV4WYI9CVLHR0Eu38QbLodQaXaBsYZRjwBJTzYJiftCsvgiPluX4?= =?us-ascii?Q?16qsOioD/msr0OazVR5kyQGS0U1BnLECJzQN143JhUClKdI8BQI2B5+X3t7F?= =?us-ascii?Q?aHGrngTAjbC+0d7QWrCvvpDddLqo7o9XpDoF9O6HwIjN1GW9bqQ0mrJa4uXS?= =?us-ascii?Q?koIyyqSNly3O/AjYRbqdd5oNgUIK8ERCleefAsae6Uw3LOq1lV0OKq0kUxbV?= =?us-ascii?Q?kd8S5lLlqfNoV244M8/1S0tjKDaNdfXRgEtcxdYafNHEEGs6OY46yfTqnQRG?= =?us-ascii?Q?p++wqGb+ZPgnpPtSJ8ubt/yGoInmEDIjXTEM39NG7B1D2kWwA2JSKFsapmwn?= =?us-ascii?Q?WFxZ3DcvI5MZ1PvOpLXR9SHdaWJXlXBRUeqfTADWwSntAWfwW49LT7eJNEin?= =?us-ascii?Q?j3m9petHMMLDqVtffRjdcEaxK29ZCSaIy7q+iV0UOehERV1NsC5KNA+C/ngS?= =?us-ascii?Q?Spm5BoiHYGrpWRUL6Kc48xjmHdz3bl6YiB7aeWnZ9Udvv1e5Lhp7l9raJiBr?= =?us-ascii?Q?LlzbYEabHvwc8gbjzTLpzg20neXL5iOwYSuD1DQyMdZ3hCCAR2kjve2qnLjO?= =?us-ascii?Q?4zQ8gKVZTMQMhsA7ZJ0sJqKyBoqQflCtZSUYmPfJHTzVIubiC3NPWfoXdEzI?= =?us-ascii?Q?l5Ktk33T/vtBEo3IU+vK0wc1YcDCzJx9KaUum0R0KXjjjemzX46JzoJAZ9Ji?= =?us-ascii?Q?Dxcl50JQPaR/4eE2m73FxB1nY9qnGGc7YQ7rskrAU/anQQQIfrKoLkus9Mvd?= =?us-ascii?Q?KKgw2pj3WYRARxjJ7Em2lfqTQuASxRn2u6u+XqO/Roi5XF7LGdJvvbFgxFK7?= =?us-ascii?Q?bp7fT67U7NNCZ2+fM97KBpE0NQ6K1VMO4pyZFkO2xyDHCEwARgvSg5AC2Uq+?= =?us-ascii?Q?xmhu9w5E9GXg3CLxHKP7l1/CntlG/7kd3DjuxfqmdrWSDQG8UPPH6Bygx8Ba?= =?us-ascii?Q?3SFTu2QX/dP9DgT7DoF4ueqydXS+4V00ib8I/nQ5uJmIu0dxdrztZi2DDmSD?= =?us-ascii?Q?+ljdfDeYaxYhqpK6mMIEzPkQwa7EDYcrM7lkS8dCQTUoJ4O34z96YPdwYrS0?= =?us-ascii?Q?yZ9pqc28RBXUwnTqm/GKIGviqmgk6w2TheakDYLg4G0Y0kq4Y60i7Qu6ojsY?= =?us-ascii?Q?X2uPvdK5+aJt1c2LS0F9LAlR5WnGPxyQW+B6fzY3ykycY+AhB0T28M3Pu91N?= =?us-ascii?Q?bKIJSw5Vs4IY1+7warKzeuODF5ZidiZVpSW3UUo0oWLjhJftp/Ff+RDRTifS?= =?us-ascii?Q?7fefv12hoQ5HSjid4EBNvdn+0yqi4jLpsW4yLWpA5CdnZ/snmDQwaPC8QIBV?= =?us-ascii?Q?c3HVrlFYKkBWGxg6vO2pLaPJR1LyJttfQ0CbWMeVfwzi98zl86wSkGTERW76?= =?us-ascii?Q?MSKuMroK8KsS6oVr6UIPcCU40dHF2/9V3ve9gmhM8zV4qQhUwh09UDJkliXW?= =?us-ascii?Q?3g=3D=3D?= X-OriginatorOrg: eckelmann.de X-MS-Exchange-CrossTenant-Network-Message-Id: ca78fb1b-1e0c-488a-55df-08db723e6087 X-MS-Exchange-CrossTenant-AuthSource: BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2023 10:00:43.7761 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 62e24f58-823c-4d73-8ff2-db0a5f20156c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xxpHlL5n3eAHXwZKnB2WE7rGYs77RqkUYBY9xoygo+T7hR7L1B/0w/v9VVVl0+DbVXq6po2dEVyQjQW5mGhj3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR2P281MB0092 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.6 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH] ptxd_make_world_patchin: Allow git-ptx-* scripts to be overwritten X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Hello Michael, On Wed, Jun 21, 2023 at 10:55:12AM +0200, Michael Olbrich wrote: > On Mon, Jun 19, 2023 at 03:02:10PM +0200, Thorsten Scherer wrote: > > This patch enables the user to make local modifications to > > git-ptx-patches and git-ptx-refresh-tags-editor inside the BSP. > > Out of curiosity: Do you have real local changes, or is this just to be > able to backport fixes in the future? We just bumped to ptxdist-2023.05.0 and I had to modify ptxd_make_world_patchin.sh to be able to benefit from b6be1a59d. Without this patch ptx-patches aborts with "Failed to find tag 'base' in the series". > Regards, > Michael Regards Thorsten > > Signed-off-by: Thorsten Scherer > > --- > > scripts/lib/ptxd_make_world_patchin.sh | 12 ++++++++++-- > > 1 file changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh > > index 026c36e95..209fc6954 100644 > > --- a/scripts/lib/ptxd_make_world_patchin.sh > > +++ b/scripts/lib/ptxd_make_world_patchin.sh > > @@ -62,6 +62,14 @@ ptxd_make_world_patchin_apply_git_init() > > local git_dir > > git_dir="$(git rev-parse --git-dir 2> /dev/null)" || true > > > > + local git_ptx_patches > > + ptxd_in_path PTXDIST_PATH_SCRIPTS git-ptx-patches > > + git_ptx_patches="${ptxd_reply}" > > + > > + local git_ptx_refresh_tags_editor > > + ptxd_in_path PTXDIST_PATH_SCRIPTS git-ptx-refresh-tags-editor > > + git_ptx_refresh_tags_editor="${ptxd_reply}" > > + > > # is already git repo? > > if [ "${git_dir}" != ".git" ]; then > > echo "patchin: git: initializing repository" > > @@ -70,8 +78,8 @@ ptxd_make_world_patchin_apply_git_init() > > __git commit -q -m "initial commit" --author="ptxdist-${PTXDIST_VERSION_FULL} " && > > __git tag "${pkg_pkg//\~/-}" && > > __git tag base && > > - __git config alias.ptx-patches "!${PTXDIST_TOPDIR}/scripts/git-ptx-patches \"\${@}\"" && > > - __git config sequence.editor "${PTXDIST_TOPDIR}/scripts/git-ptx-refresh-tags-editor" && > > + __git config alias.ptx-patches "!${git_ptx_patches} \"\${@}\"" && > > + __git config core.editor "${git_ptx_refresh_tags_editor}" && > > __git config diff.renames false && > > __git config core.abbrev 12 && > > __git config core.autocrlf false && > > -- > > 2.38.0 > > > > > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |