From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7252244293746688000 X-Received: by 2002:a1c:f019:0:b0:3fb:b5dc:dab1 with SMTP id a25-20020a1cf019000000b003fbb5dcdab1mr5139455wmb.39.1691012104057; Wed, 02 Aug 2023 14:35:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3ca0:b0:3fa:98f0:ce14 with SMTP id bg32-20020a05600c3ca000b003fa98f0ce14ls598095wmb.2.-pod-prod-04-eu; Wed, 02 Aug 2023 14:35:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlEJWhXffi6j0+siHz44USi1kqpYLomfqtD8ze9lPhiwyyZ13zpekbZbPS479zVtk0sAZX3I X-Received: by 2002:a7b:c84f:0:b0:3fb:739d:27b2 with SMTP id c15-20020a7bc84f000000b003fb739d27b2mr5778172wml.8.1691012102261; Wed, 02 Aug 2023 14:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691012102; cv=none; d=google.com; s=arc-20160816; b=mRBWIc6of2zreTlU7D1um4aCcEc0jOvOCmx3nzbpvw31H87WkGad9YPLRBLa0R7ryx l3Df32sk6LLoCnxPucYiNiTGnI7OVRguBVlhLD8q88NwIBRdhewDBSZk+t18mF/caggs n3OM9jdC4J8yc6kegpJG4C3ng5HrzuCSzDCvpjInfMfYL5hRPTSdtCVRqUrjvpfAWtWM m6v0uMq0syWljDAwhB5fZ9fgmj2L+rIDDfwWZU4Nd+9pjSElGehojmu+QpO2L2vSvVvZ YXxL9z+srbQC18RIvbYopjSqL1MazflUm+WMRya0SCMI+Sqdb6rI6drIy2fuFY3gE4r6 wE6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=XdEbZXD+o5rhjV4nsUrM5M66wb2iS5bkGMPmo/gLlYI=; fh=bofxwoAXZzKPffZOfekq7oexB7iD94fnpYrqz+oXZCg=; b=XiiN+vsoNyu6BgMwMjTbxCR4E09wZ0M/lQsC1wrVYw75qTrlaFR0SkuvqVeLZJASTK JbpLzZ0oUlXqWMRtHkmSqZXKCdFLs2cYyi5/iMorpZwZzPur8e1wQG+yJGvx1vP1slAk 16Ir29Y9y1ynqssWztaXtEHuGZVosrppmwNIUSb3S/WMEbeLRGDgPZnJonJ9v0typSse yuotnyoWiyBFhNm6t9SFWpzG6hhTTGgqcHqlP95aFLDrqG1aA/iv6a/YpyF2VJTvaYtr GYTiBnXhYLMXVlQeoIWWDWPoTwV7ltKN4r9ol5c13cIxSg6wRy0utB8Icy3YGWMq5+2g ZkxQ== 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 k8-20020a05600c1c8800b003fe18653557si224462wms.1.2023.08.02.14.35.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Aug 2023 14:35:02 -0700 (PDT) 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 [127.0.0.1] (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+deb9u1) with ESMTPSA id 372LZ0Z9028594 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 2 Aug 2023 23:35:01 +0200 Message-ID: Subject: Re: [PATCH] inc files: append local files path to FILESPATH From: Uladzimir Bely To: Claudius Heine , isar-users@googlegroups.com Date: Thu, 03 Aug 2023 00:34:59 +0300 In-Reply-To: <20230705081136.606969-1-ch@denx.de> References: <20230705081136.606969-1-ch@denx.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (by Flathub.org) MIME-Version: 1.0 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: RPYLlxeK4gA+ On Wed, 2023-07-05 at 10:11 +0200, Claudius Heine wrote: > FILESEXTRAPATHS is meant to allow bbappend files to overwrite files > from > their recipe. For this reason the 'normal' pattern in bbappend files > is > to prepend the local file path to FILESEXTRAPATHS, which results in > files from the local file path to be preferred over files from the > original recipe, or other, lower prioritized bbappend files. >=20 > The `.inc` files are meant to be included by other recipes (`.bb`) > files. So it should still allow the recipe (`.bb` file) to overwrite > files its files that where added via the default recipes `FILESPATH` > search path. >=20 > If a `.inc` file use `FILESEXTRAPATHS:prepend` to add its local file > path to `FILESPATH`, then the recipe, that includes the `.inc` file > would have to use `FILESEXTRAPATHS:prepend` as well, after including > the > `.inc` file in order to overwrite the local files from the `.inc` > file. >=20 > However this is only a workaround of the issue that originates from > the > `.inc` file using the `FILESEXTRAPATHS` variable. >=20 > `.inc` should append its local file search path to `FILESPATH`, so > that > it allows other recipes to overwrite any file from it via its default > `FILESPATH`, without requiring an additional workaround. >=20 > This patch replaces all occurences of > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0FILESEXTRAPATHS:prepend := =3D "${FILE_DIRNAME}/files:" > with > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0FILESPATH:append :=3D ":$= {FILE_DIRNAME}/files" > in the `.inc` files. >=20 > Signed-off-by: Claudius Heine Applied to next, thanks. New .inc files from new optee* recipes were also considered.