From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067531606206971904 X-Received: by 2002:a05:6512:1096:b0:443:9258:1d48 with SMTP id j22-20020a056512109600b0044392581d48mr18973647lfg.681.1645596801789; Tue, 22 Feb 2022 22:13:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a54a:0:b0:246:420e:ed3a with SMTP id e10-20020a2ea54a000000b00246420eed3als1302850ljn.8.gmail; Tue, 22 Feb 2022 22:13:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0FclvJHoleUDkHpldlSakvVNLY+QXa3FkFSW8sSi8q2ujP1Rr/YpohN5EoFGW1rGv/rM1 X-Received: by 2002:a2e:bd13:0:b0:244:da2f:ff4d with SMTP id n19-20020a2ebd13000000b00244da2fff4dmr20352556ljq.213.1645596800557; Tue, 22 Feb 2022 22:13:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645596800; cv=none; d=google.com; s=arc-20160816; b=ip6whEiNOCiKJO5iB1Zui8OTRZAwjgmjSJjD2BmLJWk+tR9oQLyDOzVqt6h8ETt48V 0rFrzDZwtfCM2dz4IFqgTFGQz6MG8tA7Zt5dav74+KLuMfR6JxmeX9OOV/MzLtmnTHSn s1rwhyzkY/osZfjFzImyG5r3r6kXFfwqpiz/KLDub1LpS05C4QHQl82stJGZGqXZJpGt 5OeUL25xJ2L/d81fc+VuOyIzgKcim9D1EBIN17LukwJu1nJzO9zLqTwk/KB8TvRNaK+J tEY/thfj5VAYRF3GiS4qRQcb2qvSzkDya2IT2+5PB6f4xykOYkVMkYfeRL6wUARE425n MNew== 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=4WEat3VoWA8XQcBEiji2x4S2OwHYzMoKUFkmK/eqBKY=; b=vt/9EnJ0jVcvTEYGfjKOUzXGxdDNX3Q2qG7JerVUcaWLFHdAiPd6yvewUKA+qNeCc+ cvypw77XP7tQ0WcGpFtR4MoYLf83IrBFukWee3TFAowkK2KOslR/GX9KYG08/1/njgDn gfJYniEfB6c+JYsopJ/WE0jb2SsJgC/BAQlzK9XvyxTCJXf2XsLoUjHdJwgxvCsipEuA NwjbI+D0DVttJd8SNwxRh4OoubAMg2GsLgKuSIrZ1bM6YGPAmWFFtQTNG7hqUSwfEwDc nFBnuY9s+jSJracHv71NPVg2PI/Mt41NFwUcXHth4NhEHDbxMgjH8h4lK2UR8F3iWEDK SSdw== 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 w26si875766ljh.1.2022.02.22.22.13.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Feb 2022 22:13:20 -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 home.localnet (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21N6DInr024808 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Feb 2022 07:13:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com, Jan Kiszka Subject: Re: [PATCH] Avoid line duplicates when appended from the recipes Date: Wed, 23 Feb 2022 09:13:15 +0300 Message-ID: <2534840.fDdHjke4Dd@home> In-Reply-To: <3357a943-ca48-d494-0c19-1ec1025927e4@siemens.com> References: <20220222135209.13724-1-ubely@ilbers.de> <3357a943-ca48-d494-0c19-1ec1025927e4@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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: vAAA/8jAvtiq In the email from Tuesday, 22 February 2022 19:05:18 +03 user Jan Kiszka wrote: > 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 > Thanks. Fixed in new version. I prepared a patch on a different PC with different global .gitconfig options and missed this moment. I googled a bit for ways to prevent such things in the future, and it might be interesting for someone else. The idea is to place to the end of `~.gitconfig` something like: `` [includeIf "gitdir:/home/Work/"] path = /home/Work/.gitconfig ``` In this case all git repos in `/home/Work` and subdirectories will use settings from local `.gitconfig` that will override global settings. > > --- > > > > 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 || \\ -- Uladzimir Bely