From c7ee2d0236184045d46cfffa9f8822d3118baaf6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 15 Mar 2023 17:59:41 +0000 Subject: poky-bleeding: Update and rework This distro setting has bitrotted quite badly but the idea remains a good one. Try and improve things by: * using a class and a list of recipes to make things more readable * drop settings for recipes which no longer use git * drop obsolete PREFERRED_VERSION settings * add a provider switch to use linux-yocto-dev * reword to avoid "package" confusion with recipe The distro then builds and highlighted a number of matchbox issues which other patches address and improve. (From meta-yocto rev: 00e974484d771dd015af1f2c0c547135555d24d0) Signed-off-by: Richard Purdie --- meta-poky/classes/poky-bleeding.bbclass | 20 +++++++ .../distro/include/poky-floating-revisions.inc | 66 ++++++---------------- meta-poky/conf/distro/poky-bleeding.conf | 6 +- 3 files changed, 39 insertions(+), 53 deletions(-) create mode 100644 meta-poky/classes/poky-bleeding.bbclass diff --git a/meta-poky/classes/poky-bleeding.bbclass b/meta-poky/classes/poky-bleeding.bbclass new file mode 100644 index 0000000000..e5f30687e4 --- /dev/null +++ b/meta-poky/classes/poky-bleeding.bbclass @@ -0,0 +1,20 @@ +# +# AUTOREV and PV containing SRCPV 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 +# +python pokybleeding_version_handler () { + bpn = d.getVar("BPN") + # We're running before the class extension code at PreFinalise so manually fix BPN + bpn = bpn.replace("-nativesdk", "").replace("nativesdk-", "") + + if bpn in d.getVar("POKY_AUTOREV_RECIPES").split(): + if "pseudo" in bpn: + 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}") +} + +addhandler pokybleeding_version_handler +pokybleeding_version_handler[eventmask] = "bb.event.RecipePreFinalise" diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc index 0cc4e005b9..0721a718bd 100644 --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -1,52 +1,22 @@ # -# Package Versions for cutting edge testing: +# Set recipe versions to auto-rev for cutting edge testing # -#SRCREV:pn-opkg-native ?= "${AUTOREV}" -#SRCREV:pn-opkg-sdk ?= "${AUTOREV}" -#SRCREV:pn-opkg ?= "${AUTOREV}" -#SRCREV:pn-opkg-utils-native ?= "${AUTOREV}" -#SRCREV:pn-opkg-utils ?= "${AUTOREV}" -SRCREV:pn-gconf-dbus ?= "${AUTOREV}" -SRCREV:pn-matchbox-common ?= "${AUTOREV}" -SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}" -SRCREV:pn-matchbox-desktop ?= "${AUTOREV}" -SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}" -SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}" -SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}" -SRCREV:pn-matchbox-terminal ?= "${AUTOREV}" -SRCREV:pn-matchbox-wm ?= "${AUTOREV}" -SRCREV:pn-settings-daemon ?= "${AUTOREV}" -SRCREV:pn-screenshot ?= "${AUTOREV}" -SRCREV:pn-libfakekey ?= "${AUTOREV}" -SRCREV:pn-psplash ?= "${AUTOREV}" -SRCREV:pn-gtk-sato-engine ?= "${AUTOREV}" -SRCREV:pn-matchbox-theme-sato ?= "${AUTOREV}" -SRCREV:pn-sato-icon-theme ?= "${AUTOREV}" -SRCREV:pn-matchbox-desktop-sato ?= "${AUTOREV}" -SRCREV:pn-oh-puzzles ?= "${AUTOREV}" -SRCREV:pn-libowl ?= "${AUTOREV}" -SRCREV:pn-libmatchbox ?= "${AUTOREV}" -SRCREV:pn-ofono ?= "${AUTOREV}" - -SRCREV:pn-dri2proto = "${AUTOREV}" -#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" -SRCREV:pn-libdrm = "${AUTOREV}" -#PREFERRED_VERSION_libdrm ?= "2.4.0+git%" -SRCREV:pn-libxcb = "${AUTOREV}" -#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" -SRCREV:pn-lib-proto = "${AUTOREV}" -#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" -SRCREV:pn-libxcb-sdk = "${AUTOREV}" -#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" -SRCREV:pn-xf86-input-evdev = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" -SRCREV:pn-xf86-input-mouse = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" -SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" - -#SRCDATE_oprofile ?= "${DATE}" - -PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" +INHERIT += "poky-bleeding" +POKY_AUTOREV_RECIPES = "\ + libmatchbox \ + opkg-utils \ + matchbox-config-gtk \ + matchbox-desktop \ + matchbox-keyboard \ + matchbox-panel-2 \ + matchbox-terminal \ + matchbox-theme-sato \ + matchbox-wm \ + pseudo \ + puzzles \ + sato-icon-theme \ + sato-screenshot \ + settings-daemon \ +" diff --git a/meta-poky/conf/distro/poky-bleeding.conf b/meta-poky/conf/distro/poky-bleeding.conf index 2d3e046a45..8cbf2284d0 100644 --- a/meta-poky/conf/distro/poky-bleeding.conf +++ b/meta-poky/conf/distro/poky-bleeding.conf @@ -1,8 +1,4 @@ -PREFERRED_VERSION_glib-2.0 ?= "2.17.4" -PREFERRED_VERSION_glib-2.0-native ?= "2.17.4" -PREFERRED_VERSION_atk ?= "1.22.0" -PREFERRED_VERSION_pango ?= "1.21.2" -PREFERRED_VERSION_gtk+ ?= "2.13.3" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" require conf/distro/include/poky-floating-revisions.inc require conf/distro/poky.conf -- cgit v1.2.3-54-g00ecf