4 files changed, 11 insertions, 9 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index ad8a4bc70..8e8fd7ae1 100644
--- 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.12.%"
 # 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
index 000000000..fc9a4072b
--- /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
index 000000000..4c31c45c5
--- /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
index 000000000..8e0d5df74
--- /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