From 31ca7ef80398271b6a567249fe366e46b0d95a16 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Thu, 27 Jul 2017 17:24:24 +0100 Subject: [PATCH] resin-image: Use ROOTFS_PKGMANAGE_BOOTSTRAP conditionally ROOTFS_PKGMANAGE_BOOTSTRAP is removed in Yocto Pyro so only use it for Yocto releases that have it. Change-type: minor Changelog-entry: Support building with Yocto Pyro Signed-off-by: Will Newton --- meta-resin-common/recipes-core/images/resin-image-flasher.bb | 1 - meta-resin-common/recipes-core/images/resin-image.bb | 1 - meta-resin-fido/recipes-core/images/resin-image.bbappend | 1 + meta-resin-jethro/recipes-core/images/resin-image.bbappend | 1 + .../recipes-core/images/resin-image-flasher.bbappend | 2 ++ meta-resin-krogoth/recipes-core/images/resin-image.bbappend | 1 + .../recipes-core/images/resin-image-flasher.bbappend | 4 +++- meta-resin-morty/recipes-core/images/resin-image.bbappend | 1 + 8 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 meta-resin-fido/recipes-core/images/resin-image.bbappend create mode 100644 meta-resin-jethro/recipes-core/images/resin-image.bbappend create mode 100644 meta-resin-krogoth/recipes-core/images/resin-image.bbappend create mode 100644 meta-resin-morty/recipes-core/images/resin-image.bbappend diff --git a/meta-resin-common/recipes-core/images/resin-image-flasher.bb b/meta-resin-common/recipes-core/images/resin-image-flasher.bb index af06db6319..c8cd375e3f 100644 --- a/meta-resin-common/recipes-core/images/resin-image-flasher.bb +++ b/meta-resin-common/recipes-core/images/resin-image-flasher.bb @@ -21,7 +21,6 @@ IMAGE_FEATURES_append = " \ IMAGE_INSTALL = " \ packagegroup-core-boot \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ ${CORE_IMAGE_EXTRA_INSTALL} \ packagegroup-resin-connectivity \ packagegroup-resin-flasher \ diff --git a/meta-resin-common/recipes-core/images/resin-image.bb b/meta-resin-common/recipes-core/images/resin-image.bb index faf9281306..2770a9c823 100644 --- a/meta-resin-common/recipes-core/images/resin-image.bb +++ b/meta-resin-common/recipes-core/images/resin-image.bb @@ -28,7 +28,6 @@ IMAGE_FEATURES_append = " \ IMAGE_INSTALL = " \ packagegroup-core-boot \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ ${CORE_IMAGE_EXTRA_INSTALL} \ packagegroup-resin-debugtools \ packagegroup-resin-connectivity \ diff --git a/meta-resin-fido/recipes-core/images/resin-image.bbappend b/meta-resin-fido/recipes-core/images/resin-image.bbappend new file mode 100644 index 0000000000..0430d4a967 --- /dev/null +++ b/meta-resin-fido/recipes-core/images/resin-image.bbappend @@ -0,0 +1 @@ +IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}" diff --git a/meta-resin-jethro/recipes-core/images/resin-image.bbappend b/meta-resin-jethro/recipes-core/images/resin-image.bbappend new file mode 100644 index 0000000000..0430d4a967 --- /dev/null +++ b/meta-resin-jethro/recipes-core/images/resin-image.bbappend @@ -0,0 +1 @@ +IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}" diff --git a/meta-resin-krogoth/recipes-core/images/resin-image-flasher.bbappend b/meta-resin-krogoth/recipes-core/images/resin-image-flasher.bbappend index bc18a7c3f9..779d7f194b 100644 --- a/meta-resin-krogoth/recipes-core/images/resin-image-flasher.bbappend +++ b/meta-resin-krogoth/recipes-core/images/resin-image-flasher.bbappend @@ -2,3 +2,5 @@ # krogoth/morty has the raw image in the deploy dir image after the # do_image_complete task has been finished) IMAGE_DEPENDS_resinos-img_append = " resin-image:do_image_complete" + +IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}" diff --git a/meta-resin-krogoth/recipes-core/images/resin-image.bbappend b/meta-resin-krogoth/recipes-core/images/resin-image.bbappend new file mode 100644 index 0000000000..0430d4a967 --- /dev/null +++ b/meta-resin-krogoth/recipes-core/images/resin-image.bbappend @@ -0,0 +1 @@ +IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}" diff --git a/meta-resin-morty/recipes-core/images/resin-image-flasher.bbappend b/meta-resin-morty/recipes-core/images/resin-image-flasher.bbappend index 91c802e8d7..779d7f194b 100644 --- a/meta-resin-morty/recipes-core/images/resin-image-flasher.bbappend +++ b/meta-resin-morty/recipes-core/images/resin-image-flasher.bbappend @@ -1,4 +1,6 @@ -# Make sure you have the resin raw image ready in DEPLOY_DIR_IMAGE (poky +# Make sure you have the raw resin image ready in DEPLOY_DIR_IMAGE (poky # krogoth/morty has the raw image in the deploy dir image after the # do_image_complete task has been finished) IMAGE_DEPENDS_resinos-img_append = " resin-image:do_image_complete" + +IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}" diff --git a/meta-resin-morty/recipes-core/images/resin-image.bbappend b/meta-resin-morty/recipes-core/images/resin-image.bbappend new file mode 100644 index 0000000000..0430d4a967 --- /dev/null +++ b/meta-resin-morty/recipes-core/images/resin-image.bbappend @@ -0,0 +1 @@ +IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}"