From 1fdf613433d4113f36ff0193f9e9c521de47ab97 Mon Sep 17 00:00:00 2001 From: Lucien Mueller Date: Tue, 27 Jul 2021 15:02:14 +0200 Subject: [PATCH] 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 --- build-fct/conf/bblayers.conf | 25 ++++++++++++++++ build-fct/conf/local.conf | 46 +++++++++++++++++++++++++++++ build-fct/conf/templateconf.cfg | 1 + build-minimal/conf/bblayers.conf | 24 +++++++++++++++ build-minimal/conf/local.conf | 46 +++++++++++++++++++++++++++++ build-minimal/conf/templateconf.cfg | 1 + build/conf/bblayers.conf | 1 - build/conf/local.conf | 3 ++ env.common | 2 +- env.image | 1 + env.image-fct | 1 + env.image-lava | 1 + env.image-minimal | 1 + env.image-ostree | 1 + env.image-vcu | 2 +- 15 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 build-fct/conf/bblayers.conf create mode 100644 build-fct/conf/local.conf create mode 100644 build-fct/conf/templateconf.cfg create mode 100644 build-minimal/conf/bblayers.conf create mode 100644 build-minimal/conf/local.conf create mode 100644 build-minimal/conf/templateconf.cfg diff --git a/build-fct/conf/bblayers.conf b/build-fct/conf/bblayers.conf new file mode 100644 index 0000000..61893c9 --- /dev/null +++ b/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 \ + " diff --git a/build-fct/conf/local.conf b/build-fct/conf/local.conf new file mode 100644 index 0000000..88f5fef --- /dev/null +++ b/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 " + +# 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 diff --git a/build-fct/conf/templateconf.cfg b/build-fct/conf/templateconf.cfg new file mode 100644 index 0000000..50d4258 --- /dev/null +++ b/build-fct/conf/templateconf.cfg @@ -0,0 +1 @@ +meta/conf diff --git a/build-minimal/conf/bblayers.conf b/build-minimal/conf/bblayers.conf new file mode 100644 index 0000000..9e2ce25 --- /dev/null +++ b/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 \ + " diff --git a/build-minimal/conf/local.conf b/build-minimal/conf/local.conf new file mode 100644 index 0000000..88f5fef --- /dev/null +++ b/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 " + +# 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 diff --git a/build-minimal/conf/templateconf.cfg b/build-minimal/conf/templateconf.cfg new file mode 100644 index 0000000..50d4258 --- /dev/null +++ b/build-minimal/conf/templateconf.cfg @@ -0,0 +1 @@ +meta/conf diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 61893c9..9e2ce25 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -21,5 +21,4 @@ BBLAYERS ?= " \ ${YOCTOROOT}/meta-freescale \ ${YOCTOROOT}/meta-ublox-module \ ${YOCTOROOT}/meta-netmodule-om \ - ${YOCTOROOT}/meta-netmodule-fct \ " diff --git a/build/conf/local.conf b/build/conf/local.conf index 51a8652..88f5fef 100644 --- a/build/conf/local.conf +++ b/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 " diff --git a/env.common b/env.common index f4a9e41..9820b27 100644 --- a/env.common +++ b/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 diff --git a/env.image b/env.image index f574ac9..6f3b1bc 100644 --- a/env.image +++ b/env.image @@ -1,4 +1,5 @@ DISTRO_OSTREE="" DISTRO_TYPE="" +BUILD_FOLDER_APPEND="" . ./env.common diff --git a/env.image-fct b/env.image-fct index 7bf0f2f..4db5920 100644 --- a/env.image-fct +++ b/env.image-fct @@ -1,4 +1,5 @@ DISTRO_OSTREE="" DISTRO_TYPE="-fct" +BUILD_FOLDER_APPEND=$DISTRO_TYPE . ./env.common diff --git a/env.image-lava b/env.image-lava index 9bfabd2..2cb3fd3 100644 --- a/env.image-lava +++ b/env.image-lava @@ -1,4 +1,5 @@ DISTRO_OSTREE="" DISTRO_TYPE="-lava" +BUILD_FOLDER_APPEND="-fct" . ./env.common diff --git a/env.image-minimal b/env.image-minimal index 828cf81..6eb5f19 100644 --- a/env.image-minimal +++ b/env.image-minimal @@ -1,4 +1,5 @@ DISTRO_OSTREE="" DISTRO_TYPE="-minimal" +BUILD_FOLDER_APPEND=$DISTRO_TYPE . ./env.common diff --git a/env.image-ostree b/env.image-ostree index dcca0bd..8eed8d9 100644 --- a/env.image-ostree +++ b/env.image-ostree @@ -1,4 +1,5 @@ DISTRO_OSTREE="-ostree" DISTRO_TYPE="" +BUILD_FOLDER_APPEND="" . ./env.common diff --git a/env.image-vcu b/env.image-vcu index 6012ce7..08bb7ce 100644 --- a/env.image-vcu +++ b/env.image-vcu @@ -1,5 +1,5 @@ - DISTRO_OSTREE="-ostree" DISTRO_TYPE="-vcu" +BUILD_FOLDER_APPEND="" . ./env.common