From 95f236f668f641224144a527279e368e98e2e6bf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 16 Feb 2022 17:43:45 +0000 Subject: core-image-testmaster: Rename to core-image-testcontroller Rename the image, the test controller class/code/module and the underlying image sentinel file to all match the controller terminology. (From OE-Core rev: f87b32833ac5327c4659ab8c06af34e7bda83f83) Signed-off-by: Richard Purdie --- .../images/core-image-testcontroller-initramfs.bb | 24 ++++++++++++++++++++++ .../images/core-image-testcontroller.bb | 18 ++++++++++++++++ .../images/core-image-testmaster-initramfs.bb | 24 ---------------------- .../images/core-image-testmaster.bb | 18 ---------------- 4 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 meta/recipes-extended/images/core-image-testcontroller-initramfs.bb create mode 100644 meta/recipes-extended/images/core-image-testcontroller.bb delete mode 100644 meta/recipes-extended/images/core-image-testmaster-initramfs.bb delete mode 100644 meta/recipes-extended/images/core-image-testmaster.bb (limited to 'meta/recipes-extended/images') diff --git a/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb new file mode 100644 index 0000000000..2bc035a538 --- /dev/null +++ b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Small image capable of booting a device with custom install scripts, \ +adding a second rootfs, used for testing." + +# use -testfs live-install scripts +PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install-testfs initramfs-live-install-efi-testfs busybox udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" + +# Do not pollute the initrd image with rootfs features +IMAGE_FEATURES = "" + +export IMAGE_BASENAME = "core-image-testcontroller-initramfs" +IMAGE_NAME_SUFFIX ?= "" +IMAGE_LINGUAS = "" + +LICENSE = "MIT" + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit core-image + +IMAGE_ROOTFS_SIZE = "8192" +IMAGE_ROOTFS_EXTRA_SPACE = "0" +BAD_RECOMMENDATIONS += "busybox-syslog" + +# Use the same restriction as initramfs-live-install-testfs +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta/recipes-extended/images/core-image-testcontroller.bb b/meta/recipes-extended/images/core-image-testcontroller.bb new file mode 100644 index 0000000000..20edbd5630 --- /dev/null +++ b/meta/recipes-extended/images/core-image-testcontroller.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "A test controller image to be deployed on a target useful for testing other images using the OEQA runtime tests" + +IMAGE_FEATURES += "ssh-server-openssh package-management" + +inherit core-image + +# the deploy code requires bash and +# normal linux utilities not busybox ones +IMAGE_INSTALL += "\ + bash coreutils util-linux tar gzip bzip2 kmod \ + python3-modules python3-misc \ + e2fsprogs e2fsprogs-mke2fs parted \ + " +# we need a particular initramfs for live images +# that pulls custom install scripts which take +# care of partitioning for us +INITRD_IMAGE = "core-image-testcontroller-initramfs" + diff --git a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb b/meta/recipes-extended/images/core-image-testmaster-initramfs.bb deleted file mode 100644 index 1a2e0af27b..0000000000 --- a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Small image capable of booting a device with custom install scripts, \ -adding a second rootfs, used for testing." - -# use -testfs live-install scripts -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install-testfs initramfs-live-install-efi-testfs busybox udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" - -# Do not pollute the initrd image with rootfs features -IMAGE_FEATURES = "" - -export IMAGE_BASENAME = "core-image-testmaster-initramfs" -IMAGE_NAME_SUFFIX ?= "" -IMAGE_LINGUAS = "" - -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" -BAD_RECOMMENDATIONS += "busybox-syslog" - -# Use the same restriction as initramfs-live-install-testfs -COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta/recipes-extended/images/core-image-testmaster.bb b/meta/recipes-extended/images/core-image-testmaster.bb deleted file mode 100644 index 0faf18f5a4..0000000000 --- a/meta/recipes-extended/images/core-image-testmaster.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "A master image to be deployed on a target useful for testing other images" - -IMAGE_FEATURES += "ssh-server-openssh package-management" - -inherit core-image - -# the deploy code requires bash and -# normal linux utilities not busybox ones -IMAGE_INSTALL += "\ - bash coreutils util-linux tar gzip bzip2 kmod \ - python3-modules python3-misc \ - e2fsprogs e2fsprogs-mke2fs parted \ - " -# we need a particular initramfs for live images -# that pulls custom install scripts which take -# care of partitioning for us -INITRD_IMAGE = "core-image-testmaster-initramfs" - -- cgit v1.2.3-54-g00ecf