From 6cab35d83bda92540ca7b24ef874d871542a37c2 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 5 Nov 2019 12:17:23 +0100 Subject: Declare layer compatibility with zeus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the uprev to YP 3.0 zeus we need to update the layer compatibility. Change-Id: Ib762915305588c39400c3c8343152b4ecbfa4556 Signed-off-by: Jan-Simon Möller --- meta-agl-distro/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-agl-distro') diff --git a/meta-agl-distro/conf/layer.conf b/meta-agl-distro/conf/layer.conf index 3c60fd4c7..7028ca3e2 100644 --- a/meta-agl-distro/conf/layer.conf +++ b/meta-agl-distro/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "agl-distro" BBFILE_PATTERN_agl-distro = "^${LAYERDIR}/" BBFILE_PRIORITY_agl-distro = "70" -LAYERSERIES_COMPAT_agl-distro = "thud" +LAYERSERIES_COMPAT_agl-distro = "zeus" -- cgit 1.2.3-korg From b18272900ec4ffff9968d7db998841de86abe2a5 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 22 Jan 2020 16:46:21 -0500 Subject: meta-agl-profile-graphical: upgrade to gstreamer 1.16 Rename gstreamer1.0-plugins-bad bbappend and update PREFERRED_VERSION definitions in distro configuration to handle upgrade to gstreamer 1.16 in oe-core. Bug-AGL: SPEC-2932 Change-Id: Ibc7362e6f45512fcda353a9479e2e437e1ee7f0c Signed-off-by: Scott Murray --- meta-agl-distro/conf/distro/poky-agl.conf | 14 +++++++------- .../gstreamer1.0-plugins-bad_1.14.%.bbappend | 2 -- .../gstreamer1.0-plugins-bad_1.16.%.bbappend | 2 ++ 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.14.%.bbappend create mode 100644 meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend (limited to 'meta-agl-distro') diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 65119a7aa..d9d703d22 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -95,13 +95,13 @@ DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio" # Prefer GStreamer 1.14.x by default -PREFERRED_VERSION_gstreamer1.0 ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-libav ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-omx ?= "1.14.%" +PREFERRED_VERSION_gstreamer1.0 ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-libav ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-omx ?= "1.16.%" # Prefer libjpeg-turbo PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" diff --git a/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.14.%.bbappend b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.14.%.bbappend deleted file mode 100644 index df13a042d..000000000 --- a/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.14.%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append="${@bb.utils.contains_any("MACHINE", "m3ulcb h3ulcb m3ulcb-nogfx", " "," file://0001-install-wayland.h.patch", d)}" diff --git a/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend new file mode 100644 index 000000000..df13a042d --- /dev/null +++ b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append="${@bb.utils.contains_any("MACHINE", "m3ulcb h3ulcb m3ulcb-nogfx", " "," file://0001-install-wayland.h.patch", d)}" -- cgit 1.2.3-korg From cfc505308ebd6ef5cb972ae8a28b8089b168f4d1 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 22 Jan 2020 20:18:04 -0500 Subject: meta-agl-distro: add polkit to DISTRO_FEATURES Add polkit to DISTRO_FEATURES in poky-agl.conf. This is now explicitly required since the OE warrior release to be able to build udisks2. Since the polkit packages were previously being pulled into images by udisks anyways, the effective difference seems to be polkit support being enabled in systemd. Bug-AGL: SPEC-2932 Change-Id: Id87a1c04f5da431f3099d26ef3b78b189ff35b9d Signed-off-by: Scott Murray --- meta-agl-distro/conf/distro/poky-agl.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-agl-distro') diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index d9d703d22..fb43da826 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -42,7 +42,7 @@ MAINTAINER = "AGL " TARGET_VENDOR = "-agl" # Override these in poky based distros -AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5 3g" +AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5 3g polkit" POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}" OVERRIDES .= ":${DISTRO_CODENAME}" -- cgit 1.2.3-korg From afbc3d65bcf82e1c127036434c23cd28aaec79a6 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 27 Jan 2020 13:47:02 -0500 Subject: meta-agl-distro: prefer linux-yocto 4.19 LTS kernel Set PREFERRED_VERSION_linux-yocto in poky-agl.conf to prefer the 4.19 LTS linux-yocto kernel instead of 5.2.x. This only will affect platforms such as qemux86-64 that use linux-yocto. Bug-AGL: SPEC-2932 Change-Id: I64b90f48e6e32b6a4539c8dd3d2c4b33992d5199 Signed-off-by: Scott Murray --- meta-agl-distro/conf/distro/poky-agl.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-agl-distro') diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index fb43da826..a382c84dc 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -94,6 +94,9 @@ DISTRO_FEATURES_APPEND = " " DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio" +# Prefer linux-yocto 4.19 LTS version by default +PREFERRED_VERSION_linux-yocto = "4.19%" + # Prefer GStreamer 1.14.x by default PREFERRED_VERSION_gstreamer1.0 ?= "1.16.%" PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.%" -- cgit 1.2.3-korg From bf92856329c2daf31bbbd831032ca57ba594e294 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 27 Jan 2020 14:00:45 -0500 Subject: meta-agl-distro: BBMASK problematic upstream meta-security bbappend Mask upstream meta-security bbappend that interferes with non-linux-yocto kernels due to the bug of having two wildcards, which bitbake does not support. The result is the bbappend applying to all linux-% recipes, breaking e.g. linux-raspberry compilation. Not having it is not an issue, since there is also explicit enabling of required security features done by meta-agl/meta-security. Bug-AGL: SPEC-2932 Change-Id: I60579cf539c0b134dda06af75f98a7960330b147 Signed-off-by: Scott Murray --- meta-agl-distro/conf/distro/poky-agl.conf | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta-agl-distro') diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index a382c84dc..81d2122ed 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -178,3 +178,9 @@ PREFERRED_RPROVIDER_virtual/navigation ?= "ondemandnavi" # Set preferred provider for low-can device mapping configuration PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping" + +# Mask upstream meta-security bbappend that interferes with non-linux-yocto +# kernels due to the bug of having two wildcards, which bitbake does not +# support. Not having it is not an issue, since there is also explicit +# enabling of required security features done by meta-agl/meta-security. +BBMASK += "meta-security/recipes-kernel/linux/linux-%_5.%.bbappend" -- cgit 1.2.3-korg From 8db438e38e573ac00da14197a905d86b43afea9b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 27 Jan 2020 14:10:56 -0500 Subject: meta-agl-distro: Add inc file for next branch over-rides Add poky-agl-next.inc file to hold temporary next branch over-rides, and include it in poky-agl.conf. For now it just over-rides the AGL_BRANCH value for agl-service-gps to use the next branch. This can be removed once the next branches containing zeus support are merged into master. Bug-AGL: SPEC-2932 Change-Id: Id73597c6f35010e4e5f9b54ac09728c7783b9e2f Signed-off-by: Scott Murray --- meta-agl-distro/conf/distro/poky-agl-next.inc | 1 + meta-agl-distro/conf/distro/poky-agl.conf | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 meta-agl-distro/conf/distro/poky-agl-next.inc (limited to 'meta-agl-distro') diff --git a/meta-agl-distro/conf/distro/poky-agl-next.inc b/meta-agl-distro/conf/distro/poky-agl-next.inc new file mode 100644 index 000000000..c5798aa55 --- /dev/null +++ b/meta-agl-distro/conf/distro/poky-agl-next.inc @@ -0,0 +1 @@ +AGL_BRANCH_pn-agl-service-gps = "next" diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 81d2122ed..8ea3ea23b 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -184,3 +184,6 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping" # support. Not having it is not an issue, since there is also explicit # enabling of required security features done by meta-agl/meta-security. BBMASK += "meta-security/recipes-kernel/linux/linux-%_5.%.bbappend" + +# Temporarily pull in some next branch specific over-rides +include poky-agl-next.inc -- cgit 1.2.3-korg