From 64bc1b77f81e3a8b0f3c42e0ca827253f7a42f3d Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Tue, 23 May 2017 14:45:47 +0200 Subject: 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 Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-extended/images/openstack-image-aio.bb | 1 - meta-openstack/recipes-extended/images/openstack-image-compute.bb | 1 - meta-openstack/recipes-extended/images/openstack-image-controller.bb | 1 - meta-openstack/recipes-extended/images/openstack-image-network.bb | 1 - 4 files changed, 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 ?= "" OPENSTACK_AIO_EXTRA_INSTALL ?= "" IMAGE_INSTALL = " \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ ${CORE_IMAGE_BASE_INSTALL} \ packagegroup-core-full-cmdline \ 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 ?= "" IMAGE_INSTALL = " \ packagegroup-core-boot \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ packagegroup-cloud-compute \ packagegroup-cloud-debug \ 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 ?= "" IMAGE_INSTALL = "\ ${CORE_IMAGE_BASE_INSTALL} \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ packagegroup-core-full-cmdline \ packagegroup-cloud-controller \ 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" IMAGE_INSTALL = "\ ${CORE_IMAGE_BASE_INSTALL} \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ packagegroup-core-full-cmdline \ packagegroup-cloud-network \ " -- cgit v1.2.3-54-g00ecf