summaryrefslogtreecommitdiff
path: root/poky/meta-poky/conf/distro/poky.conf
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta-poky/conf/distro/poky.conf')
-rw-r--r--poky/meta-poky/conf/distro/poky.conf13
1 files changed, 6 insertions, 7 deletions
diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf
index 91779e4e4..37493ed36 100644
--- a/poky/meta-poky/conf/distro/poky.conf
+++ b/poky/meta-poky/conf/distro/poky.conf
@@ -1,7 +1,7 @@
DISTRO = "poky"
DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "3.1"
-DISTRO_CODENAME = "dunfell"
+DISTRO_VERSION = "3.1+snapshot-${DATE}"
+DISTRO_CODENAME = "master"
SDK_VENDOR = "-pokysdk"
SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"
@@ -77,11 +77,10 @@ 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