5 files changed, 37 insertions, 8 deletions

diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 56817450a6..483684ccdf 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 = "5.2"
-DISTRO_CODENAME = "walnascar"
+DISTRO_VERSION = "5.2.99+snapshot-${METADATA_REVISION}"
+DISTRO_CODENAME = "whinlatter"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}"
 SDK_VERSION[vardepvalue] = "${SDK_VERSION}"
diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf
index 483046b6d3..9057670088 100644
--- a/meta-poky/conf/layer.conf
+++ b/meta-poky/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto"
 BBFILE_PATTERN_yocto = "^${LAYERDIR}/"
 BBFILE_PRIORITY_yocto = "5"
 
-LAYERSERIES_COMPAT_yocto = "walnascar"
+LAYERSERIES_COMPAT_yocto = "whinlatter"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
diff --git a/meta-poky/conf/templates/default/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample
index 0a33288cf0..3d830d5b76 100644
--- a/meta-poky/conf/templates/default/local.conf.sample
+++ b/meta-poky/conf/templates/default/local.conf.sample
@@ -21,9 +21,7 @@
 #
 #MACHINE ?= "qemuarm"
 #MACHINE ?= "qemuarm64"
-#MACHINE ?= "qemumips"
-#MACHINE ?= "qemumips64"
-#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemuriscv64"
 #MACHINE ?= "qemux86"
 #MACHINE ?= "qemux86-64"
 #
diff --git a/meta-poky/lib/oeqa/selftest/cases/pokybleeding.py b/meta-poky/lib/oeqa/selftest/cases/pokybleeding.py
new file mode 100644
index 0000000000..d0940d680d
--- /dev/null
+++ b/meta-poky/lib/oeqa/selftest/cases/pokybleeding.py
@@ -0,0 +1,32 @@
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.utils.commands import bitbake, get_bb_var
+from oeqa.selftest.case import OESelftestTestCase
+
+class PokyBleeding(OESelftestTestCase):
+
+    def test_poky_bleeding_autorev(self):
+        """
+        Test that poky-bleeding.bbclass sets SRCREV to "AUTOINC" for recipe
+        with a single scm in SRC_URI and for recipe with two scm's in SRC_URI.
+        """
+
+        self.assertNotEqual( get_bb_var('SRCREV', 'pseudo'), "AUTOINC")
+
+        self.assertNotEqual( get_bb_var('SRCREV', 'hello-rs'), "AUTOINC")
+        self.assertNotEqual( get_bb_var('SRCREV_hello-lib', 'hello-rs'), "AUTOINC")
+        
+        features = '''
+INHERIT += "poky-bleeding"
+POKY_AUTOREV_RECIPES = "hello-rs pseudo"
+'''
+        self.write_config(features)
+
+        self.assertEqual( get_bb_var('SRCREV', 'pseudo'), "AUTOINC")
+
+        self.assertEqual( get_bb_var('SRCREV', 'hello-rs'), "AUTOINC")
+        self.assertEqual( get_bb_var('SRCREV_hello-lib', 'hello-rs'), "AUTOINC")
diff --git a/meta-poky/recipes-core/tiny-init/tiny-init.bb b/meta-poky/recipes-core/tiny-init/tiny-init.bb
index 586596259b..3a774fecc4 100644
--- a/meta-poky/recipes-core/tiny-init/tiny-init.bb
+++ b/meta-poky/recipes-core/tiny-init/tiny-init.bb
@@ -11,8 +11,7 @@ SRC_URI = "file://init \
            file://rc.local.sample \
           "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure() {
         :