From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067531606206971904 X-Received: by 2002:a02:6a20:0:b0:30e:4c9e:533d with SMTP id l32-20020a026a20000000b0030e4c9e533dmr18916324jac.39.1645545575698; Tue, 22 Feb 2022 07:59:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6638:35a8:b0:311:86a9:1cf8 with SMTP id v40-20020a05663835a800b0031186a91cf8ls3085267jal.11.gmail; Tue, 22 Feb 2022 07:59:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1/AzYcnTeyxTdczrRG1DdIRzMSIIjd3wtfa5pFFQBEH+f3GqU67m3ckIYD/Ia9rfTBFeT X-Received: by 2002:a02:cbb8:0:b0:314:bf58:4758 with SMTP id v24-20020a02cbb8000000b00314bf584758mr13914807jap.195.1645545575008; Tue, 22 Feb 2022 07:59:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645545575; cv=pass; d=google.com; s=arc-20160816; b=E1atY/t46xavfmZTyDI+V+NkROpsrD2grAc5xOzgt4ljOWIxs3jN7+lCnohTTUHgse zd0L4nJD2EZxbPdSIRZnWv5VlkQQNLOkJ1RiSQQMNHTerutGF+JuSMNtFOFzA2c3s4FD MmZaRB5VxJ/aBI3kdYVa3JsAJJdP68KKyFK/Grhmx/WkyGlOGz3e8pO5dzPxieOUoEcY byjPhuIItQE5eE0wfkfHBJl8Lw2+9EmDyEstt+Pq5m3wv6ixxIsY/ZKTaFMI08pGhFcc +7ZwhAvB4Acy9HUxvWbMMWTCB7Oh+L+gE5P/sCB2X4+08PbuyO72GpVThRS1IR2akK0E ILBQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=l46AtZJ4EEbCTMgFOL8jFjr8NfJqQ0ERl5aLY19YP44=; b=zrfv6t+GfgelyxpcQlghTo5Z9fCSHvTs7z2NSwsLCrzExopHnaOQyUslERxyJayowC l1O9sdajwueiyNhrBrUjm2EwxqXDhQHKATLrfbXl5tJRQshiHdeseiyriYDwqVQgu16t WUKAdtxBdK4telwwjG8JToSgvqXJ27lQ8HQ84Zg1dqNIQXP8kO1aK8DUKTJoo1C8mwFc /R6gzYvOTAL1MZbh5b6VN8zwQI4UztAk/YCr7aY2zgXoTPN5uJ2jInRCiACYEBXRSsIZ pmHxGB7bXhpjcB9WMlA+9raVukMIXzDE96Y5l5CiHKHTnpjoe8r6rgwcvv/oJUnyOlKp hOsg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=vrBZJsUp; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::631 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0631.outbound.protection.outlook.com. [2a01:111:f400:fe0e::631]) by gmr-mx.google.com with ESMTPS id n10si3116100jaj.0.2022.02.22.07.59.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Feb 2022 07:59:34 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::631 as permitted sender) client-ip=2a01:111:f400:fe0e::631; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=vrBZJsUp; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::631 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ie8flwLs36/uWQi1Edhm8pdeA7V1zDrnzzG0b3TURH+a/VplrXBY0dLVqCQWSdWNOuGyc7TDNyZ15bYEUBrLMrKv8+7JoOEqxfpfdoOcFFZx0s+9eZKmXO7zgArIIKbpco2KwOE8ZYJ0aFxzQfvagfiuaUMTSKAwAC05DijuAzVFG/FRNR0sC+wmBzghpacKo9dhebbX5VESg1ZsIGMUvC2dmT34rYkk3GHVttyKMBv+FXupS0d6/DZRpvH1nhi9iindTiRu+4U507CBCdUIoZMW9bnEkSQIbKJeATlCAOtY8HeZlsSkjC3m6ckj3ZXzWBrCF+0Nr17LWvn1PC0OKA== 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=l46AtZJ4EEbCTMgFOL8jFjr8NfJqQ0ERl5aLY19YP44=; b=NWIxGyNSxWMBsxwFoiBSGv96H/Sr45lEj4HegjkW/DiuGPDCuBzqjE8wIyqtmx03xhscP9kEb+nDvU5pOjicTjAWfHB9fF4fNVVmNJ2w9PBUcEHMcONZoGahm/XQwS4yxt4eokz7iZygjFWYvwLxquyWFvYTj+ITbjMN2DBkqWlUsdrv8s9GwPMsOMr8r6z4hoIlmrp1BUFLxuDeBJ3nLuUom50ony3XfIl8kOCg/CJ0Jw33F4PyEQziLh+CEdLJeRg1/8UgAfWkJWkPD5Fk4nBSVsbvB5h2pipVKIGopE/9uWpq7wFNWbSWh+eudVsYUYgOQ1Ak4uCCKQ0xRJvXUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l46AtZJ4EEbCTMgFOL8jFjr8NfJqQ0ERl5aLY19YP44=; b=vrBZJsUpL/YhsiRtesSXYH42+ZFZcviAouThznCFYCCEStEwduEJyj4hHSSqVjRgxMDwk4n9DNL2xb3XZ+P8j/e8KY/wchsi52jm2K9LVyLjc25xt2Z+wG+/1yKchopPvmFhBvBUC38QJI6/8hbXtCc8V1ceXkY3rFMzlE74EhOYDFrgGZUXU1YuvF80Hlkm+llqyP6znqO7WfxICIIReMqosLfvU9MHLY+zokrm8jeim1U6cb7YLb/O45yq4xKBRjG0e1V665olbuuiMewcfT9LeTXpmgE+j8nWLdOOAPR2tlM/zmcJmDGaSwq8cZIc4OeODmaLXCmG2YF+QcDbtQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) by DU0PR10MB5241.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:349::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.17; Tue, 22 Feb 2022 15:59:32 +0000 Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551]) by AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551%7]) with mapi id 15.20.4995.027; Tue, 22 Feb 2022 15:59:32 +0000 Date: Tue, 22 Feb 2022 16:59:30 +0100 From: Henning Schild To: Uladzimir Bely Cc: isar-users@googlegroups.com Subject: Re: [PATCH] Avoid line duplicates when appended from the recipes Message-ID: <20220222165930.2e5605b0@md1za8fc.ad001.siemens.net> In-Reply-To: <20220222135209.13724-1-ubely@ilbers.de> References: <20220222135209.13724-1-ubely@ilbers.de> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR07CA0030.eurprd07.prod.outlook.com (2603:10a6:20b:46c::35) To AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e07d9221-d482-4e7c-8b7e-08d9f61c50cb X-MS-TrafficTypeDiagnostic: DU0PR10MB5241:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DhN+SOntkOvhxyTu2fMA/bW8Ff8BVmxQyhgBOs8NRJQ52KjQHnXuuopTgrPP8C37gMkhmbPvauq5dqNispADRkgdc+67bjxl3q9xYe0R78TBALl3bsABXdO4RMHyr3VgWtGU68SCrL/jtjGDLHl9e0IhOclIKpnkvm1kKWsHNF/yHa0yYbpUY4fo3Xxnq8tjK4Jdq2cFsetHmUrJv8R7NjOzpyLZsyNTUDx1TbSV0qwDP9pdVMJEXq9afaQQ/IqrrdLV8axxS3LOS0QwrYBDk6HxqGyo/rnYhTJBDAp/IPWhlWKN67rudaODEKiMLEg5+aTNL6psA1VtwCgzXnq88F/hgabwt1oRCnDZln+KNeR/g7H2ncWd44xZ9JX98m21EC4umNoPahBwqUsfAdBchBdYsMs0xSVjAf35mhEqJ591FMSj/bMZC0lykTF53Zw+KX0QmA8rh+yAUJq8NuJ7SOuILoT1S09aSVrVnbkSiwVVkoOV284uHS6JQqvefqCqI8BObgFOephpX4GsSF/z+YR2QA9jvYgdimegmladK6EO+6UaPL6q5Pk6v49JQUv4gLocKucNCKTijb3IM6kUJ6zmfsUgrLtF+8mLmQTUMKLmkrWMpsYkkTJg5Z8AX8+UjEIaw9U/xQh4NPm5TquiwA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(186003)(508600001)(66556008)(66476007)(1076003)(8676002)(4326008)(6916009)(66946007)(6486002)(316002)(83380400001)(6512007)(9686003)(44832011)(2906002)(82960400001)(86362001)(6506007)(8936002)(5660300002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?adOox0WDdXOJNnBegZ/qOKMuv0zyXqRnieplm6+1RVsz72H/EHbT1aQtZLNQ?= =?us-ascii?Q?V/2Dg8ZQASdGlOLi25dr67S2TB7s5WuJfJMEmpRPUYskLbTDi6Udak6y2ggw?= =?us-ascii?Q?IBfkJkgktRsPzKibh48S5ZOY/tAod4NMM16B9lfnNPnqrs0mJrPwyXpjuPd9?= =?us-ascii?Q?dr80tJV7KBDrfZviC7+tSxHgYXDvlZ9t5KrmsYISuaPVGkfm0jjPVGwqX74n?= =?us-ascii?Q?RJZcgP+MJQ00uBaK50Jk3KfFnu5vPtA0E4Tm4votLWXx3YBACOgTSL25DVQO?= =?us-ascii?Q?nrLOFg7WbcZSz9yJXn8wO7k5NOsuJpPkbSv9hXYpAVPbTyO4l7YhAcd+F1i4?= =?us-ascii?Q?+248relYG7WUGJoUAU9DLt82lfQEf7azlCp/4pINTVHWh/llpsgHS9enHX45?= =?us-ascii?Q?22hIMHN/PgpJUt0XIumsqMT95OgnTSSIv/SKPnrNrNDiwaz/6/q3mvsBx8vK?= =?us-ascii?Q?doBlJ/mbYIIVGJ38WPtLEFQ/wd5RUpzBMGsw+4bjNT7Df27m6j3/5up4Y2vR?= =?us-ascii?Q?MOqIka7/az1FNHLq0FxDUKULUZ6z4pdQB/8GV3IVT86IElEoDtNXq3wTVHPn?= =?us-ascii?Q?FmouhExv3lEnGscCpy5JzRlQiW1+OxDmpWLxgLxC3YE/sE3bBsV8+gXpucNH?= =?us-ascii?Q?drqMC3CEVDPqHN//QYUz7ycC8oi8+MK5qs/wtwt9z20b2pLTorRNOtBG9oop?= =?us-ascii?Q?BQw/k5utTWjKt/rYSekzhzcJSr3q9OSfL+0dl9W8grjD/Pym73/AG89xIpYd?= =?us-ascii?Q?/Ms3snt+zfQAd4vGnOCRQuafn9DxY4Jk7bx0ipla/GCCZLpeNp98EAHWXtHM?= =?us-ascii?Q?Gxye7L4WcwzrxfqZBwkJ05taFlZWYrq/y8Eq/NAA3tbYnj04xhUUZ7nHCtBH?= =?us-ascii?Q?wOvw9a0KaMy3DenhSQkFZKIAv0JMAqk9UcxLdtYAoWji86Gn8MlPnJZyIDJ6?= =?us-ascii?Q?/G7xfou+5ml+inoXRsM7k30Bbs0nTskKP8tpPyDCmKNHmbjzqF6/ih8jirIF?= =?us-ascii?Q?KJvIH1+4bisgVVAicfCuLh9sWJiiGs1bWPcyMJcCaiHVgiaOzWr6gQ1vNi/P?= =?us-ascii?Q?I9TXC4oj1WUiWV9jqmTwQRCbXzg7g1XcgK2B6culdXmBZ6U9xetdoE3nTGN1?= =?us-ascii?Q?JZ2at4VdSdlJFJ0Zx9mOqrz+/X0cGDPoUn3Fw4lSnlvBj0yZSEX8lzDvRSop?= =?us-ascii?Q?lJ7mHLiZYMBeYU+w4Ov6GMEkHc5Vd0KoEOsIxw8+yl2ZydBm+/YLXjhzq0SI?= =?us-ascii?Q?GD0HDR85g7KM3ga6Larzj+60JkvnObgl8y/tv6RszVazNY9+qrhEYNXnM8wN?= =?us-ascii?Q?KA5e++HJi2S3Ce2XzlVDBXE0VwRxTkNg7toqK09OG3Z0N/bhqnZUOW5pk2kL?= =?us-ascii?Q?E82CobbaS1ivl7iuiFslbtPU+wpsG580/U+2AOZrMXOZc2Z4lv8Gb1EfNuMk?= =?us-ascii?Q?F89fIOXKuU8VeC+MnjU+0iEpxNjYJgfR8G2DJWxjApRweWmPITNQpKKIRUMG?= =?us-ascii?Q?ROiQqSC4b8/sGsHlztMFdMXX/nbJzQJvoYlIe370v/sdS8brGSuqoLxniZ89?= =?us-ascii?Q?BXjZw+xdQjmW/gi2PQLOBlJUPW4LbBVLKoxNeKZghualu9nQlAdcuWChcx4o?= =?us-ascii?Q?3UUqyc8MJ3GgVy2tH7F3ahgOvTradBXetaMCtuoiq6JWn/n23o7BKu7GuEIa?= =?us-ascii?Q?ABOaSqKpwJrqCSYpheGXtvmWflthczy4zDALPVwfZWaQSLrNCsIn4guIqk9r?= =?us-ascii?Q?8nQK/e3I96Fhy1xGnX6BBwdwVqEwgPg=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: e07d9221-d482-4e7c-8b7e-08d9f61c50cb X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 15:59:32.6232 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9smmyac/GBSfao9EAdCYtEWyS/37h2CmrDN0PQumbpCSbhYsIF9KqQaaJIGXuUoMouppBk1coo1Qv0YGHxvOtX18kDCNk3N48iYFMVfkEEw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB5241 X-TUID: CwN7ar5TGyQS Am Tue, 22 Feb 2022 14:52:09 +0100 schrieb Uladzimir Bely : > From: WiseLord > > Potentially, using "cat << EOF >> target_file" can kead to duplicated > lines in the target files. > > This adds simple checks for skipping lines append if they already > exist. > > Signed-off-by: WiseLord > --- > meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb | 3 ++- > meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git > a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb > b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb index > 9c0efaf1..8436dcbd 100644 --- > a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb +++ > b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb @@ > -21,7 +21,8 @@ OPTEE_BINARIES = "tee-header_v2.stm32 > tee-pageable_v2.stm32 tee-pager_v2.stm32" # Set version manually to > PV, the tarball does not contain any hint. # Alternative: pull from > git and add git as build dependency. dpkg_runbuild_prepend() { > - cat << EOF >> ${S}/debian/rules > + grep -q "^export TEE_IMPL_VERSION" ${S}/debian/rules || > + cat << EOF >> ${S}/debian/rules this is a single line append, i guess a simple echo instead of a "cat << EOF >> " would be more readable. If you agree you could put that on top in another patch grep -q ... echo -e "\nTEE_IMPL_VERSION=${PV}" >> ${S}/debian/rules probably the "-e" and "\n" are not even needed Henning > export TEE_IMPL_VERSION=${PV} > EOF > diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb > b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb index > 28e51c0d..644535e8 100644 --- > a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb +++ > b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb @@ -25,7 > +25,8 @@ LINUX_VERSION_EXTENSION = "-isar" > # For testing purposes only > dpkg_configure_kernel_append() { > -cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' > ${S}/debian/rules > + grep -q "# CONFIG_MTD is not set" ${S}/debian/rules || > + cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' > ${S}/debian/rules if ! grep "# CONFIG_MTD is not set" \$(O)/.config > && \\ ! grep "# CONFIG_MTD_UBI is not set" \$(O)/.config; then \\ > grep "# CONFIG_UBIFS_FS is not set" \$(O)/.config || \\