diff options
| author | Adrian Dudau <adrian.dudau@enea.com> | 2017-05-23 14:45:47 +0200 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-06-01 11:59:14 -0400 |
| commit | a1a56e3f4d500979088a9b18a28b8cc8d42612ed (patch) | |
| tree | 552a9507422844960a082add747cfbb64da0ab79 | |
| parent | 87813ae8386769418febe617062ce17571f9ae60 (diff) | |
| download | meta-cloud-services-a1a56e3f4d500979088a9b18a28b8cc8d42612ed.tar.gz | |
openstack-image-*: Remove ROOTFS_PKGMANAGE_BOOTSTRAP
run-postinsts is now installed by default in image.bbclass, so no need
to include it in each image.
Reference: OE-core rev 529244ee212fe14019e35a5f163fab705ddbf141
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
4 files changed, 0 insertions, 4 deletions
diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb index 2df8536..2fbb85e 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb | |||
| @@ -6,7 +6,6 @@ OPENSTACK_COMPUTE_EXTRA_INSTALL ?= "" | |||
| 6 | OPENSTACK_AIO_EXTRA_INSTALL ?= "" | 6 | OPENSTACK_AIO_EXTRA_INSTALL ?= "" |
| 7 | 7 | ||
| 8 | IMAGE_INSTALL = " \ | 8 | IMAGE_INSTALL = " \ |
| 9 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ | ||
| 10 | ${CORE_IMAGE_BASE_INSTALL} \ | 9 | ${CORE_IMAGE_BASE_INSTALL} \ |
| 11 | packagegroup-core-full-cmdline \ | 10 | packagegroup-core-full-cmdline \ |
| 12 | packagegroup-cloud-compute \ | 11 | packagegroup-cloud-compute \ |
diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb index 979e525..897efc4 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb | |||
| @@ -5,7 +5,6 @@ OPENSTACK_COMPUTE_EXTRA_INSTALL ?= "" | |||
| 5 | 5 | ||
| 6 | IMAGE_INSTALL = " \ | 6 | IMAGE_INSTALL = " \ |
| 7 | packagegroup-core-boot \ | 7 | packagegroup-core-boot \ |
| 8 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ | ||
| 9 | packagegroup-cloud-compute \ | 8 | packagegroup-cloud-compute \ |
| 10 | packagegroup-cloud-debug \ | 9 | packagegroup-cloud-debug \ |
| 11 | packagegroup-cloud-extras \ | 10 | packagegroup-cloud-extras \ |
diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb index 89a4d07..6f324d8 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb | |||
| @@ -5,7 +5,6 @@ OPENSTACK_CONTROLLER_EXTRA_INSTALL ?= "" | |||
| 5 | 5 | ||
| 6 | IMAGE_INSTALL = "\ | 6 | IMAGE_INSTALL = "\ |
| 7 | ${CORE_IMAGE_BASE_INSTALL} \ | 7 | ${CORE_IMAGE_BASE_INSTALL} \ |
| 8 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ | ||
| 9 | packagegroup-core-full-cmdline \ | 8 | packagegroup-core-full-cmdline \ |
| 10 | packagegroup-cloud-controller \ | 9 | packagegroup-cloud-controller \ |
| 11 | packagegroup-cloud-network \ | 10 | packagegroup-cloud-network \ |
diff --git a/meta-openstack/recipes-extended/images/openstack-image-network.bb b/meta-openstack/recipes-extended/images/openstack-image-network.bb index 8c94357..370c273 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-network.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-network.bb | |||
| @@ -3,7 +3,6 @@ LICENSE = "MIT" | |||
| 3 | 3 | ||
| 4 | IMAGE_INSTALL = "\ | 4 | IMAGE_INSTALL = "\ |
| 5 | ${CORE_IMAGE_BASE_INSTALL} \ | 5 | ${CORE_IMAGE_BASE_INSTALL} \ |
| 6 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ | ||
| 7 | packagegroup-core-full-cmdline \ | 6 | packagegroup-core-full-cmdline \ |
| 8 | packagegroup-cloud-network \ | 7 | packagegroup-cloud-network \ |
| 9 | " | 8 | " |