Updates for new syntax of YP

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I96afb175096b659391e1b164f35cbdd725b5fc5f

diff --git a/jjb/common/include-agl-local-conf-fstypes.sh b/jjb/common/include-agl-local-conf-fstypes.sh
index c48cd81..612fd7f 100644 (file)
--- a/jjb/common/include-agl-local-conf-fstypes.sh
+++ b/jjb/common/include-agl-local-conf-fstypes.sh
@@ -5,14 +5,5 @@
 ## Change FSTYPES to sane values
 ################################################################################
 
-# "old"
-echo 'IMAGE_FSTYPES_remove = "ext4"' >> conf/local.conf
-echo 'IMAGE_FSTYPES_remove = "ext3"' >> conf/local.conf
-echo 'IMAGE_FSTYPES_remove = "tar.bz2"' >> conf/local.conf
-echo 'IMAGE_FSTYPES_remove = "tar.gz"' >> conf/local.conf
-echo 'IMAGE_FSTYPES_remove = "iso"' >> conf/local.conf
-echo 'IMAGE_FSTYPES_remove = "hddimg"' >> conf/local.conf
-echo 'IMAGE_FSTYPES += "tar.xz ext4.xz "' >> conf/local.conf
-
 # "new"
 echo 'AGL_DEFAULT_IMAGE_FSTYPES := "ext4.xz tar.xz"' >> conf/local.conf

diff --git a/jjb/common/include-agl-local-conf-include-ptest.sh b/jjb/common/include-agl-local-conf-include-ptest.sh
index df73625..6ae33c5 100644 (file)
--- a/jjb/common/include-agl-local-conf-include-ptest.sh
+++ b/jjb/common/include-agl-local-conf-include-ptest.sh
@@ -1,6 +1,6 @@
 
 echo '# CI: Enabling ptest in image ... ' >> conf/local.conf
-echo 'DISTRO_FEATURES_append = " ptest"' >> conf/local.conf
-echo 'EXTRA_IMAGE_FEATURES_append = " ptest-pkgs"' >> conf/local.conf
+echo 'DISTRO_FEATURES:append = " ptest"' >> conf/local.conf
+echo 'EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"' >> conf/local.conf
 
 

diff --git a/jjb/common/include-agl-remove-wic-auto-conf.sh b/jjb/common/include-agl-remove-wic-auto-conf.sh
index 72a9df4..aeac3f6 100644 (file)
--- a/jjb/common/include-agl-remove-wic-auto-conf.sh
+++ b/jjb/common/include-agl-remove-wic-auto-conf.sh
@@ -8,9 +8,9 @@ cat << EOF >> conf/auto.conf
 
 # remove wic as CI does only use ext4 in lava
 # this saves i/o and time
-IMAGE_FSTYPES_remove = "wic.xz"
-IMAGE_FSTYPES_remove = "wic.bmap"
-IMAGE_FSTYPES_remove = "wic.vmdk.xz"
+IMAGE_FSTYPES:remove = "wic.xz"
+IMAGE_FSTYPES:remove = "wic.bmap"
+IMAGE_FSTYPES:remove = "wic.vmdk.xz"
 
 
 

diff --git a/jjb/common/include-apps-build-app-by-recipe.sh b/jjb/common/include-apps-build-app-by-recipe.sh
index 628e092..d8c20a6 100644 (file)
--- a/jjb/common/include-apps-build-app-by-recipe.sh
+++ b/jjb/common/include-apps-build-app-by-recipe.sh
@@ -116,7 +116,7 @@ SSTATE_MIRRORS = " \
 #file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n 
 #
 
-IMAGE_FSTYPES_remove = "ext3"
+IMAGE_FSTYPES:remove = "ext3"
 SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/"
 
 EOF