aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2022-02-23 23:35:25 +0100
committerKhem Raj <raj.khem@gmail.com>2022-02-24 08:35:24 -0800
commit2509f659e45d04abf295b50afe001c72f87113b6 (patch)
tree102c2665745fc3febe395e7f0b14d6fbb1f3c368
parent750de61d44407f0358ffae1392d0903dcd566b6e (diff)
downloadmeta-openembedded-contrib-2509f659e45d04abf295b50afe001c72f87113b6.tar.gz
All layers: Follow oe-core's variable name changes
Auto rename performed by oe-core's convert-variable-renames.py 0.1 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb14
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb2
-rw-r--r--meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb2
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb6
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb2
8 files changed, 17 insertions, 17 deletions
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb
index a9c96a53d7..44b3671122 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb
@@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
GIR_MESON_OPTION = ""
PACKAGECONFIG ??= " \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "", d)} \
gexiv2 \
gstreamer \
icu \
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb
index 3c6f3e41cd..5596760d56 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb
@@ -26,9 +26,9 @@ S = "${WORKDIR}/git"
EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}"
-PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "aac", "", d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \
alsa ao bzip2 daemon \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg aac", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \
fifo flac fluidsynth iso9660 \
jack libsamplerate httpd \
mms mpg123 modplug sndfile \
diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index cfe96bf024..62ca273160 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -31,7 +31,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
dleyna-renderer \
dleyna-server \
dvb-apps \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac fdk-aac mpd", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac fdk-aac mpd", "", d)} \
gerbera \
libao \
libavc1394 \
@@ -45,7 +45,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
mpc \
ncmpc \
libmpd \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \
gst-shark \
gstd \
rtmpdump \
@@ -57,24 +57,24 @@ RDEPENDS:packagegroup-meta-multimedia = "\
pipewire \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \
libcamera \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libde265 openh264", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \
vorbis-tools \
libdvbcsa \
libopenmpt \
libuvc \
mimic \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "minidlna", "", d)} \
mycroft \
openal-soft \
opusfile \
opus-tools \
libdvdcss \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "sox streamripper", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \
tinyalsa \
tremor \
webrtc-audio-processing \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \
"
RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer"
RDEPENDS:packagegroup-meta-multimedia:remove:powerpc64le = "openh264"
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
index 2d6e913d87..544b6138fc 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
@@ -36,4 +36,4 @@ SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3b
inherit autotools pkgconfig
-EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}"
+EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
index 384637281d..fde7b04335 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb
@@ -129,4 +129,4 @@ FILES:${PN}-staticdev += "\
INSANE_SKIP:${PN} = "dev-so"
-EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}"
+EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index 19ab1fa1a7..892ecc7746 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -211,7 +211,7 @@ RDEPENDS:packagegroup-meta-networking-support = "\
netcat \
netcat-openbsd \
libtdb \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "non-commercial", "netperf", "", d)} \
yp-tools \
ypbind-mt \
yp-tools \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index f37d4c6306..d7076c211a 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -657,7 +657,7 @@ RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofi
RDEPENDS:packagegroup-meta-oe-multimedia ="\
alsa-oss \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faad2", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
dirsplit \
genisoimage \
icedax \
@@ -671,7 +671,7 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\
libburn \
libcdio-paranoia \
libcdio \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \
libmms \
libdvdread \
libopus \
@@ -685,7 +685,7 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\
wavpack \
libvpx \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \
- ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "mpv", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
libopusenc \
"
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb
index 17d4b6ba07..57e58b1ba8 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb
@@ -112,4 +112,4 @@ FILES:${PN} += " \
${datadir}/zsh \
${datadir}/bash-completion \
"
-EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}"
+EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"