Create additional build folders.

minimal-image -> build-minimal
ostree images (dev,vcu) -> build
fct/lava-image -> build-fct

BugzID: 73920

Signed-off-by: Lucien Mueller <lucien.mueller@netmodule.com>

build-fct/conf/bblayers.conf

@@ -0,0 +1,25 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "7"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+BBLAYERS ?= " \
+  ${YOCTOROOT}/openembedded-core/meta \
+  ${YOCTOROOT}/meta-netmodule-wlan \
+  ${YOCTOROOT}/meta-netmodule-bsp \
+  ${YOCTOROOT}/meta-netmodule-distro \
+  ${YOCTOROOT}/meta-netmodule-private \
+  ${YOCTOROOT}/meta-openembedded/meta-python \
+  ${YOCTOROOT}/meta-openembedded/meta-oe \
+  ${YOCTOROOT}/meta-openembedded/meta-networking \
+  ${YOCTOROOT}/meta-openembedded/meta-filesystems \
+  ${YOCTOROOT}/meta-updater \
+  ${YOCTOROOT}/meta-freescale \
+  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-netmodule-om \
+  ${YOCTOROOT}/meta-netmodule-fct \
+  "

build-fct/conf/local.conf

@@ -0,0 +1,46 @@
+BB_NUMBER_THREADS ?= "4"
+PARALLEL_MAKE ?= "-j 4"
+PACKAGE_CLASSES ?= "package_rpm"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+ASSUME_PROVIDED += "libsdl-native"
+CONF_VERSION = "1"
+EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+
+ERROR_QA_remove += "version-going-backwards"
+#WARN_QA_append += "version-going-backwards"
+#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
+
+#PRSERV_HOST = "localhost:0"
+
+SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+DL_DIR="${YOCTOROOT}/build-common/downloads"
+
+BUILDHISTORY_COMMIT = "1"
+BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <ramon.moesching@netmodule.com>"
+
+# Add licences file to the rootfs
+COPY_LIC_MANIFEST = "1"
+COPY_LIC_DIRS = "1"
+LICENSE_CREATE_PACKAGE = "1"
+
+INHERIT += "buildhistory buildstats-summary"
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+PREMIRRORS_prepend = "\
+   git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
+
+include distro_version.inc

build-fct/conf/templateconf.cfg

@@ -0,0 +1 @@
+meta/conf

build-minimal/conf/bblayers.conf

@@ -0,0 +1,24 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "7"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+BBLAYERS ?= " \
+  ${YOCTOROOT}/openembedded-core/meta \
+  ${YOCTOROOT}/meta-netmodule-wlan \
+  ${YOCTOROOT}/meta-netmodule-bsp \
+  ${YOCTOROOT}/meta-netmodule-distro \
+  ${YOCTOROOT}/meta-netmodule-private \
+  ${YOCTOROOT}/meta-openembedded/meta-python \
+  ${YOCTOROOT}/meta-openembedded/meta-oe \
+  ${YOCTOROOT}/meta-openembedded/meta-networking \
+  ${YOCTOROOT}/meta-openembedded/meta-filesystems \
+  ${YOCTOROOT}/meta-updater \
+  ${YOCTOROOT}/meta-freescale \
+  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-netmodule-om \
+  "

build-minimal/conf/local.conf

@@ -0,0 +1,46 @@
+BB_NUMBER_THREADS ?= "4"
+PARALLEL_MAKE ?= "-j 4"
+PACKAGE_CLASSES ?= "package_rpm"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+ASSUME_PROVIDED += "libsdl-native"
+CONF_VERSION = "1"
+EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+
+ERROR_QA_remove += "version-going-backwards"
+#WARN_QA_append += "version-going-backwards"
+#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
+
+#PRSERV_HOST = "localhost:0"
+
+SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+DL_DIR="${YOCTOROOT}/build-common/downloads"
+
+BUILDHISTORY_COMMIT = "1"
+BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <ramon.moesching@netmodule.com>"
+
+# Add licences file to the rootfs
+COPY_LIC_MANIFEST = "1"
+COPY_LIC_DIRS = "1"
+LICENSE_CREATE_PACKAGE = "1"
+
+INHERIT += "buildhistory buildstats-summary"
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+PREMIRRORS_prepend = "\
+   git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
+
+include distro_version.inc

build-minimal/conf/templateconf.cfg

@@ -0,0 +1 @@
+meta/conf

build/conf/bblayers.conf

@@ -21,5 +21,4 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-freescale \
   ${YOCTOROOT}/meta-ublox-module \
   ${YOCTOROOT}/meta-netmodule-om \
-  ${YOCTOROOT}/meta-netmodule-fct \
   "

build/conf/local.conf

@@ -22,6 +22,9 @@ ERROR_QA_remove += "version-going-backwards"
 
 #PRSERV_HOST = "localhost:0"
 
+SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+DL_DIR="${YOCTOROOT}/build-common/downloads"
+
 BUILDHISTORY_COMMIT = "1"
 BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <ramon.moesching@netmodule.com>"
 

env.common

@@ -15,4 +15,4 @@ echo Building for machine $MACHINE, distro: $DISTRO
 
 OSTREE_OSNAME=nm-linux
 
-. ./openembedded-core/oe-init-build-env
+. ./openembedded-core/oe-init-build-env build$BUILD_FOLDER_APPEND

env.image

@@ -1,4 +1,5 @@
 DISTRO_OSTREE=""
 DISTRO_TYPE=""
+BUILD_FOLDER_APPEND=""
 
 . ./env.common

env.image-fct

@@ -1,4 +1,5 @@
 DISTRO_OSTREE=""
 DISTRO_TYPE="-fct"
+BUILD_FOLDER_APPEND=$DISTRO_TYPE
 
 . ./env.common

env.image-lava

@@ -1,4 +1,5 @@
 DISTRO_OSTREE=""
 DISTRO_TYPE="-lava"
+BUILD_FOLDER_APPEND="-fct"
 
 . ./env.common

env.image-minimal

@@ -1,4 +1,5 @@
 DISTRO_OSTREE=""
 DISTRO_TYPE="-minimal"
+BUILD_FOLDER_APPEND=$DISTRO_TYPE
 
 . ./env.common

env.image-ostree

@@ -1,4 +1,5 @@
 DISTRO_OSTREE="-ostree"
 DISTRO_TYPE=""
+BUILD_FOLDER_APPEND=""
 
 . ./env.common

env.image-vcu

@@ -1,5 +1,5 @@
-
 DISTRO_OSTREE="-ostree"
 DISTRO_TYPE="-vcu"
+BUILD_FOLDER_APPEND=""
 
 . ./env.common