From 48aeec6ee6ccd840d89cfffc6c4e8eef9aed2c93 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 30 Nov 2024 04:14:40 +0200 Subject: [PATCH] initramfs-*-test-image: drop test images The test initramfs images are kept in meta-qcom (at least for now), drop them from this layer. Signed-off-by: Dmitry Baryshkov --- .../images/initramfs-kerneltest-full-image.bb | 3 - .../images/initramfs-kerneltest-image.bb | 3 - .../images/initramfs-test-full-image.bb | 46 ------------- recipes-test/images/initramfs-test-image.bb | 64 ------------------- recipes-test/images/initramfs-tiny-image.bb | 49 -------------- 5 files changed, 165 deletions(-) delete mode 100644 recipes-test/images/initramfs-kerneltest-full-image.bb delete mode 100644 recipes-test/images/initramfs-kerneltest-image.bb delete mode 100644 recipes-test/images/initramfs-test-full-image.bb delete mode 100644 recipes-test/images/initramfs-test-image.bb delete mode 100644 recipes-test/images/initramfs-tiny-image.bb diff --git a/recipes-test/images/initramfs-kerneltest-full-image.bb b/recipes-test/images/initramfs-kerneltest-full-image.bb deleted file mode 100644 index ea60bfe..0000000 --- a/recipes-test/images/initramfs-kerneltest-full-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require initramfs-test-full-image.bb - -PACKAGE_INSTALL += "${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/recipes-test/images/initramfs-kerneltest-image.bb b/recipes-test/images/initramfs-kerneltest-image.bb deleted file mode 100644 index 9dea43c..0000000 --- a/recipes-test/images/initramfs-kerneltest-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require initramfs-test-image.bb - -PACKAGE_INSTALL += "${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/recipes-test/images/initramfs-test-full-image.bb b/recipes-test/images/initramfs-test-full-image.bb deleted file mode 100644 index 402db34..0000000 --- a/recipes-test/images/initramfs-test-full-image.bb +++ /dev/null @@ -1,46 +0,0 @@ -require recipes-test/images/initramfs-test-image.bb - -DESCRIPTION = "Relatively larger ramdisk image for running tests (bootrr, etc)" - -PACKAGE_INSTALL += " \ - bootrr \ - coreutils \ - hdparm \ - kexec \ - lsof \ - ncurses \ - ncurses-terminfo \ - ncurses-terminfo-base \ - stress-ng \ - util-linux \ - util-linux-chrt \ - util-linux-lsblk \ -" - -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. - -# 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', '']['${TCLIBC}' == 'musl']} \ - dhrystone \ - gpsd \ - gpsd-machine-conf \ - gps-utils \ - iozone3 \ - libgpiod \ - libgpiod-tools \ - lmbench \ - makedumpfile \ - mbw \ - ncurses-terminfo-base \ - sysbench \ - tinymembench \ - tiobench \ - whetstone \ -" diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb deleted file mode 100644 index 3c19996..0000000 --- a/recipes-test/images/initramfs-test-image.bb +++ /dev/null @@ -1,64 +0,0 @@ -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 += " \ - android-tools-adbd \ - android-tools-adbd-cmdline \ - cpufrequtils \ - cryptsetup \ - devmem2 \ - lmsensors-config-libsensors \ - lmsensors-sensors \ - media-ctl \ - read-edid \ - yavta \ -" - -PACKAGE_INSTALL_networking-layer += " \ - iperf2 \ - iperf3 \ - phytool \ - tcpdump \ -" diff --git a/recipes-test/images/initramfs-tiny-image.bb b/recipes-test/images/initramfs-tiny-image.bb deleted file mode 100644 index 036076a..0000000 --- a/recipes-test/images/initramfs-tiny-image.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "Tiny ramdisk image for board bringup" - -PACKAGE_INSTALL = " \ - ${ROOTFS_BOOTSTRAP_INSTALL} \ - busybox \ - base-passwd \ - packagegroup-core-boot \ - udev \ -" - -# Do not pollute the initrd image with rootfs features -IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login post-install-logging" -IMAGE_LINGUAS = "" - -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -IMAGE_NAME_SUFFIX ?= "" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" - -# Disable installation of kernel and modules via packagegroup-core-boot -NO_RECOMMENDATIONS ?= "1" - -# Enable local auto-login (on systemd) of the root user (local = serial port and -# virtual console by default, can be configured). -LOCAL_GETTY ?= " \ - ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service \ - ${IMAGE_ROOTFS}${systemd_system_unitdir}/getty@.service \ -" -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) -}