diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-02-22 11:04:27 -0500 |
|---|---|---|
| committer |   jenkins-dontreply@build.automotivelinux.org <collab-it+agl-jobbuilder@linuxfoundation.org> | 2022-04-13 13:31:22 +0000 |
| commit | 7b0b28ef03c2b3b9b0a3d566a6cb232cbbc1d33a (patch) | |
| tree | befe5f3e67bce08513012120b0e62a60442bdf74 /recipes-multimedia | |
| parent | 0861d0e5bb8099927e61529937944a1b7e3b34e0 (diff) | |
Update for kirkstone variable renames
Apply updates from running the new convert-variable-renames script
from upstream. There are a few things outside of BitBake variables
that the script still complains about that will need to be addressed
in follow up changes.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Icc6056cfdd9759470e99a51fe96d8d793e63a4ff
Diffstat (limited to 'recipes-multimedia')
| -rw-r--r-- | recipes-multimedia/musicpd/mpd_0.23.5.bb | 4 | ||||
| -rw-r--r-- | recipes-multimedia/musicpd/mpd_agldemo.inc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-multimedia/musicpd/mpd_0.23.5.bb b/recipes-multimedia/musicpd/mpd_0.23.5.bb index 3c6f3e41..5596760d 100644 --- a/recipes-multimedia/musicpd/mpd_0.23.5.bb +++ b/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/recipes-multimedia/musicpd/mpd_agldemo.inc b/recipes-multimedia/musicpd/mpd_agldemo.inc index 8bbd5919..c2e79f2d 100644 --- a/recipes-multimedia/musicpd/mpd_agldemo.inc +++ b/recipes-multimedia/musicpd/mpd_agldemo.inc @@ -12,7 +12,7 @@ SRC_URI += "file://0001-Tweaks-to-allow-building-with-older-meson.patch \ # build.{c_std,cpp_std} options even though they work, so we need to # flag them to be ignored in the unknown configure option QA test. # This can be removed after upgrading to Yocto Project 3.5. -UNKNOWN_CONFIGURE_WHITELIST = "build.c_std build.cpp_std" +UNKNOWN_CONFIGURE_OPT_IGNORE = "build.c_std build.cpp_std" # This also needs to be pushed upstream. PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" @@ -20,10 +20,10 @@ PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" # Prune the default configuration a bit to remove various streaming/server # options that are not required. PACKAGECONFIG = " \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "aac", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ bzip2 \ daemon \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg aac", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \ flac \ libsamplerate \ mpg123 \ |