summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-05-10 16:54:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-05-12 22:01:56 +0100
commit6a2ad60ecc7739d7dbfdf74d67200df374bca4ef (patch)
tree0012a7044a5a9cd98ea0c2fdbbe19e13384a6926 /meta/classes-recipe
parentc40f78b267bab09925f4879dbfbb6ec2f837187c (diff)
downloadpoky-6a2ad60ecc7739d7dbfdf74d67200df374bca4ef.tar.gz
bitbake.conf/pseudo: Switch from exclusion list to inclusion list
Currently, pseudo tracks all files referenced within its presence unless they're listed in an exclusion list. The exclusion list has grown to be fairly unwieldy. This patch swaps PSEUDO_IGNORE_PATHS for PSEUDO_INCLUDE_PATHS which in theory should be easier and more explicit to maintain. This change does drop many directories from pseudo coverage including /home and /tmp. There may be adapatations needed for recipes/classes using pseudo in specific ways. (From OE-Core rev: 2502da81709f25de499277b28d33c915638c45f6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/image.bbclass4
-rw-r--r--meta/classes-recipe/image_types_wic.bbclass4
-rw-r--r--meta/classes-recipe/populate_sdk_base.bbclass4
3 files changed, 5 insertions, 7 deletions
diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
index dc4ce5c0a9..24a19fce1a 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -199,8 +199,6 @@ IMAGE_LOCALES_ARCHIVE ?= '1'
199# aren't yet available. 199# aren't yet available.
200PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" 200PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"
201 201
202PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/intercept_scripts,${WORKDIR}/oe-rootfs-repo,${WORKDIR}/sstate-build-image_complete"
203
204PACKAGE_EXCLUDE ??= "" 202PACKAGE_EXCLUDE ??= ""
205PACKAGE_EXCLUDE[type] = "list" 203PACKAGE_EXCLUDE[type] = "list"
206 204
@@ -666,6 +664,8 @@ MULTILIBRE_ALLOW_REP += "${base_bindir} ${base_sbindir} ${bindir} ${sbindir} ${l
666MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py" 664MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
667MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib" 665MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
668 666
667PSEUDO_INCLUDE_PATHS .= ",${MULTILIB_TEMP_ROOTFS}"
668
669do_fetch[noexec] = "1" 669do_fetch[noexec] = "1"
670do_unpack[noexec] = "1" 670do_unpack[noexec] = "1"
671do_patch[noexec] = "1" 671do_patch[noexec] = "1"
diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
index 1b422b6280..61f028bd7b 100644
--- a/meta/classes-recipe/image_types_wic.bbclass
+++ b/meta/classes-recipe/image_types_wic.bbclass
@@ -30,7 +30,7 @@ WICVARS ?= "\
30 KERNEL_CONSOLE \ 30 KERNEL_CONSOLE \
31 KERNEL_IMAGETYPE \ 31 KERNEL_IMAGETYPE \
32 MACHINE \ 32 MACHINE \
33 PSEUDO_IGNORE_PATHS \ 33 PSEUDO_INCLUDE_PATHS \
34 RECIPE_SYSROOT_NATIVE \ 34 RECIPE_SYSROOT_NATIVE \
35 ROOTFS_SIZE \ 35 ROOTFS_SIZE \
36 STAGING_DATADIR \ 36 STAGING_DATADIR \
@@ -96,8 +96,6 @@ IMAGE_CMD:wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR"
96SPDX_IMAGE_PURPOSE:wic = "diskImage" 96SPDX_IMAGE_PURPOSE:wic = "diskImage"
97do_image_wic[cleandirs] = "${WORKDIR}/build-wic" 97do_image_wic[cleandirs] = "${WORKDIR}/build-wic"
98 98
99PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/build-wic"
100
101# Rebuild when the wks file or vars in WICVARS change 99# Rebuild when the wks file or vars in WICVARS change
102USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" 100USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}"
103WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" 101WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}"
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
index 238cb1ee6e..8ef4b2be77 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -52,6 +52,8 @@ SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
52 52
53SDKDEPLOYDIR = "${WORKDIR}/${SDKMACHINE}-deploy-${PN}-populate-sdk" 53SDKDEPLOYDIR = "${WORKDIR}/${SDKMACHINE}-deploy-${PN}-populate-sdk"
54 54
55PSEUDO_INCLUDE_PATHS .= ",${SDK_DIR}"
56
55B:task-populate-sdk = "${SDK_DIR}" 57B:task-populate-sdk = "${SDK_DIR}"
56 58
57SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}" 59SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
@@ -263,8 +265,6 @@ python do_populate_sdk_setscene () {
263} 265}
264addtask do_populate_sdk_setscene 266addtask do_populate_sdk_setscene
265 267
266PSEUDO_IGNORE_PATHS .= ",${SDKDEPLOYDIR},${WORKDIR}/oe-sdk-repo,${WORKDIR}/sstate-build-populate_sdk"
267
268fakeroot create_sdk_files() { 268fakeroot create_sdk_files() {
269 cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ 269 cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/
270 270