diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-01-26 12:13:21 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-27 14:49:50 +0000 |
commit | 083d70c03bacdadf32a3bec5535154b028dee022 (patch) | |
tree | 9e98a5aa1a0dab1f78e8a3ee36748e169e699f6d /recipes | |
parent | 3564db1585c88b43c3a1756e0e33b872289b0247 (diff) | |
download | meta-boot2qt-083d70c03bacdadf32a3bec5535154b028dee022.tar.gz |
Replace @base_contains macros with @bb.utils.contains
Deprecated @base_contains macros print warnings.
Replace deprecated macro with @bb.utils.contains
everywhere (.bb, .append, .conf and .inc files)
Change-Id: I400f8b355150e0f283165fbf43fb620f948892fa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes')
5 files changed, 6 insertions, 6 deletions
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend index dde2927..64d750c 100644 --- a/recipes/dbus/dbus_%.bbappend +++ b/recipes/dbus/dbus_%.bbappend | |||
@@ -52,12 +52,12 @@ FILES_${PN}-session-init = " \ | |||
52 | do_install_append_class-target() { | 52 | do_install_append_class-target() { |
53 | sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh | 53 | sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh |
54 | 54 | ||
55 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 55 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
56 | install -d ${D}${sysconfdir}/init.d | 56 | install -d ${D}${sysconfdir}/init.d |
57 | install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session | 57 | install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session |
58 | fi | 58 | fi |
59 | 59 | ||
60 | if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 60 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
61 | install -m 0755 -d ${D}${bindir}/ | 61 | install -m 0755 -d ${D}${bindir}/ |
62 | install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/ | 62 | install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/ |
63 | 63 | ||
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index 5de3852..6a4323d 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb | |||
@@ -57,7 +57,7 @@ DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd" | |||
57 | RDEPENDS_${PN} += "bash" | 57 | RDEPENDS_${PN} += "bash" |
58 | RRECOMMENDS_${PN} += "gnupg" | 58 | RRECOMMENDS_${PN} += "gnupg" |
59 | 59 | ||
60 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 60 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
61 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,," | 61 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,," |
62 | 62 | ||
63 | SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" | 63 | SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" |
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 5e3234f..cc25bd4 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | |||
@@ -50,7 +50,7 @@ RDEPENDS_${PN}_append_linux = "\ | |||
50 | nativesdk-python-modules \ | 50 | nativesdk-python-modules \ |
51 | nativesdk-python-misc \ | 51 | nativesdk-python-misc \ |
52 | nativesdk-perl-modules \ | 52 | nativesdk-perl-modules \ |
53 | ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \ | 53 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \ |
54 | " | 54 | " |
55 | 55 | ||
56 | RDEPENDS_${PN}_append_mingw32 = "\ | 56 | RDEPENDS_${PN}_append_mingw32 = "\ |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 0309991..066ba29 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | |||
@@ -51,6 +51,6 @@ RDEPENDS_${PN} = "\ | |||
51 | tzdata-asia \ | 51 | tzdata-asia \ |
52 | tzdata-europe \ | 52 | tzdata-europe \ |
53 | connman \ | 53 | connman \ |
54 | ${@base_contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \ | 54 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \ |
55 | ${MACHINE_EXTRA_INSTALL} \ | 55 | ${MACHINE_EXTRA_INSTALL} \ |
56 | " | 56 | " |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index 82f67b0..3fb32cb 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | |||
@@ -48,5 +48,5 @@ RDEPENDS_${PN} = "\ | |||
48 | perf \ | 48 | perf \ |
49 | rsync \ | 49 | rsync \ |
50 | tslib-calibrate \ | 50 | tslib-calibrate \ |
51 | ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ | 51 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ |
52 | " | 52 | " |