From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067531606206971904 X-Received: by 2002:a05:6402:511:b0:40d:e8eb:1dbb with SMTP id m17-20020a056402051100b0040de8eb1dbbmr28894208edv.418.1645596320560; Tue, 22 Feb 2022 22:05:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:c113:b0:6b5:e466:40c7 with SMTP id do19-20020a170906c11300b006b5e46640c7ls2603585ejc.8.gmail; Tue, 22 Feb 2022 22:05:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCILk4AMSaZpy1ZRFEHvd3LR5VitIuSa4IgLsZOXNTMF9dGEvIo1oY1WmudwceSHP4OtxL X-Received: by 2002:a17:906:719a:b0:6ba:493e:3bfc with SMTP id h26-20020a170906719a00b006ba493e3bfcmr21481741ejk.16.1645596319501; Tue, 22 Feb 2022 22:05:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645596319; cv=none; d=google.com; s=arc-20160816; b=RQB6o4UgjHabrIgBc58chJ/c9PVH6BlbYA/+Aibs8ap0xL84xG1IRVoY6G5wMsEpOA kOp5NDvVgpbKIVVjl+fOMkEB+rgEB+Cq2B3iLmSX3JZG6fAQM695ya5btf/zS/E9dGI3 7EqJwsg+wTrmViD3DGM7zIeQdt2ZSFt4HBk5hBT15aYXVQC8zJLicPZsbZRPHwy6KXEl gghFR9SENgtGTZrijrixA2u70qavAdMpD46FZtZY5uBo2mZLHEgDmnbPOhpJORxRXWAb rZj6YcDbtmGMTgwREY2mlM1wMyrL8qcLN0qKOgFPJ8kyL8kukoICAv1rV80Wy3LvkThU mejQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=GqlqGwICjJMEz8gdZ5hDGJpDBUhZbFaWEsmi4aFmteg=; b=l+or7YTceu5Wjlzv+udDeVhfgO3Zj6rtQwe6xYEZ5Joo29VDc+RuZy8p7DQcbk/hrp MBgVwaDedX6HcOEAAVJxn0SuBElOOIDXcqAHYGnvLwKYyWm5QpXavWsRtoUWDHWUGmSm F7eA40LFM1k0L429nmFv4LO9mZR7jqUTDckg+cFFKwYZp6m/OroUaVAwXPtradi6p+dF mCfCHAb+F842uMAf9OFav9H38Yt6Z7datsE7u9YSPPhd8oiFsvYME51B7z/+IQVk1xsv uENuikCmIZ81JWfquBj4DqBmrcP+lJJz735zDmwsI4dllyLwtGILgHa8EiHBCCwuSPQp JjFA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id j22si996479eda.1.2022.02.22.22.05.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Feb 2022 22:05:19 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21N65IYe024756 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 23 Feb 2022 07:05:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 1/1] Avoid line duplicates when appended from the recipes Date: Wed, 23 Feb 2022 07:05:18 +0100 Message-Id: <20220223060518.11847-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220223060518.11847-1-ubely@ilbers.de> References: <20220223060518.11847-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: Gg2UALx4yjlN Potentially, using "cat << EOF >> target_file" can lead to duplicated lines in the target files. This adds simple checks for skipping lines append if they already exist. Signed-off-by: Uladzimir Bely --- 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 || \\ -- 2.20.1