Merge pull request #772 from resin-os/pyro-support

WIP: resin-image: Use ROOTFS_PKGMANAGE_BOOTSTRAP conditionally
balena-os · Jul 28, 2017 · ad8a443 · ad8a443
2 parents fceb394 + 31ca7ef
commit ad8a443
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+IMAGE_INSTALL_append = " ${ROOTFS_PKGMANAGE_BOOTSTRAP}"