move GPLv2 logic into agl-gplv2 feature

Currently, we hardcode GPLv2/GPLv3 logic directly into the poky-agl
distro config, and in agl-demo. However, the recipes in meta-gplv2 are
very old, poorly supported, and receive no security updates. So, they
can easily cause issues.

To allow the choice of both GPLv2 and GPLv3, refactor the meta-gplv2
logic into its own "agl-gplv2" feature. The default is GPLv3, which
points to well-supported layers with security updates. However, by
adding the "agl-gplv2" feature in aglsetup.h, the meta-gplv2 layer gets
added to bblayers.conf and recipe versions get set to those in
meta-gplv2.

Change-Id: I62d7f2daa58b0690b5b27740257bd15097fcee5c
Signed-off-by: Martin Kelly <mkelly@xevo.com>

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index d7a12e3..0789517 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -80,15 +80,6 @@ PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.%"
 # Prefer libjpeg-turbo
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 
-# GPLv3 Compliance
-PREFERRED_VERSION_bash          = "3.2.%"
-PREFERRED_VERSION_gawk          = "3.1.%"
-PREFERRED_VERSION_gdbm          = "1.8.%"
-PREFERRED_VERSION_gnupg         = "1.4.7"
-PREFERRED_VERSION_gnutls        = "3.3.%"
-PREFERRED_VERSION_mc            = "4.7.5.%"
-PREFERRED_VERSION_readline      = "5.2"
-
 # using multiple BSP layers causes dangling bbappends in meta-agl-bsp
 # turn it into a warning
 #BB_DANGLINGAPPENDS_WARNONLY = "1"

diff --git a/meta-agl/conf/include/agl-gplv2.inc b/meta-agl/conf/include/agl-gplv2.inc
new file mode 100644 (file)
index 0000000..fc9a407
--- /dev/null
+++ b/meta-agl/conf/include/agl-gplv2.inc
@@ -0,0 +1,8 @@
+# GPLv3 Compliance
+PREFERRED_VERSION_bash          = "3.2.%"
+PREFERRED_VERSION_gawk          = "3.1.%"
+PREFERRED_VERSION_gdbm          = "1.8.%"
+PREFERRED_VERSION_gnupg         = "1.4.7"
+PREFERRED_VERSION_gnutls        = "3.3.%"
+PREFERRED_VERSION_mc            = "4.7.5.%"
+PREFERRED_VERSION_readline      = "5.2"

diff --git a/templates/feature/agl-gplv2/50_bblayers.conf.inc b/templates/feature/agl-gplv2/50_bblayers.conf.inc
new file mode 100644 (file)
index 0000000..4c31c45
--- /dev/null
+++ b/templates/feature/agl-gplv2/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-gplv2"

diff --git a/templates/feature/agl-gplv2/50_local.conf.inc b/templates/feature/agl-gplv2/50_local.conf.inc
new file mode 100644 (file)
index 0000000..8e0d5df
--- /dev/null
+++ b/templates/feature/agl-gplv2/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-gplv2.inc
+require conf/include/agl-gplv2.inc