From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7252244293746688000 X-Received: by 2002:a17:903:489:b0:1b8:a2af:fe23 with SMTP id jj9-20020a170903048900b001b8a2affe23mr3269599plb.2.1688544706821; Wed, 05 Jul 2023 01:11:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:228a:b0:1b8:8dab:64e1 with SMTP id b10-20020a170903228a00b001b88dab64e1ls3177880plh.2.-pod-prod-03-us; Wed, 05 Jul 2023 01:11:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3L42shwW0KAqiMPqrYeikkkuWYVCMXAg99mj2jLkr+43Pdo2F2bt7iGxO8p3/BkyuLiad X-Received: by 2002:a17:903:18c:b0:1b8:3ab:e1c with SMTP id z12-20020a170903018c00b001b803ab0e1cmr17901520plg.30.1688544705771; Wed, 05 Jul 2023 01:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688544705; cv=none; d=google.com; s=arc-20160816; b=0VAuizSHDDihSVXkYtOgxFiNwfW7dr75ja94rgwDZ+Z30bWcXQ3sWkuPSX+JNUam59 D7G/rqkhUbFVVdBlivJ8uzDzx6Xsw0bnttHHsa7HTcRqXqCyddwzB+82MuvRi0QfBe3X 2B8A6fnN2iubXkRhw/peIwAmTPgFDilKrFbn1syYWMwKuLZnvpbQif4b1kRe4vfHabyw GAzZcCTefT/iCEYU5xt3lbLLHJWrh5Oyd6NdSevDEOlfVzAut7vmKAA6KXsJHfuaMVSi n18a1vdNxmmg9I/8RvEwagZmYgsFlfyCWl115a4rLrntTKm17IpDUcBgrC3XFcAWsD2X /IcQ== 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:cc :to:from:dkim-signature; bh=i+C0grfsZ4jDsbfElN1n2hifvu7+/eLmQB88vA+MoR4=; fh=cO05w28sj2zLz/KQyX7tI+fFAXAs6oZfnKJHwQ+/Rig=; b=dWbTZ8AQD6ng3IcQb3d/xzWCQWLU/JuU+gqdFTKCOI4iU0IPJQpSINn/UimgF8Zewi GcyzGg3T4l4Cj0DhbRX9luDMuRZEbiDhnxy0Rmc7jzQu8Q9OKBifQA2PNgscQ1exNdhH 0MshQSJxeoGx0FsBrBOspI4dPP4Zr6sFUUK9zzRtL8J4mb7rhEBo0chHSnWFXg0cDdua UFKvumRXgUJgm/vHZZfQCjjX65gshQmi2Z8+d7GP1rq7GjC9SXl0Pd6BT1/Dz7Q2QugI xU2jOTpdeBGx3v9tRDeGAa+Au678yFep55ZmyO6u0G8xEqZmbCV9alCxzmzIzHJVbh1k /cgg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b="UO/cXYfE"; spf=pass (google.com: domain of ch@denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=ch@denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=denx.de Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by gmr-mx.google.com with ESMTPS id jb9-20020a170903258900b001b8a5937569si196872plb.8.2023.07.05.01.11.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 01:11:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ch@denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b="UO/cXYfE"; spf=pass (google.com: domain of ch@denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=ch@denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=denx.de Received: from localhost (dslb-088-077-007-063.088.077.pools.vodafone-ip.de [88.77.7.63]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: ch@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id BCFB28611C; Wed, 5 Jul 2023 10:11:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1688544703; bh=i+C0grfsZ4jDsbfElN1n2hifvu7+/eLmQB88vA+MoR4=; h=From:To:Cc:Subject:Date:From; b=UO/cXYfEjCEJICAIUIZKiAt3h9//KZx3rd1PWA2WBhUA+HxmG2pLpRl/r78SPbVeW W1kc4sGGJ2P0XRIPQ8ztY+S78Jt3s23CwhueODu3r+4KMb2xXy8xwANQP54+OXiDC0 zuMwNLSOM7Tf0B960JyZYTmveyAO4mKaLf/HQ0v0dcuRqzLwzUE2XG+rjdP1lfJlbZ lWO+5zBLcwEVVAa7IwphQB+pkfAWxoIE6IO+cJvUIHH878+LFszeWqZYLn50ULfv3a 4+UQ/k9jHPqiuruUteKOxfPXWnMR7J6HZlA/dfUvfN/ZKg7BQ9UmcQQBFSkEbTcU+H uEFVPG2HMT5XA== From: Claudius Heine To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH] inc files: append local files path to FILESPATH Date: Wed, 5 Jul 2023 10:11:36 +0200 Message-Id: <20230705081136.606969-1-ch@denx.de> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean X-TUID: 2GvwPvYlxf9C 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. 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. 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. However this is only a workaround of the issue that originates from the `.inc` file using the `FILESEXTRAPATHS` variable. `.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. This patch replaces all occurences of FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" with FILESPATH:append := ":${FILE_DIRNAME}/files" in the `.inc` files. Signed-off-by: Claudius Heine --- meta/recipes-bsp/barebox/barebox.inc | 2 +- meta/recipes-bsp/optee-os/optee-os-custom.inc | 2 +- .../trusted-firmware-a/trusted-firmware-a-custom.inc | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +- meta/recipes-kernel/kselftest/kselftest.inc | 2 +- meta/recipes-kernel/linux-module/module.inc | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-bsp/barebox/barebox.inc b/meta/recipes-bsp/barebox/barebox.inc index 2999113..73694e2 100644 --- a/meta/recipes-bsp/barebox/barebox.inc +++ b/meta/recipes-bsp/barebox/barebox.inc @@ -14,7 +14,7 @@ BAREBOX_BUILD_DIR ?= "build" BAREBOX_VERSION_EXTENSION ?= "" BAREBOX_ENV ?= "" -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +FILESPATH:append := ":${FILE_DIRNAME}/files" SRC_URI += "file://rules.tmpl \ file://version.cfg.tmpl \ file://defaultenv.cfg.tmpl" diff --git a/meta/recipes-bsp/optee-os/optee-os-custom.inc b/meta/recipes-bsp/optee-os/optee-os-custom.inc index d48827a..57eddbc 100644 --- a/meta/recipes-bsp/optee-os/optee-os-custom.inc +++ b/meta/recipes-bsp/optee-os/optee-os-custom.inc @@ -7,7 +7,7 @@ inherit dpkg -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +FILESPATH:append := ":${FILE_DIRNAME}/files" SRC_URI += "file://debian/" diff --git a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc index 052d9a4..def4be8 100644 --- a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc +++ b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc @@ -7,7 +7,7 @@ inherit dpkg -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +FILESPATH:append := ":${FILE_DIRNAME}/files" SRC_URI += "file://debian/" diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 876eb36..f16906c 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: MIT -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +FILESPATH:append := ":${FILE_DIRNAME}/files" DESCRIPTION ?= "Custom U-Boot" diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index eb61582..be13b48 100644 --- a/meta/recipes-kernel/kselftest/kselftest.inc +++ b/meta/recipes-kernel/kselftest/kselftest.inc @@ -7,7 +7,7 @@ inherit dpkg -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +FILESPATH:append := ":${THISDIR}/files" # Some test-cases like memfd compilation failed in cross-compilation. # Force native compilation for now to have consistent output across diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index 76ad860..333c66b 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: MIT -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +FILESPATH:append := ":${FILE_DIRNAME}/files" DESCRIPTION ?= "Custom kernel module ${PN}" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 1404ab0..b9c9721 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -47,7 +47,7 @@ LINUX_VERSION_EXTENSION ?= "" KERNEL_DEFCONFIG ??= "" # Add our template meta-data to the sources -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +FILESPATH:append := ":${FILE_DIRNAME}/files" SRC_URI += "file://debian" # Variables and files that make our templates -- 2.40.1