From 3adc76cf05508e5b396905938366fa029a60cd56 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Oct 2023 19:03:05 -0700 Subject: images: Rename -image to -image-all These are test images to build all recipes in layer. Renaming them makes them refect what they are. Moreover we can rename the ptest images to match OE-Core naming conventions for meta-oe/meta-perl/meta-python Signed-off-by: Khem Raj (cherry picked from commit 0cb018059499f7531749ee1d5d1cbb02a6cf3f0a) Signed-off-by: Armin Kuster --- .../recipes-filesystems/images/meta-filesystems-image-all.bb | 3 +++ .../recipes-filesystems/images/meta-filesystems-image.bb | 3 --- .../recipes-multimedia/images/meta-multimedia-image-all.bb | 3 +++ meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb | 3 --- .../recipes-multimedia/images/multimedia-libcamera-image.bb | 2 +- meta-networking/recipes-core/images/meta-networking-image-all.bb | 3 +++ meta-networking/recipes-core/images/meta-networking-image.bb | 3 --- meta-oe/recipes-core/images/meta-oe-image-all.bb | 5 +++++ meta-oe/recipes-core/images/meta-oe-image.bb | 5 ----- meta-perl/recipes-core/images/meta-perl-image-all.bb | 5 +++++ meta-perl/recipes-core/images/meta-perl-image.bb | 5 ----- meta-python/recipes-core/images/meta-python-image-all.bb | 5 +++++ meta-python/recipes-core/images/meta-python-image.bb | 5 ----- meta-webserver/recipes-core/images/meta-webserver-image-all.bb | 3 +++ meta-webserver/recipes-core/images/meta-webserver-image.bb | 3 --- 15 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb delete mode 100644 meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb create mode 100644 meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb delete mode 100644 meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb create mode 100644 meta-networking/recipes-core/images/meta-networking-image-all.bb delete mode 100644 meta-networking/recipes-core/images/meta-networking-image.bb create mode 100644 meta-oe/recipes-core/images/meta-oe-image-all.bb delete mode 100644 meta-oe/recipes-core/images/meta-oe-image.bb create mode 100644 meta-perl/recipes-core/images/meta-perl-image-all.bb delete mode 100644 meta-perl/recipes-core/images/meta-perl-image.bb create mode 100644 meta-python/recipes-core/images/meta-python-image-all.bb delete mode 100644 meta-python/recipes-core/images/meta-python-image.bb create mode 100644 meta-webserver/recipes-core/images/meta-webserver-image-all.bb delete mode 100644 meta-webserver/recipes-core/images/meta-webserver-image.bb diff --git a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb new file mode 100644 index 0000000000..80fb9f9137 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb @@ -0,0 +1,3 @@ +require recipes-core/images/core-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb deleted file mode 100644 index 80fb9f9137..0000000000 --- a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb b/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb new file mode 100644 index 0000000000..dc76265a9b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb @@ -0,0 +1,3 @@ +require recipes-core/images/core-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-multimedia" diff --git a/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb b/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb deleted file mode 100644 index dc76265a9b..0000000000 --- a/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-multimedia" diff --git a/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb b/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb index bc1c52ad48..bc2e858b42 100644 --- a/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb +++ b/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb @@ -4,7 +4,7 @@ DESCRIPTION = "libcamera image" LICENSE = "MIT" -require meta-multimedia-image.bb +require meta-multimedia-image-all.bb IMAGE_INSTALL += " \ kernel-modules \ diff --git a/meta-networking/recipes-core/images/meta-networking-image-all.bb b/meta-networking/recipes-core/images/meta-networking-image-all.bb new file mode 100644 index 0000000000..20d3271c94 --- /dev/null +++ b/meta-networking/recipes-core/images/meta-networking-image-all.bb @@ -0,0 +1,3 @@ +require recipes-core/images/core-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-networking/recipes-core/images/meta-networking-image.bb b/meta-networking/recipes-core/images/meta-networking-image.bb deleted file mode 100644 index 20d3271c94..0000000000 --- a/meta-networking/recipes-core/images/meta-networking-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-oe/recipes-core/images/meta-oe-image-all.bb b/meta-oe/recipes-core/images/meta-oe-image-all.bb new file mode 100644 index 0000000000..1338adf29f --- /dev/null +++ b/meta-oe/recipes-core/images/meta-oe-image-all.bb @@ -0,0 +1,5 @@ +require recipes-core/images/core-image-base.bb + +SUMMARY = "meta-oe build test image" + +IMAGE_INSTALL += "packagegroup-meta-oe" diff --git a/meta-oe/recipes-core/images/meta-oe-image.bb b/meta-oe/recipes-core/images/meta-oe-image.bb deleted file mode 100644 index 1338adf29f..0000000000 --- a/meta-oe/recipes-core/images/meta-oe-image.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-core/images/core-image-base.bb - -SUMMARY = "meta-oe build test image" - -IMAGE_INSTALL += "packagegroup-meta-oe" diff --git a/meta-perl/recipes-core/images/meta-perl-image-all.bb b/meta-perl/recipes-core/images/meta-perl-image-all.bb new file mode 100644 index 0000000000..c46cba21cd --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-image-all.bb @@ -0,0 +1,5 @@ +require recipes-core/images/core-image-base.bb + +SUMMARY = "meta-perl build test image" + +IMAGE_INSTALL += "packagegroup-meta-perl packagegroup-meta-perl-extended" diff --git a/meta-perl/recipes-core/images/meta-perl-image.bb b/meta-perl/recipes-core/images/meta-perl-image.bb deleted file mode 100644 index c46cba21cd..0000000000 --- a/meta-perl/recipes-core/images/meta-perl-image.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-core/images/core-image-base.bb - -SUMMARY = "meta-perl build test image" - -IMAGE_INSTALL += "packagegroup-meta-perl packagegroup-meta-perl-extended" diff --git a/meta-python/recipes-core/images/meta-python-image-all.bb b/meta-python/recipes-core/images/meta-python-image-all.bb new file mode 100644 index 0000000000..fbe3efc600 --- /dev/null +++ b/meta-python/recipes-core/images/meta-python-image-all.bb @@ -0,0 +1,5 @@ +require recipes-core/images/core-image-base.bb + +SUMMARY = "meta-python build test image" + +IMAGE_INSTALL += "packagegroup-meta-python3" diff --git a/meta-python/recipes-core/images/meta-python-image.bb b/meta-python/recipes-core/images/meta-python-image.bb deleted file mode 100644 index fbe3efc600..0000000000 --- a/meta-python/recipes-core/images/meta-python-image.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-core/images/core-image-base.bb - -SUMMARY = "meta-python build test image" - -IMAGE_INSTALL += "packagegroup-meta-python3" diff --git a/meta-webserver/recipes-core/images/meta-webserver-image-all.bb b/meta-webserver/recipes-core/images/meta-webserver-image-all.bb new file mode 100644 index 0000000000..9d2badc236 --- /dev/null +++ b/meta-webserver/recipes-core/images/meta-webserver-image-all.bb @@ -0,0 +1,3 @@ +require recipes-core/images/core-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-webserver" diff --git a/meta-webserver/recipes-core/images/meta-webserver-image.bb b/meta-webserver/recipes-core/images/meta-webserver-image.bb deleted file mode 100644 index 9d2badc236..0000000000 --- a/meta-webserver/recipes-core/images/meta-webserver-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-webserver" -- cgit v1.2.3-54-g00ecf