From 7df9178766ee7939d139648e04f5747b0ffe1e13 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Sep 2023 17:49:56 +0100 Subject: [PATCH] lib: Import packagedata oe module by default Variable dependencies for functions in the oe.packagedata module were missing as it was not present in BBIMPORTS. Add it as the fact it was missing is likely just historical oversight from base.bbclass history and the dependencies are useful. Add an exclusion to bitbake.conf to ensure BB_NUMBER_THREADS doesn't change task checksums. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 1 + meta/lib/oe/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 67577c8fe7e..7be5cbc992a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -977,3 +977,4 @@ oe.utils.get_multilib_datastore[vardepsexclude] = "DEFAULTTUNE_MULTILIB_ORIGINAL oe.path.format_display[vardepsexclude] = "TOPDIR" oe.utils.get_bb_number_threads[vardepsexclude] = "BB_NUMBER_THREADS" oe.packagedata.emit_pkgdata[vardepsexclude] = "BB_NUMBER_THREADS" +oe.packagedata.read_subpkgdata_extended[vardepsexclude] = "BB_NUMBER_THREADS" diff --git a/meta/lib/oe/__init__.py b/meta/lib/oe/__init__.py index 47be7b51d79..da7cbab3086 100644 --- a/meta/lib/oe/__init__.py +++ b/meta/lib/oe/__init__.py @@ -7,6 +7,6 @@ from pkgutil import extend_path __path__ = extend_path(__path__, __name__) -BBIMPORTS = ["data", "path", "utils", "types", "package", \ +BBIMPORTS = ["data", "path", "utils", "types", "package", "packagedata", \ "packagegroup", "sstatesig", "lsb", "cachedpath", "license", \ "qa", "reproducible", "rust", "buildcfg"] -- 2.47.3