diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2022-02-23 23:35:25 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-02-24 08:35:24 -0800 |
commit | 2509f659e45d04abf295b50afe001c72f87113b6 (patch) | |
tree | 102c2665745fc3febe395e7f0b14d6fbb1f3c368 | |
parent | 750de61d44407f0358ffae1392d0903dcd566b6e (diff) | |
download | meta-openembedded-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>
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 a9c96a53d..44b367112 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" | |||
23 | GIR_MESON_OPTION = "" | 23 | GIR_MESON_OPTION = "" |
24 | 24 | ||
25 | PACKAGECONFIG ??= " \ | 25 | PACKAGECONFIG ??= " \ |
26 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg", "", d)} \ | 26 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "", d)} \ |
27 | gexiv2 \ | 27 | gexiv2 \ |
28 | gstreamer \ | 28 | gstreamer \ |
29 | icu \ | 29 | 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 3c6f3e41c..5596760d5 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" | |||
26 | 26 | ||
27 | 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)}" | 27 | 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)}" |
28 | 28 | ||
29 | PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "aac", "", d)} \ | 29 | PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ |
30 | alsa ao bzip2 daemon \ | 30 | alsa ao bzip2 daemon \ |
31 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg aac", "", d)} \ | 31 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \ |
32 | fifo flac fluidsynth iso9660 \ | 32 | fifo flac fluidsynth iso9660 \ |
33 | jack libsamplerate httpd \ | 33 | jack libsamplerate httpd \ |
34 | mms mpg123 modplug sndfile \ | 34 | 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 cfe96bf02..62ca27316 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 = "\ | |||
31 | dleyna-renderer \ | 31 | dleyna-renderer \ |
32 | dleyna-server \ | 32 | dleyna-server \ |
33 | dvb-apps \ | 33 | dvb-apps \ |
34 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac fdk-aac mpd", "", d)} \ | 34 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac fdk-aac mpd", "", d)} \ |
35 | gerbera \ | 35 | gerbera \ |
36 | libao \ | 36 | libao \ |
37 | libavc1394 \ | 37 | libavc1394 \ |
@@ -45,7 +45,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ | |||
45 | mpc \ | 45 | mpc \ |
46 | ncmpc \ | 46 | ncmpc \ |
47 | libmpd \ | 47 | libmpd \ |
48 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \ | 48 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \ |
49 | gst-shark \ | 49 | gst-shark \ |
50 | gstd \ | 50 | gstd \ |
51 | rtmpdump \ | 51 | rtmpdump \ |
@@ -57,24 +57,24 @@ RDEPENDS:packagegroup-meta-multimedia = "\ | |||
57 | pipewire \ | 57 | pipewire \ |
58 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \ | 58 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \ |
59 | libcamera \ | 59 | libcamera \ |
60 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libde265 openh264", "", d)} \ | 60 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ |
61 | vorbis-tools \ | 61 | vorbis-tools \ |
62 | libdvbcsa \ | 62 | libdvbcsa \ |
63 | libopenmpt \ | 63 | libopenmpt \ |
64 | libuvc \ | 64 | libuvc \ |
65 | mimic \ | 65 | mimic \ |
66 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna", "", d)} \ | 66 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "minidlna", "", d)} \ |
67 | mycroft \ | 67 | mycroft \ |
68 | openal-soft \ | 68 | openal-soft \ |
69 | opusfile \ | 69 | opusfile \ |
70 | opus-tools \ | 70 | opus-tools \ |
71 | libdvdcss \ | 71 | libdvdcss \ |
72 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ | 72 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ |
73 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "sox streamripper", "", d)} \ | 73 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ |
74 | tinyalsa \ | 74 | tinyalsa \ |
75 | tremor \ | 75 | tremor \ |
76 | webrtc-audio-processing \ | 76 | webrtc-audio-processing \ |
77 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ | 77 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ |
78 | " | 78 | " |
79 | RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer" | 79 | RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer" |
80 | RDEPENDS:packagegroup-meta-multimedia:remove:powerpc64le = "openh264" | 80 | 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 2d6e913d8..544b6138f 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 | |||
36 | 36 | ||
37 | inherit autotools pkgconfig | 37 | inherit autotools pkgconfig |
38 | 38 | ||
39 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" | 39 | 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 384637281..fde7b0433 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 += "\ | |||
129 | 129 | ||
130 | INSANE_SKIP:${PN} = "dev-so" | 130 | INSANE_SKIP:${PN} = "dev-so" |
131 | 131 | ||
132 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" | 132 | 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 19ab1fa1a..892ecc774 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 = "\ | |||
211 | netcat \ | 211 | netcat \ |
212 | netcat-openbsd \ | 212 | netcat-openbsd \ |
213 | libtdb \ | 213 | libtdb \ |
214 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \ | 214 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "non-commercial", "netperf", "", d)} \ |
215 | yp-tools \ | 215 | yp-tools \ |
216 | ypbind-mt \ | 216 | ypbind-mt \ |
217 | yp-tools \ | 217 | 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 f37d4c630..d7076c211 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 | |||
657 | 657 | ||
658 | RDEPENDS:packagegroup-meta-oe-multimedia ="\ | 658 | RDEPENDS:packagegroup-meta-oe-multimedia ="\ |
659 | alsa-oss \ | 659 | alsa-oss \ |
660 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faad2", "", d)} \ | 660 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \ |
661 | dirsplit \ | 661 | dirsplit \ |
662 | genisoimage \ | 662 | genisoimage \ |
663 | icedax \ | 663 | icedax \ |
@@ -671,7 +671,7 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ | |||
671 | libburn \ | 671 | libburn \ |
672 | libcdio-paranoia \ | 672 | libcdio-paranoia \ |
673 | libcdio \ | 673 | libcdio \ |
674 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad", "", d)} \ | 674 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \ |
675 | libmms \ | 675 | libmms \ |
676 | libdvdread \ | 676 | libdvdread \ |
677 | libopus \ | 677 | libopus \ |
@@ -685,7 +685,7 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ | |||
685 | wavpack \ | 685 | wavpack \ |
686 | libvpx \ | 686 | libvpx \ |
687 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \ | 687 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \ |
688 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "mpv", "", d)} \ | 688 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \ |
689 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \ | 689 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \ |
690 | libopusenc \ | 690 | libopusenc \ |
691 | " | 691 | " |
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 17d4b6ba0..57e58b1ba 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} += " \ | |||
112 | ${datadir}/zsh \ | 112 | ${datadir}/zsh \ |
113 | ${datadir}/bash-completion \ | 113 | ${datadir}/bash-completion \ |
114 | " | 114 | " |
115 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" | 115 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" |