From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067531606206971904 X-Received: by 2002:a17:906:facf:b0:6cd:ed0e:ed7 with SMTP id lu15-20020a170906facf00b006cded0e0ed7mr19300297ejb.376.1645537932202; Tue, 22 Feb 2022 05:52:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d04c:0:b0:412:cf36:8c00 with SMTP id n12-20020aa7d04c000000b00412cf368c00ls441724edo.0.gmail; Tue, 22 Feb 2022 05:52:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhaw3Lbb++0Kl1j9ywAwmosPoNIvJ08o2ddB3ornViRAbwYJJMumA13aHK2/axou+qv9Mf X-Received: by 2002:a50:d6c7:0:b0:403:c81e:5971 with SMTP id l7-20020a50d6c7000000b00403c81e5971mr26242321edj.244.1645537931205; Tue, 22 Feb 2022 05:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645537931; cv=none; d=google.com; s=arc-20160816; b=n/sumB7tIm8qSKqg1bJ73mH+vScVHyc/HIUqhE7NpxeRKmEtMkBoHxfRROambTBzCB IhIebZfaLtN6QItVzQ+rCBe6NLv2GwURS8ddYe+65VkqyjUaRIbNOMjeTLdnC4ntUbqS k7Q574v6w7M+8IZ18Cym/vUvYUWwjKRSxTeaUsur0oQtZcQ4paNVPVs7+dskpNEEtS91 cf1zuoymqnCXTvCzM9iqX9wNgQJe7eXf7FVlGI4FVIhfEwJ+opAEUuXo8/UCIh8XbNoZ LCa+lVMDQJAa5eqoA8biP1+PN1+wRgMMKj6dQpUdjcF4gjrwp3txB22LryMeHxVxGbWO iaXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=0KHhKhObUO8FqDEw/ne8yHipeda/FPWOziOij29w/rs=; b=kmpIC+lJgwLYd1C9j3v8XZFwgBIojPHOkos6uQ6TiUk2maGO+uQa6EFb6cSISg4Xtw kXDOiQfYmLq2KfBITfdree+2Q/SZZ4FB21vyBPjzfzXtGH1o0/iom04uALGfPiAcunIV 5XztAvPWpCsxPFdgp6QUV8L6vNXiYcmXiLgtzQy7/fPtR1NIrCS6BVUMr9pCT2u05x4Y vmnuhZTQPF6gYh8/3n8tV0jNg6CiPcOT11j7owwOmV5lkZ36h8fP42tiBgtpeFKp6CC+ 1E5qm6GFqYK360WLkjwrTo22azedcGKYm0pjxaK6SXIGZy4bX03mBaQP5nsr58QoEFBN bbAw== 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 j22si911626eda.1.2022.02.22.05.52.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Feb 2022 05:52:11 -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 21MDqAxb021026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 22 Feb 2022 14:52:10 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] Avoid line duplicates when appended from the recipes Date: Tue, 22 Feb 2022 14:52:09 +0100 Message-Id: <20220222135209.13724-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: PnlKRYoNbdCw 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 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