summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-15 17:59:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-21 22:47:01 +0000
commitc7ee2d0236184045d46cfffa9f8822d3118baaf6 (patch)
treef038e0fb474e92b360920fc6e7227d0b6cf6cd5b
parent614b2a8379ef073af8be135d8aab89cbe797e347 (diff)
downloadpoky-c7ee2d0236184045d46cfffa9f8822d3118baaf6.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/classes/poky-bleeding.bbclass20
-rw-r--r--meta-poky/conf/distro/include/poky-floating-revisions.inc66
-rw-r--r--meta-poky/conf/distro/poky-bleeding.conf6
3 files changed, 39 insertions, 53 deletions
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 @@
1#
2# AUTOREV and PV containing SRCPV needs to be set early, before any anonymous python
3# expands anything containing PV, else the parse process won't trigger the fetcher to
4# cache the needed version data
5#
6python pokybleeding_version_handler () {
7 bpn = d.getVar("BPN")
8 # We're running before the class extension code at PreFinalise so manually fix BPN
9 bpn = bpn.replace("-nativesdk", "").replace("nativesdk-", "")
10
11 if bpn in d.getVar("POKY_AUTOREV_RECIPES").split():
12 if "pseudo" in bpn:
13 bb.warn("Here 5 %s %s" % (d.getVar("PN"), bpn))
14 d.setVar("SRCREV", "${AUTOREV}")
15 if "+git" not in d.getVar("PV"):
16 d.appendVar("PV", "+git${SRCPV}")
17}
18
19addhandler pokybleeding_version_handler
20pokybleeding_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 @@
1# 1#
2# Package Versions for cutting edge testing: 2# Set recipe versions to auto-rev for cutting edge testing
3# 3#
4 4
5#SRCREV:pn-opkg-native ?= "${AUTOREV}" 5INHERIT += "poky-bleeding"
6#SRCREV:pn-opkg-sdk ?= "${AUTOREV}"
7#SRCREV:pn-opkg ?= "${AUTOREV}"
8#SRCREV:pn-opkg-utils-native ?= "${AUTOREV}"
9#SRCREV:pn-opkg-utils ?= "${AUTOREV}"
10SRCREV:pn-gconf-dbus ?= "${AUTOREV}"
11SRCREV:pn-matchbox-common ?= "${AUTOREV}"
12SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}"
13SRCREV:pn-matchbox-desktop ?= "${AUTOREV}"
14SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}"
15SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}"
16SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}"
17SRCREV:pn-matchbox-terminal ?= "${AUTOREV}"
18SRCREV:pn-matchbox-wm ?= "${AUTOREV}"
19SRCREV:pn-settings-daemon ?= "${AUTOREV}"
20SRCREV:pn-screenshot ?= "${AUTOREV}"
21SRCREV:pn-libfakekey ?= "${AUTOREV}"
22SRCREV:pn-psplash ?= "${AUTOREV}"
23SRCREV:pn-gtk-sato-engine ?= "${AUTOREV}"
24SRCREV:pn-matchbox-theme-sato ?= "${AUTOREV}"
25SRCREV:pn-sato-icon-theme ?= "${AUTOREV}"
26SRCREV:pn-matchbox-desktop-sato ?= "${AUTOREV}"
27SRCREV:pn-oh-puzzles ?= "${AUTOREV}"
28SRCREV:pn-libowl ?= "${AUTOREV}"
29SRCREV:pn-libmatchbox ?= "${AUTOREV}"
30SRCREV:pn-ofono ?= "${AUTOREV}"
31
32SRCREV:pn-dri2proto = "${AUTOREV}"
33#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%"
34SRCREV:pn-libdrm = "${AUTOREV}"
35#PREFERRED_VERSION_libdrm ?= "2.4.0+git%"
36SRCREV:pn-libxcb = "${AUTOREV}"
37#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%"
38SRCREV:pn-lib-proto = "${AUTOREV}"
39#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%"
40SRCREV:pn-libxcb-sdk = "${AUTOREV}"
41#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%"
42SRCREV:pn-xf86-input-evdev = "${AUTOREV}"
43#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
44SRCREV:pn-xf86-input-mouse = "${AUTOREV}"
45#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%"
46SRCREV:pn-xf86-input-synaptics = "${AUTOREV}"
47#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%"
48
49#SRCDATE_oprofile ?= "${DATE}"
50
51PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}"
52 6
7POKY_AUTOREV_RECIPES = "\
8 libmatchbox \
9 opkg-utils \
10 matchbox-config-gtk \
11 matchbox-desktop \
12 matchbox-keyboard \
13 matchbox-panel-2 \
14 matchbox-terminal \
15 matchbox-theme-sato \
16 matchbox-wm \
17 pseudo \
18 puzzles \
19 sato-icon-theme \
20 sato-screenshot \
21 settings-daemon \
22"
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 @@
1PREFERRED_VERSION_glib-2.0 ?= "2.17.4" 1PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
2PREFERRED_VERSION_glib-2.0-native ?= "2.17.4"
3PREFERRED_VERSION_atk ?= "1.22.0"
4PREFERRED_VERSION_pango ?= "1.21.2"
5PREFERRED_VERSION_gtk+ ?= "2.13.3"
6 2
7require conf/distro/include/poky-floating-revisions.inc 3require conf/distro/include/poky-floating-revisions.inc
8require conf/distro/poky.conf 4require conf/distro/poky.conf