From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067531606206971904 X-Received: by 2002:a05:6602:1490:b0:641:20d0:f1f8 with SMTP id a16-20020a056602149000b0064120d0f1f8mr7851272iow.2.1645545924203; Tue, 22 Feb 2022 08:05:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1d04:b0:2c1:f033:ee0b with SMTP id i4-20020a056e021d0400b002c1f033ee0bls1749939ila.6.gmail; Tue, 22 Feb 2022 08:05:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzPZk6hW/mlOWaFPUX5mUrS8nnIjDU8fp30nMLbYlfPCHMHJxwJ72ev47MXLrwXPngTsen X-Received: by 2002:a05:6e02:1a48:b0:2bf:5573:d107 with SMTP id u8-20020a056e021a4800b002bf5573d107mr21036308ilv.209.1645545923741; Tue, 22 Feb 2022 08:05:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645545923; cv=pass; d=google.com; s=arc-20160816; b=u7+L3vdHBFmj9ipeGIPqGuYegE68KiAYQRKb5pN1kRGMudDJkxtNnYZ2t+pjOzvqPJ I1ahiz5r373VeL+ts9HB4JHwiQTz/43cK78eCftEGAw/forTPTuPP7wa9XjsdpSKsI+Z a5VdBk8HL6P5/vHICXShoB7fkhANf9lz5ZeetBd+n+dBem/RDV0sjDPcR5H7k9KROPPS OWSgkkHJm5o9bo9pgtIEfm+eGy70z8H8iC8pL9J05L5DC5JJ1kjf9g310fuUpXS3IOb/ 5BszJCX6QnGBaOagm+uN/tGl12n5khB7ZH+YHYrj8tu5as6QXikqB6UcAfr4JbLm4+qN e7XA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=8Xz6atoIHrRPXos5luoVaBzccvim32rpNKZPJN6ZV/o=; b=dTwW+0clLER53gq7Zsd2qutivId6U+dxHXVGUXOpy1wnUI612vGojvAtt8l5NdupHN 52/qUPoHDrocVM6KTdyk7LZ3biu/keTMSpouRE2mm66v1M0LITuW8UjSpiF+StSIyCk6 ytO1b3mENr0OSyXrQt93dxjnuc8KXLJi8l60fQmmwGUOYRmh5ZAEpTWuiKKaVhcar1gw 1lGBrZzF6rSM2RA/dFufQX34WfckRaoPid/A7YKM3/siHnjmkKMoij4kUGG90+fcmrDd +0KU4yQe7LpZjsG+lTaqZrBN2y7BIQhhroRIDXZlWrEPcYsVhEaSBtfQcV5u+y8WHHF1 V//g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WQR6Acts; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::60c as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on060c.outbound.protection.outlook.com. [2a01:111:f400:fe02::60c]) by gmr-mx.google.com with ESMTPS id j22si419957jat.5.2022.02.22.08.05.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Feb 2022 08:05:23 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::60c as permitted sender) client-ip=2a01:111:f400:fe02::60c; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WQR6Acts; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::60c as permitted sender) smtp.mailfrom=jan.kiszka@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=K2e/2Q++u4Vk6r71BaJgL94tUNRyFEbmNqIXqR3RP7ohLbCBZEg4u72JR2lHnhO2qQBhkI/4IyfllogJkoqQuzD3ZPfCK3jYNqUII2Kg67B7DE8kgrINYp41MrVHtu+TRsI/Uhzp7Qaq1BlvB8NLsjzOyB7+HmYaWIKbQZnt6mmZ2J0y5C1VWVyHeLFCQWbn2FrocpgrGtAMlqc6hcz2rgpcCCMDc3892uQWjtCPhMLaiyVjUbYKbd7dufVks+JX3p9nThAjLjMD8/LdS+ZSAWOl9t8pAdK3A1QBRb2xNQbVsokH7HwmlzOvZJwgNu8VY9fr2NFsT+qjxa0mn6asLQ== 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=8Xz6atoIHrRPXos5luoVaBzccvim32rpNKZPJN6ZV/o=; b=HdWh/0dA87bWkynnoQIeSjjjkN3Q9KEjYN70u9SllxdZHzv2Chn+fkQBBUT57So0w/4Y1E7b+qC3awyTS64jDdEhjGYXOvkWEH63WbhS0tF8zYWVmrddCTL3c9Q2oxR4g/5Ieun3VbY2O42GwrzqssWyoJlC3IY31ZVNvBkdY8NnP7cuv9Zr7QVxANqQXPdUq5xm9O1X4UHXXRrjHJxSlrPbxEvChKYNIZMtQH8eyRcE452amXzDmHvO1natKPsQlcrc9skQHS4aVMmXOXKoWRSoZ2O/Bdx5kSVgPKVFs7to8m4anYP3cEw9+blsScDLrKJEAQbNukBK0BNeF58EKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=ilbers.de smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=8Xz6atoIHrRPXos5luoVaBzccvim32rpNKZPJN6ZV/o=; b=WQR6ActsZlBYBchx9/e6kHM0+x58z9ytXHEt+35DtzIkPPHYL42T6WU4gyRujFmlW/ovlGCmtMsAT8zo8N5Ez147bi/s5/40qZAl3lkF0Jk/QYA5vaBB4edPfO6orDiiTvjPU2PqCIq5VB4mVOVfXKFWuntXG8akDtTXbei3bYMyOTdjowPvyWXLGThAh3Gi6PHOR4qPoqn+R1fp1XySL/CdhVJD72aQ9fYKYBid4IQJWy8J12uwQpgE+yj/Bxw2yqFjYq/YfI0qFfA9+rsZ46BYbEcjrRmGUbOCgMadxZ16rOEcT21t7F4Z61ktsOv5ftX4gMoWUJIg+KsrHZLGig== Received: from SV0P279CA0044.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::13) by AM0PR10MB1890.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:47::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16; Tue, 22 Feb 2022 16:05:21 +0000 Received: from HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::7) by SV0P279CA0044.outlook.office365.com (2603:10a6:f10:13::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.21 via Frontend Transport; Tue, 22 Feb 2022 16:05:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT061.mail.protection.outlook.com (10.152.1.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4995.20 via Frontend Transport; Tue, 22 Feb 2022 16:05:20 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 17:05:19 +0100 Received: from [167.87.1.98] (167.87.1.98) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 17:05:19 +0100 Message-ID: <3357a943-ca48-d494-0c19-1ec1025927e4@siemens.com> Date: Tue, 22 Feb 2022 17:05:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH] Avoid line duplicates when appended from the recipes Content-Language: en-US To: Uladzimir Bely , References: <20220222135209.13724-1-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20220222135209.13724-1-ubely@ilbers.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [167.87.1.98] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69ca4a2f-4c75-4f6e-253e-08d9f61d2016 X-MS-TrafficTypeDiagnostic: AM0PR10MB1890: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: mEBT1HXC0/W661QwFJrrsANwZoeEq3z90OzZwX5OK1uYnmem9mwPbGN8Mi3HRLmyld+2vyBEa87EnSrGWRWuz8zhEXMwoN48pOv0DJuiqiZFZhVm/jwvlKlSzbUctN0g1ucGgcN3v//oJkFf/0eKM9XWeIZq4vYKBgYrwUCIayRv4eZVDFsQJwLhbrmU9IKI1VIp7djk7AZ3LCP3I/fVurpD6hU+5DloaYELNXqGvOueBkgrdGrGxx40ATw12z565IE0L9Kho+vbTuhsubo2I3wa7xJkdMlnDAGnjR541RAeIFfR/sD+Y9Kn5I4vJcrFW2WKLVcl1NxTzJXp6WbLC9Tzjz3jJI3BpMmurh9BTrKts1dWqzrHNzaKypQLh9KCmXr0gElIN2Gl5P1QBORbtbmu891kQ1oW1nqaHAAfF/qpdgdn1rcsRrN6yGr2hCM2X26bNwwVPzWPhD10rbf5C7J6MJLpnmM1gfyy7bmNHl8uS41bC7cYVnGXk0Fuxyvmdulipvjkzh/6tDxhMQu7/1UweXchtyHywWKdADe59T6oEZI/wUwTjmKHvth0kovhmUZv+7u3l3TxwohozCvs8btbwbW6LE4+Bzrpn2wfQ0Kc3NUFrjrpiOr6GHk+fAdtYLmAVATHlmea9uboCqQUGOr6KbVT8kdtSZOXKD+/zB3RA4n7I1Cw10BFZpf9hT4OlhkeGKBSlak0cLbTfqawyvMlvzmnyTsr1K/NsGPkIHtvWD/rJZp1m6ZR+syuWjXu X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(8676002)(70586007)(83380400001)(70206006)(110136005)(6706004)(16576012)(316002)(508600001)(82310400004)(8936002)(31696002)(5660300002)(336012)(956004)(2616005)(2906002)(53546011)(7636003)(82960400001)(356005)(7596003)(36756003)(186003)(40460700003)(26005)(86362001)(16526019)(44832011)(36860700001)(31686004)(47076005)(3940600001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 16:05:20.1584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69ca4a2f-4c75-4f6e-253e-08d9f61d2016 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB1890 X-TUID: LNyvUeS66n0n On 22.02.22 14:52, Uladzimir Bely wrote: > 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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ You likely want to use your real name again ;) Jan > --- > 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 > > 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 || \\ -- Siemens AG, Technology Competence Center Embedded Linux