diff options
Diffstat (limited to 'recipes-test/images')
-rw-r--r-- | recipes-test/images/initramfs-test-full-image.bb | 44 | ||||
-rw-r--r-- | recipes-test/images/initramfs-test-image.bb | 31 | ||||
-rw-r--r-- | recipes-test/images/initramfs-tiny-image.bb | 14 |
3 files changed, 50 insertions, 39 deletions
diff --git a/recipes-test/images/initramfs-test-full-image.bb b/recipes-test/images/initramfs-test-full-image.bb index 4081688..d3a5e97 100644 --- a/recipes-test/images/initramfs-test-full-image.bb +++ b/recipes-test/images/initramfs-test-full-image.bb @@ -1,70 +1,46 @@ -require recipes-test/images/initramfs-tiny-image.bb +require recipes-test/images/initramfs-test-image.bb DESCRIPTION = "Relatively larger ramdisk image for running tests (bootrr, etc)" PACKAGE_INSTALL += " \ - bluez5 \ + bootrr \ coreutils \ - dhcpcd \ - diag \ - e2fsprogs \ - e2fsprogs-e2fsck \ - e2fsprogs-mke2fs \ - e2fsprogs-resize2fs \ - e2fsprogs-tune2fs \ - ethtool \ - gptfdisk \ - iw \ hdparm \ kexec \ - lava-test-shell \ - libdrm-tests \ lsof \ ncurses \ ncurses-terminfo \ ncurses-terminfo-base \ - pciutils \ - pd-mapper \ - qrtr \ - rmtfs \ stress-ng \ - tqftpserv \ - usbutils \ util-linux \ util-linux-chrt \ util-linux-lsblk \ - wpa-supplicant \ " -PACKAGE_INSTALL:append:libc-glibc += " \ +PACKAGE_INSTALL:append:libc-glibc = " \ rt-tests \ " # 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 += " \ + +# ncurses-terminfo is provided by oe-core layer, but it's only needed for gps (cgps), so include it here +PACKAGE_INSTALL_openembedded-layer += " \ crash \ - cryptsetup \ - devmem2 \ dhrystone \ + gpsd \ + gpsd-machine-conf \ + gps-utils \ iozone3 \ libgpiod \ libgpiod-tools \ lmbench \ makedumpfile \ mbw \ + ncurses-terminfo-base \ sysbench \ tinymembench \ tiobench \ whetstone \ " - -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)}" diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb index 746c8df..3c19996 100644 --- a/recipes-test/images/initramfs-test-image.bb +++ b/recipes-test/images/initramfs-test-image.bb @@ -3,41 +3,62 @@ require recipes-test/images/initramfs-tiny-image.bb DESCRIPTION = "Small ramdisk image for running tests (bootrr, etc)" PACKAGE_INSTALL += " \ + alsa-utils-alsaucm \ + alsa-utils-amixer \ + alsa-utils-aplay \ + alsa-utils-speakertest \ bluez5 \ + bootrr \ + debugcc \ dhcpcd \ diag \ + dropbear \ e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ e2fsprogs-resize2fs \ e2fsprogs-tune2fs \ ethtool \ + fastrpc \ gptfdisk \ + i2c-tools \ iw \ lava-test-shell \ libdrm-tests \ + lrzsz \ + mybw \ pciutils \ pd-mapper \ qrtr \ rmtfs \ + strace \ tqftpserv \ usbutils \ + util-linux-lscpu \ + util-linux-taskset \ wpa-supplicant \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'kmscube', '', d)} \ " # 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 += " \ +PACKAGE_INSTALL_openembedded-layer += " \ + android-tools-adbd \ + android-tools-adbd-cmdline \ + cpufrequtils \ cryptsetup \ devmem2 \ + lmsensors-config-libsensors \ + lmsensors-sensors \ + media-ctl \ + read-edid \ + yavta \ " -PACKAGE_INSTALL_networking_layer += " \ +PACKAGE_INSTALL_networking-layer += " \ iperf2 \ iperf3 \ + phytool \ 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)}" diff --git a/recipes-test/images/initramfs-tiny-image.bb b/recipes-test/images/initramfs-tiny-image.bb index c70ccee..e9f185b 100644 --- a/recipes-test/images/initramfs-tiny-image.bb +++ b/recipes-test/images/initramfs-tiny-image.bb @@ -15,6 +15,7 @@ IMAGE_LINGUAS = "" LICENSE = "MIT" IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +IMAGE_NAME_SUFFIX ?= "" inherit core-image IMAGE_ROOTFS_SIZE = "8192" @@ -33,3 +34,16 @@ local_autologin () { sed -i -e 's/^\(ExecStart *=.*getty \)/\1--autologin root /' ${LOCAL_GETTY} } ROOTFS_POSTPROCESS_COMMAND += "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'local_autologin;', '', d)}" + +# 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. +# +# To use it define PACKAGE_INSTALL_foo-layer variable containing the list of +# packages to be installed if (and only if) layer foo-layer is enabled. +python() { + for layer in d.getVar("BBFILE_COLLECTIONS", True).split(): + extra = d.getVar("PACKAGE_INSTALL_%s" % layer) + if extra: + d.appendVar("PACKAGE_INSTALL", " " + extra) +} |