diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-04-17 00:28:03 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-04-17 00:35:03 +0300 |
| commit | 2f814a6d8285b35e9fb74e3ce9ce1c44b7e4f763 (patch) | |
| tree | dd79e93858470af04df47c0953528bf612e8ffcb /poky/meta-poky | |
| parent | f0053a50e6a423e12b68673c89b53938346a3af6 (diff) | |
| download | openbmc-2f814a6d8285b35e9fb74e3ce9ce1c44b7e4f763.tar.xz | |
poky: reset subtree on master HEAD(a88251b3e7)
As part of the last subtree update, I used master-next as the
subtree basis because there was a fix we needed in order to get QEMU
to pass. I didn't realize that master-next deviated (because they use
to just have short-term patches in it). Reset the content to the same
fix but from the master branch.
Change-Id: Ic7d2f0ac42e9da3eb263586b26ba56d8798d5bcf
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'poky/meta-poky')
| -rw-r--r-- | poky/meta-poky/classes/poky-bleeding.bbclass | 4 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/poky/meta-poky/classes/poky-bleeding.bbclass b/poky/meta-poky/classes/poky-bleeding.bbclass index e5f30687e4..3bfdcf1454 100644 --- a/poky/meta-poky/classes/poky-bleeding.bbclass +++ b/poky/meta-poky/classes/poky-bleeding.bbclass @@ -1,5 +1,5 @@ # -# AUTOREV and PV containing SRCPV needs to be set early, before any anonymous python +# AUTOREV and PV containing '+git' needs to be set early, before any anonymous python # expands anything containing PV, else the parse process won't trigger the fetcher to # cache the needed version data # @@ -13,7 +13,7 @@ python pokybleeding_version_handler () { bb.warn("Here 5 %s %s" % (d.getVar("PN"), bpn)) d.setVar("SRCREV", "${AUTOREV}") if "+git" not in d.getVar("PV"): - d.appendVar("PV", "+git${SRCPV}") + d.appendVar("PV", "+git") } addhandler pokybleeding_version_handler diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 8b061cf25c..5285753c31 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 = "4.3+snapshot-${METADATA_REVISION}" -DISTRO_CODENAME = "scarthgap" +DISTRO_VERSION = "5.0+snapshot-${METADATA_REVISION}" +DISTRO_CODENAME = "styhead" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" |