aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2020-03-21 08:43:06 +0100
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2020-03-21 16:57:25 +0100
commit6ea458d41e1c5c258e59ddcb3cd8f7b2ad0d5678 (patch)
tree7ddee065760835c09b0eea30d119286418c9b4fd
parent72ff0baf1243d990b1e33681cf5f8ffe09e5c023 (diff)
downloadmeta-qcom-6ea458d41e1c5c258e59ddcb3cd8f7b2ad0d5678.tar.gz
meta-qcom-6ea458d41e1c5c258e59ddcb3cd8f7b2ad0d5678.tar.bz2
meta-qcom-6ea458d41e1c5c258e59ddcb3cd8f7b2ad0d5678.zip
initramfs-test-image: use dynamic_layer for utilities not in OE Core
Some tools we have in initramfs-test-image are not in OE Core. So instead split the list and use dynamic-layer to include them only when their respective layers are also globally used. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> (cherry picked from commit 995d78e133a6fd27af5d9b8ebf0abe1b6a8e9c73)
-rw-r--r--conf/layer.conf2
-rw-r--r--dynamic-layers/networking-layer/recipes-test/images/initramfs-test-image.bbappend5
-rw-r--r--dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-image.bbappend3
-rw-r--r--recipes-test/images/initramfs-test-image.bb4
4 files changed, 10 insertions, 4 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 29f088c..c564ce3 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -13,4 +13,6 @@ LAYERSERIES_COMPAT_qcom = "zeus"
BBFILES_DYNAMIC += " \
openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
+ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
+ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
"
diff --git a/dynamic-layers/networking-layer/recipes-test/images/initramfs-test-image.bbappend b/dynamic-layers/networking-layer/recipes-test/images/initramfs-test-image.bbappend
new file mode 100644
index 0000000..bd946f8
--- /dev/null
+++ b/dynamic-layers/networking-layer/recipes-test/images/initramfs-test-image.bbappend
@@ -0,0 +1,5 @@
+PACKAGE_INSTALL += " \
+ iperf2 \
+ iperf3 \
+ tcpdump \
+"
diff --git a/dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-image.bbappend b/dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-image.bbappend
new file mode 100644
index 0000000..16f4e3c
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-test/images/initramfs-test-image.bbappend
@@ -0,0 +1,3 @@
+PACKAGE_INSTALL += " \
+ devmem2 \
+"
diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb
index e55fc00..b4443ee 100644
--- a/recipes-test/images/initramfs-test-image.bb
+++ b/recipes-test/images/initramfs-test-image.bb
@@ -5,19 +5,15 @@ PACKAGE_INSTALL = " \
bluez5 \
busybox \
base-passwd \
- devmem2 \
diag \
ethtool \
gptfdisk \
- iperf2 \
- iperf3 \
lava-test-shell \
packagegroup-core-boot \
pciutils \
pd-mapper \
qrtr \
rmtfs \
- tcpdump \
tqftpserv \
udev \
usbutils \