diff options
Diffstat (limited to 'poky/meta-poky/conf/distro')
-rw-r--r-- | poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 31 |
2 files changed, 19 insertions, 14 deletions
diff --git a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 9926c1bb0..0b0412e60 100644 --- a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -2,7 +2,7 @@ DISTRO_FEATURES_append = " pam" # Use the LTSI Kernel -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" # Ensure the kernel nfs server is enabled KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 619414295..f2ee0d187 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,11 +1,11 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "3.0" -DISTRO_CODENAME = "zeus" +DISTRO_VERSION = "3.1+snapshot-${DATE}" +DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" -MAINTAINER = "Poky <poky@yoctoproject.org>" +MAINTAINER = "Poky <poky@lists.yoctoproject.org>" TARGET_VENDOR = "-poky" @@ -21,7 +21,7 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" @@ -50,15 +50,16 @@ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" SANITY_TESTED_DISTROS ?= " \ - poky-2.7 \n \ poky-3.0 \n \ + poky-3.1 \n \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ - ubuntu-19.04 \n \ - fedora-28 \n \ - fedora-29 \n \ + ubuntu-20.04 \n \ fedora-30 \n \ + fedora-31 \n \ + fedora-32 \n \ centos-7 \n \ + centos-8 \n \ debian-8 \n \ debian-9 \n \ debian-10 \n \ @@ -76,14 +77,18 @@ OELAYOUT_ABI = "12" INHERIT += "poky-sanity" # QA check settings - a little stricter than the OE-Core defaults -WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \ - installed-vs-shipped ldflags pn-overrides rpaths staticdev \ - unknown-configure-option useless-rpaths" -WARN_QA_remove = "${WARN_TO_ERROR_QA}" -ERROR_QA_append = " ${WARN_TO_ERROR_QA}" +# (none currently necessary as we now match OE-Core) +#WARN_TO_ERROR_QA = "X" +#WARN_QA_remove = "${WARN_TO_ERROR_QA}" +#ERROR_QA_append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc require conf/distro/include/security_flags.inc INHERIT += "uninative" + +INHERIT += "reproducible_build" + +BB_SIGNATURE_HANDLER ?= "OEEquivHash" +BB_HASHSERVE ??= "auto" |