diff options
Diffstat (limited to 'meta-poky/conf/distro/poky.conf')
| -rw-r--r-- | meta-poky/conf/distro/poky.conf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 7b1f24e0dc8..3fdd2f303cc 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -1,7 +1,7 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.5" -DISTRO_CODENAME = "sumo" +DISTRO_VERSION = "2.5+snapshot-${DATE}" +DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -21,7 +21,7 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "4.14%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" @@ -91,11 +91,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 \ - useless-rpaths" + unknown-configure-option useless-rpaths" 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" |