From e6331836895ce166b029fae285fb7ff57845bd35 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 3 Aug 2022 15:16:45 +0200 Subject: [PATCH] local.conf: Use symlink for all local.conf We are anyway using the same local.conf for all distro. It is easier to maintain it with symlinks than always changing all three files. --- build-fct/conf/local.conf | 51 +---------------------------------- build-minimal/conf/local.conf | 51 +---------------------------------- 2 files changed, 2 insertions(+), 100 deletions(-) mode change 100644 => 120000 build-fct/conf/local.conf mode change 100644 => 120000 build-minimal/conf/local.conf diff --git a/build-fct/conf/local.conf b/build-fct/conf/local.conf deleted file mode 100644 index d1009c8..0000000 --- a/build-fct/conf/local.conf +++ /dev/null @@ -1,50 +0,0 @@ -BB_NUMBER_THREADS ?= "8" -PARALLEL_MAKE ?= "-j 8" -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 \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,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" -SSTATE_MIRRORS = "file://.* http://nmrepo.netmodule.intranet/oem-linux-sstate/PATH" -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" - -# enable upstream check to use head of branch: -UPSTREAM_CHECK_COMMITS = "1" - -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" - -require ../../internal-mirrors.inc -include ../../autorev-packages.inc -include distro_version.inc diff --git a/build-fct/conf/local.conf b/build-fct/conf/local.conf new file mode 120000 index 0000000..71740a2 --- /dev/null +++ b/build-fct/conf/local.conf @@ -0,0 +1 @@ +../../build/conf/local.conf \ No newline at end of file diff --git a/build-minimal/conf/local.conf b/build-minimal/conf/local.conf deleted file mode 100644 index d1009c8..0000000 --- a/build-minimal/conf/local.conf +++ /dev/null @@ -1,50 +0,0 @@ -BB_NUMBER_THREADS ?= "8" -PARALLEL_MAKE ?= "-j 8" -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 \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,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" -SSTATE_MIRRORS = "file://.* http://nmrepo.netmodule.intranet/oem-linux-sstate/PATH" -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" - -# enable upstream check to use head of branch: -UPSTREAM_CHECK_COMMITS = "1" - -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" - -require ../../internal-mirrors.inc -include ../../autorev-packages.inc -include distro_version.inc diff --git a/build-minimal/conf/local.conf b/build-minimal/conf/local.conf new file mode 120000 index 0000000..71740a2 --- /dev/null +++ b/build-minimal/conf/local.conf @@ -0,0 +1 @@ +../../build/conf/local.conf \ No newline at end of file