From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 19 Jun 2023 15:02:51 +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 1qBEWy-00DCrj-Lg for lore@lore.pengutronix.de; Mon, 19 Jun 2023 15:02:51 +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 1qBEWw-0005O9-HP; Mon, 19 Jun 2023 15:02:50 +0200 Received: from mail-fr2deu01on2066.outbound.protection.outlook.com ([40.107.135.66] helo=DEU01-FR2-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 1qBEWR-0005Nz-85 for ptxdist@pengutronix.de; Mon, 19 Jun 2023 15:02:20 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HzpH/0ZgGdG4TrFd8H8nJ6//OkmNUpDXOGL7ltxpLUMdNQit97+erYu6fb3dR9vAmLlLLzqxQfxVJ5jCgqUR9wnSCk+LN8xWVHVqDlQwmxP85XHbEA6Jlh7ffBq0q9n5gzH/c2qb4M+BLq0E9h7EwINYJJgcI+l+qQO69y09fgiWF7aefKja3hmxY/U6GkMiRk3AfpFNzVnTjTGTn/qnfRWPyiFDHzddXM/w3NO/XlkXsNJNdVlJk/TA8eGLvCnOORgep5Wh9Wt8iU1wiNA9pNO6mAKPc/dbMxAv574X3PS/jKTjP6/yQXNmAwaho9CCBRqgoIkCwKjOOJkzjbuOCA== 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=8kJAwhRVNKXsu6BULZjk7bPmdAqpOisdRR6sZwTMmVA=; b=VfWPxCj8wdMU1MlNk6Xom0FDQidaxAPpi+cDyymLg5w17pfjyrbUDkgDvdnr4YoOOxaEPpEvRk/SW8HsyNnOypzhod2b27/OcIuxdm0cjJCOZiPqEUFn4C85rR5UrwctK62TG63KP+laswYVH5oHHGHXPI5szZWizFy3HaWSi4tc/SYChDM0g1cnGy0FbwuYm+kySJCwB/Ud+jMerSdl5PYGKESnU+TDFLXrifVIlTGhDKM3D3cuqnaHi5iAnx3iUYNtGOs3asYr4FOwWbGPyk0sqkwcGuE16DDg7Qe7Yt6yEDpmiAF8+RUnaWM5P8Orl1tHrLLtXwmfHFMG9fDk9w== 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=8kJAwhRVNKXsu6BULZjk7bPmdAqpOisdRR6sZwTMmVA=; b=tX35PwEUO0lmrzl0HOF5r/IYpnEiXRnEjW7t47x5ACXjOTysm8U0ehUgEdkO8cLuc4ATVuVp+GNUUiU2G5SsOltD2EhuUHLzLwfQtdCpkIMS1bkiIEl9CcGFXyX8N4maTKD0TJGBiHvip/UdDtadZBqcfYwHgZYo2ZIIFQIxSxk= 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 BE1P281MB3250.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:6b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.36; Mon, 19 Jun 2023 13:02:17 +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.6500.036; Mon, 19 Jun 2023 13:02:17 +0000 From: Thorsten Scherer To: ptxdist@pengutronix.de Date: Mon, 19 Jun 2023 15:02:10 +0200 Message-Id: <20230619130210.5302-1-t.scherer@eckelmann.de> X-Mailer: git-send-email 2.38.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR3P281CA0192.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::16) To BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:69::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BE1P281MB2529:EE_|BE1P281MB3250:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a6ef841-cb75-4c47-5068-08db70c56898 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rNmo/YEnLnkuSL5TAbipCu7PnCuJgWPiiq9V+8/JCSVSAYTQk+j7T2+MISf84atHzFtZGG6Y2kYLhTNXAzw4UnvKtC3rtiPnDSiQK0d34fUWkXjeqcugL73aCKyWT/Z9TiWi+inykTn6DsDxOf0hasKZl4r6aYpHq73KhSfj7zghNhFOXADBAvGeplHBMAM/0+C5cy6VjV/sxZ9FuJkE1xWntjOzqLLX2I7TyX2Bn5HGGBZw0ZV8LMY+0b9EIRT/Jf4ndKdjzpBCQwyC1x1FqyKfztmgEvaPk8ajapLawfpj8sX9OHb+G4CMzgp4xfZCENehomGoDSruOBg7S6831AgGmNCj1sa3yFrFD/YcXLo7sYqOcP97sbCyx4C3WqPwnJYL3EnDbV5dfXFDZ793vyd2aKHrNe+uUM+EglQUV2woI+XEVzLuCrMzVJKWmDGv6vec5d8W+7Dr1qmeECOhzf+PrdDLRmZLn35o6sdKvXQjPT2eLQkumkuMn0Rg6YuIbBs+kaB1CSF3yNImS9AioLKLSHlc8/nzZDaRG01d9t9KVpQRV8ssuX3z9TkZXYuJ5taBwwCCBSToltNtpsvSZ4fDksEbeQIfEAAJHsKW+fE= 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)(39850400004)(136003)(396003)(366004)(346002)(376002)(451199021)(41300700001)(5660300002)(8936002)(8676002)(2906002)(36756003)(86362001)(107886003)(1076003)(6506007)(6512007)(186003)(478600001)(6486002)(6666004)(66946007)(66556008)(66476007)(6916009)(4326008)(38100700002)(316002)(2616005)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?B9tvHb0DkJ4pFCaB4hkOTTRtuDTui+b9hkJw2hagD9Pp4y3RbMqWf3Te4FIj?= =?us-ascii?Q?TRnBDqgagmRaHEgQjBDm9IoAf1PXT5BDAmE5HQmeGrPGSncWSBsDjlg33zTO?= =?us-ascii?Q?SUJyGHn7pk8SDE6ZiG/TEiUJo3T60mwmJCXEXfJG9BSwORdTbh5bqmmfTliQ?= =?us-ascii?Q?890OLFz2/+OhqnsIci4ohS9DIEK8+YvgFmkeajeeMPxTUBtVeoO4ZPQqXS0e?= =?us-ascii?Q?wCZ1RPabwZ3vFE2wGdkSqZTzN/pO701rYLUgM0/QaFr4ng3DnSpwPT4mA5r6?= =?us-ascii?Q?0vIpjybtGYLQedPKig4MRJPtYApLNkNQfpDd8UEaYlJbFLopGDv2ubd1hhc9?= =?us-ascii?Q?9Eon/odH3eXN77B5PTYSmmv+BV2z4d1/u9EkIkU9aPS77P2vu8DT3DKtfgWY?= =?us-ascii?Q?jp1fyXNCa/lZMwpFDXkJuFu6yQDi6a8QUmoPL7ZpeIDyi2QxVO39zdlVCfrG?= =?us-ascii?Q?M+flmHkyuiJqrazsXB3xkAgJ/5CWIfNwa1ASJR3RVXaFmHgMWmalohsdMBXO?= =?us-ascii?Q?/iRphZR8pEmKvK/JijPJmDKCWO+WkpJprTaB6sCaZbi97nWmXrI3RbbvfXXz?= =?us-ascii?Q?YoN5B/PYA3zumBxLEQHr/JImpaxKn5I8jRx87LMVCHVMB2HYiG2h8LHj1myi?= =?us-ascii?Q?hcALzdNmjXcDXIrSxFxALH/2ZbDpnxVUAnuTEDzTV8YjHHazAS6VyXpUHM/m?= =?us-ascii?Q?4mDmWXw7Yjvc3eW2GEFTXP9Bb6XqPFDvvm0ZryKW1UiaEt9uVUXWGReLt6dV?= =?us-ascii?Q?YtCZtSAq2XYZ6467bBoq/86+kL9cF6ZitlWRQX0opaE2M5wkCCbd6Vm2A+1c?= =?us-ascii?Q?Jw/fX2OqtyMNkNqfVOSkyAYRbdLFQRHn8exNMJX22XHBiNZSY7pU60ZIRoTE?= =?us-ascii?Q?5WudLxh07QIv3rj+6oWl527o4BfkEJMGiMvspBOLwEzC5RFSMWlNa0WCTe6o?= =?us-ascii?Q?L4mhWS3iuQvc5vh7QQfEb5C1aQy0OZpj4xF6wWNlM9Oqy/ShhT+RAIyu6MjO?= =?us-ascii?Q?Boh2/qE4pJBh1cf8nTM+HitqLbIaKvyqzLv17zJGOD50DNLu0HJmz0ZXGHa4?= =?us-ascii?Q?NGGNOarnyMvmN01sW4x2BphI5UAz/TJVY+XIVc3jmLx/lFW6KjymOr7tV/fp?= =?us-ascii?Q?Rw7cCEKCjfvUcs/VpjShQUbvGbNeeN1fSKCU7C9ugtzfCBsvtskw/zj3BzFu?= =?us-ascii?Q?X5UTrWDXwEU+lJVYDLW2Vy8hk999iguORIYmR5Ly4P/K9aHkCNZ2AIcBViqX?= =?us-ascii?Q?ZibBP6dzKV1HNzNZptmShs35HoC7b1WPHFhl6+vsvG+mEb4TNR7YCwmokOCT?= =?us-ascii?Q?0Qoy0Ran0K+k9LOZzIe/mvL0XNNt4Y5ypo3hX8PitLbhe9b5XfOCieHNB/Dz?= =?us-ascii?Q?DM6af6k4Dp7sHdy1LWWOFLZMpHavJYql4b6m/KgvzhOtFMIgc3a/FQS7Fq3P?= =?us-ascii?Q?VDVDFjwxn22nGeq0Ao6IyAz7FByvniGWFm3NPBWXUCL137joflyOSp+rLzTq?= =?us-ascii?Q?/rtP2y7+kUuWdqSUN9EFKpALsTz9sUjwY4934QjTnpLlMbTcJTRHfv3SmbYC?= =?us-ascii?Q?RTnU4i1paCRBJUaKaEtWdmKiMEXCMrV90ECqaTVcfc7X13bff/43pyWb9T/H?= =?us-ascii?Q?YOTCLxfqjML/2/IB+0z6NDcjFCwESK+IgVSGbS/ONOrDXreVAI7hPHT8RGYL?= =?us-ascii?Q?oMy2SQ=3D=3D?= X-OriginatorOrg: eckelmann.de X-MS-Exchange-CrossTenant-Network-Message-Id: 4a6ef841-cb75-4c47-5068-08db70c56898 X-MS-Exchange-CrossTenant-AuthSource: BE1P281MB2529.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 13:02:17.0227 (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: wRrV9qUOtRmgULW6oVAqw5Fnn8VWAMkccBIGk4s4YPy1HR3JGbuFuQ7BLw6hx/aq+jF522h5q3BUXIhmPYFqhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE1P281MB3250 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: [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: Thorsten Scherer 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 This patch enables the user to make local modifications to git-ptx-patches and git-ptx-refresh-tags-editor inside the BSP. 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