| Message ID | 20260304133148.1838456-2-felix.moessbauer@siemens.com |
|---|---|
| State | New |
| Headers | show |
| Series | Update bitbake to 2.8.1 | expand |
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf index c7a372d7..966d5319 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf @@ -4,7 +4,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" BBFILE_COLLECTIONS += "core" -BBFILE_PATTERN_core = "^${LAYERDIR_RE}/" +BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" LAYERSERIES_CORENAMES = "sumo" diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf index dc9d36a6..7569d1c2 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "networking-layer" -BBFILE_PATTERN_networking-layer := "^${LAYERDIR_RE}/" +BBFILE_PATTERN_networking-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_networking-layer = "5" # This should only be incremented on significant changes that will diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf index 54ddee90..7089071f 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf @@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-python" -BBFILE_PATTERN_meta-python := "^${LAYERDIR_RE}/" +BBFILE_PATTERN_meta-python := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-python = "7" # This should only be incremented on significant changes that will diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf index 4646c234..6649ee02 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf @@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "openembedded-layer" -BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR_RE}/" +BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" # Define the priority for recipes (.bb files) from this layer, # choosing carefully how this layer interacts with all of the
This partially reverts commit 457b394c124890f03501529812eb95a38e860888. We must not patch inside the bitbake directory, as this is a 1:1 copy of the upstream bitbake stable branch. We revert the changes inside the bitbake dir while keeping the fixes in isar. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf | 2 +- bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf | 2 +- bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf | 2 +- bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)