aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2021-09-07 14:33:09 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2021-09-07 20:05:29 +0200
commite56f3b9dabfaac9a219d110c8844d858c019a6da (patch)
tree3a11b37f0360d5e22f193da38413a7c384ecfcd6
parent29d14f81e51604e31d9070c43a456545e7928328 (diff)
downloadmeta-qcom-e56f3b9dabfaac9a219d110c8844d858c019a6da.tar.gz
meta-qcom-e56f3b9dabfaac9a219d110c8844d858c019a6da.tar.bz2
meta-qcom-e56f3b9dabfaac9a219d110c8844d858c019a6da.zip
initramfs-test-full: support dynamic content based on enabled layers
Implement similar mechanism found in: 4e5d23c9a6fa (initramfs-test-image: provide dynamic expansion capabilities) So that we can build derived images. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> (cherry picked from commit 51c2dc82ee2aba7a4a0d1a957a26966d6ff2d3eb)
-rw-r--r--dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-full-image.bbappend8
-rw-r--r--recipes-test/images/initramfs-test-full-image.bb22
2 files changed, 22 insertions, 8 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-full-image.bbappend b/dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-full-image.bbappend
deleted file mode 100644
index 945b369..0000000
--- a/dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-full-image.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGE_INSTALL += " \
- crash \
- devmem2 \
- iozone3 \
- libgpiod \
- libgpiod-tools \
- makedumpfile \
-"
diff --git a/recipes-test/images/initramfs-test-full-image.bb b/recipes-test/images/initramfs-test-full-image.bb
index af66074..9b09a7c 100644
--- a/recipes-test/images/initramfs-test-full-image.bb
+++ b/recipes-test/images/initramfs-test-full-image.bb
@@ -34,3 +34,25 @@ PACKAGE_INSTALL += " \
util-linux-chrt \
wpa-supplicant \
"
+
+# We'd like to include extra packages provided by layers which we do not depend
+# on. This can be handled by .bbappends, but then image recipes including this
+# one would not get all these tools. So simulate dynamic bbappend here.
+PACKAGE_INSTALL_openembedded_layer += " \
+ crash \
+ cryptsetup \
+ devmem2 \
+ iozone3 \
+ libgpiod \
+ libgpiod-tools \
+ makedumpfile \
+"
+
+PACKAGE_INSTALL_networking_layer += " \
+ iperf2 \
+ iperf3 \
+ tcpdump \
+"
+
+PACKAGE_INSTALL += "${@bb.utils.contains("BBFILE_COLLECTIONS", "openembedded-layer", "${PACKAGE_INSTALL_openembedded_layer}", "", d)}"
+PACKAGE_INSTALL += "${@bb.utils.contains("BBFILE_COLLECTIONS", "networking-layer", "${PACKAGE_INSTALL_networking_layer}", "", d)}"