Skip to content

Commit 826f80b

Browse files
committed
meta-chromium: Add a conditional setting for parent of S
The WORKDIR -> UNPACKDIR transition started with styhead and whinlatter now requires it: | S should be set relative to UNPACKDIR, e.g. replace | WORKDIR with UNPACKDIR in "S = ${WORKDIR}/chromium-${PV}" Add a new setting that abstracts away the difference between WORKDIR and UNPACKDIR. Signed-off-by: Zoltán Böszörményi <[email protected]>
1 parent 2110480 commit 826f80b

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

meta-chromium/conf/layer.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,14 @@ LAYERVERSION_chromium-browser-layer = "1"
1212
LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar"
1313

1414
LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
15+
16+
# In whinlatter the UNPACKDIR location has changed, and pathes created using
17+
# the ${WORKDIR} variable are not valid anymore. However older versions still
18+
# require these. This fragment contains a list of recipes in the meta-firefox
19+
# layer that needs their "S" variable modified depending on the used Yocto
20+
# version.
21+
22+
WHINLATTER_S_PARENT = "${UNPACKDIR}"
23+
NON_WHINLATTER_S_PARENT = "${WORKDIR}"
24+
25+
CORRECT_S_PARENT = '${@bb.utils.contains_any("LAYERSERIES_CORENAMES", "whinlatter", d.getVar("WHINLATTER_S_PARENT"), d.getVar("NON_WHINLATTER_S_PARENT"), d)}'

0 commit comments

Comments
 (0)