diff options
| author |   Martin Kelly <mkelly@xevo.com> | 2018-02-12 12:52:47 -0800 |
|---|---|---|
| committer | Martin Kelly <mkelly@xevo.com> | 2018-02-12 12:53:57 -0800 |
| commit | b3b44966ba43510da5da91175412c89d68ad8f83 (patch) | |
| tree | 5078977cca751750aab2922c97de776294611977 | |
| parent | 88a162a657936f14e8e1ac5d6a0c3b368d0e9a45 (diff) | |
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>
| -rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 9 | ||||
| -rw-r--r-- | meta-agl/conf/include/agl-gplv2.inc | 8 | ||||
| -rw-r--r-- | templates/feature/agl-gplv2/50_bblayers.conf.inc | 1 | ||||
| -rw-r--r-- | templates/feature/agl-gplv2/50_local.conf.inc | 2 |
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 d7a12e301..078951703 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.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 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 |