From 0deabddb14791bb33c989b167784821ffc690342 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Mon, 26 Feb 2018 16:42:01 +0000 Subject: rpi-*-image: Deprecate old image names As discussed on the issue tracker, it's confusing for meta-raspberrypi to have its own set of image names filling the same jobs as the core images. Therefore we are marking these images as deprecated and will be removing them in the future. The recommended replacement images are as follows: rpi-hwup-image -> core-image-minimal rpi-basic-image -> core-image-base The image 'rpi-test-image' will be kept and is not marked as deprecated, it is still useful for testing. It it updated to be based on 'core-image-base'. Signed-off-by: Paul Barker --- recipes-core/images/rpi-basic-image.bb | 4 ++++ recipes-core/images/rpi-hwup-image.bb | 4 ++++ recipes-core/images/rpi-test-image.bb | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/recipes-core/images/rpi-basic-image.bb b/recipes-core/images/rpi-basic-image.bb index 623a5a7..33dca7d 100644 --- a/recipes-core/images/rpi-basic-image.bb +++ b/recipes-core/images/rpi-basic-image.bb @@ -4,3 +4,7 @@ include rpi-hwup-image.bb SPLASH = "psplash-raspberrypi" IMAGE_FEATURES += "ssh-server-dropbear splash" + +do_image_prepend() { + bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead") +} diff --git a/recipes-core/images/rpi-hwup-image.bb b/recipes-core/images/rpi-hwup-image.bb index 486ea59..d2371ad 100644 --- a/recipes-core/images/rpi-hwup-image.bb +++ b/recipes-core/images/rpi-hwup-image.bb @@ -5,3 +5,7 @@ include recipes-core/images/core-image-minimal.bb IMAGE_INSTALL += " \ kernel-modules \ " + +do_image_prepend() { + bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-minimal' instead") +} diff --git a/recipes-core/images/rpi-test-image.bb b/recipes-core/images/rpi-test-image.bb index c8dc436..c2f5f73 100644 --- a/recipes-core/images/rpi-test-image.bb +++ b/recipes-core/images/rpi-test-image.bb @@ -1,5 +1,5 @@ -# Base this image on rpi-basic-image -include rpi-basic-image.bb +# Base this image on core-image-base +include recipes-core/images/core-image-base.bb COMPATIBLE_MACHINE = "^rpi$" -- cgit v1.2.3-54-g00ecf