diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-02-20 23:45:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-02-20 23:45:45 +0000 |
| commit | f4b0c3bb834c202808022f2177c82de793b62b17 (patch) | |
| tree | 58c132595ec3772567dd83ea6bbde237a109d53f | |
| parent | 8003c66a23d0af6ddf7e61dac4d633f8a95320b3 (diff) | |
| parent | b3b44966ba43510da5da91175412c89d68ad8f83 (diff) | |
Merge "move GPLv2 logic into agl-gplv2 feature"
| -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 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 |