[meta-cloud-services][PATCH 1/3] openstack-image-compute: fix warning of operator append combined with +=

[meta-cloud-services][PATCH 1/3] openstack-image-compute: fix warning of operator append combined with +=

[Yi Zhao]

Fixes:
WARNING: openstack-image-compute.bb: IMAGE_ROOTFS_EXTRA_SPACE:append +=
is not a recommended operator combination, please replace it.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../recipes-extended/images/openstack-image-compute.bb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
index 15726fd..a725e2e 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
@@ -19,6 +19,6 @@ inherit monitor
 
 # Ensure extra space for guest images, and rabbit MQ has a hard coded
 # check for 2G of free space, so we use 3G as a starting point.
-IMAGE_ROOTFS_EXTRA_SPACE:append += "+ 3000000"
+IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000"
 
 # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
-- 
2.25.1

[meta-cloud-services][PATCH 2/3] openstack-image-controller: fix warning of operator append combined with +=

[Yi Zhao]

Fixes:
WARNING: openstack-image-controller.bb: IMAGE_ROOTFS_EXTRA_SPACE:append
+= is not a recommended operator combination, please replace it.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../recipes-extended/images/openstack-image-controller.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
index 7f41a08..96dc80c 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
@@ -24,5 +24,5 @@ inherit monitor
 
 # Ensure extra space for guest images, and rabbit MQ has a hard coded
 # check for 2G of free space, so we use 5G as a starting point.
-IMAGE_ROOTFS_EXTRA_SPACE:append += "+ 5000000"
+IMAGE_ROOTFS_EXTRA_SPACE:append = " + 5000000"
 
-- 
2.25.1

[meta-cloud-services][PATCH 3/3] meta-openstack/README: fix for operator append combined with +=

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-openstack/Documentation/README.OpenLDAP | 2 +-
 meta-openstack/README.setup                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-openstack/Documentation/README.OpenLDAP b/meta-openstack/Documentation/README.OpenLDAP
index a45b769..95c2227 100644
--- a/meta-openstack/Documentation/README.OpenLDAP
+++ b/meta-openstack/Documentation/README.OpenLDAP
@@ -6,7 +6,7 @@ OpenLDAP into DISTRO_FEATURES
 
 e.g. in conf/local.conf
 
-DISTRO_FEATURES:append += " OpenLDAP"
+DISTRO_FEATURES:append = " OpenLDAP"
 
 A number of variables can be specified during the build phase that configures
 OpenLDAP specific options:
diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup
index d1a4703..f837f63 100644
--- a/meta-openstack/README.setup
+++ b/meta-openstack/README.setup
@@ -95,7 +95,7 @@ systemd will be used in your images:
 
 Additionally activiate the meta-virtualization layer:
 
-    DISTRO_FEATURES:append += "virtualization kvm"
+    DISTRO_FEATURES:append = " virtualization kvm"
 
 
 Package configurations
-- 
2.25.1

Re: [meta-virtualization] [meta-cloud-services][PATCH 1/3] openstack-image-compute: fix warning of operator append combined with +=

[Bruce Ashfield]

merged.

Bruce

In message: [meta-virtualization] [meta-cloud-services][PATCH 1/3] openstack-image-compute: fix warning of operator append combined with +=
on 20/11/2021 Yi Zhao wrote:

> Fixes:
> WARNING: openstack-image-compute.bb: IMAGE_ROOTFS_EXTRA_SPACE:append +=
> is not a recommended operator combination, please replace it.
> 
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  .../recipes-extended/images/openstack-image-compute.bb          | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
> index 15726fd..a725e2e 100644
> --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb
> +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
> @@ -19,6 +19,6 @@ inherit monitor
>  
>  # Ensure extra space for guest images, and rabbit MQ has a hard coded
>  # check for 2G of free space, so we use 3G as a starting point.
> -IMAGE_ROOTFS_EXTRA_SPACE:append += "+ 3000000"
> +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000"
>  
>  # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
> -- 
> 2.25.1
> 

> 
> 
>