diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/dbus | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus')
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib_0.112.bb | 16 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.12.20.bb | 8 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 8 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.20.bb | 40 |
4 files changed, 36 insertions, 36 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib_0.112.bb b/meta/recipes-core/dbus/dbus-glib_0.112.bb index 003c3accc3..a03b2addfd 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.112.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.112.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c31c73c1d8f5d06784b2ccd22e42d641 \ | |||
8 | SECTION = "base" | 8 | SECTION = "base" |
9 | 9 | ||
10 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" | 10 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" |
11 | DEPENDS_class-native = "glib-2.0-native dbus-native" | 11 | DEPENDS:class-native = "glib-2.0-native dbus-native" |
12 | 12 | ||
13 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ | 13 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ |
14 | file://no-examples.patch \ | 14 | file://no-examples.patch \ |
@@ -24,16 +24,16 @@ inherit autotools pkgconfig gettext bash-completion gtk-doc | |||
24 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
25 | PACKAGECONFIG[tests] = "--enable-tests,,," | 25 | PACKAGECONFIG[tests] = "--enable-tests,,," |
26 | 26 | ||
27 | EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" | 27 | EXTRA_OECONF:class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" |
28 | 28 | ||
29 | PACKAGES += "${PN}-tests" | 29 | PACKAGES += "${PN}-tests" |
30 | 30 | ||
31 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | 31 | FILES:${PN} = "${libdir}/lib*${SOLIBS}" |
32 | FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" | 32 | FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" |
33 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" | 33 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" |
34 | FILES_${PN}-dev += "${bindir}/dbus-binding-tool" | 34 | FILES:${PN}-dev += "${bindir}/dbus-binding-tool" |
35 | 35 | ||
36 | RDEPENDS_${PN}-tests += "dbus-x11" | 36 | RDEPENDS:${PN}-tests += "dbus-x11" |
37 | FILES_${PN}-tests = "${datadir}/${BPN}/tests" | 37 | FILES:${PN}-tests = "${datadir}/${BPN}/tests" |
38 | 38 | ||
39 | BBCLASSEXTEND = "native" | 39 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.20.bb b/meta/recipes-core/dbus/dbus-test_1.12.20.bb index 755c841bad..ae70301431 100644 --- a/meta/recipes-core/dbus/dbus-test_1.12.20.bb +++ b/meta/recipes-core/dbus/dbus-test_1.12.20.bb | |||
@@ -10,7 +10,7 @@ SRC_URI += "file://run-ptest \ | |||
10 | 10 | ||
11 | DEPENDS = "dbus glib-2.0" | 11 | DEPENDS = "dbus glib-2.0" |
12 | 12 | ||
13 | RDEPENDS_${PN}-dev = "" | 13 | RDEPENDS:${PN}-dev = "" |
14 | 14 | ||
15 | S="${WORKDIR}/dbus-${PV}" | 15 | S="${WORKDIR}/dbus-${PV}" |
16 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" | 16 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" |
@@ -58,7 +58,7 @@ do_install_ptest() { | |||
58 | sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest | 58 | sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest |
59 | } | 59 | } |
60 | 60 | ||
61 | RDEPENDS_${PN}-ptest += "bash make dbus" | 61 | RDEPENDS:${PN}-ptest += "bash make dbus" |
62 | RDEPENDS_${PN}-ptest_remove = "${PN}" | 62 | RDEPENDS:${PN}-ptest:remove = "${PN}" |
63 | 63 | ||
64 | PRIVATE_LIBS_${PN}-ptest = "libdbus-1.so.3" | 64 | PRIVATE_LIBS:${PN}-ptest = "libdbus-1.so.3" |
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index dcbcc0a9d6..b237476493 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -19,14 +19,14 @@ EXTRA_OECONF = "--disable-xml-docs \ | |||
19 | --enable-largefile \ | 19 | --enable-largefile \ |
20 | --with-system-socket=/run/dbus/system_bus_socket \ | 20 | --with-system-socket=/run/dbus/system_bus_socket \ |
21 | " | 21 | " |
22 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" | 22 | EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" |
23 | EXTRA_OECONF_append_class-native = " --disable-selinux" | 23 | EXTRA_OECONF:append:class-native = " --disable-selinux" |
24 | 24 | ||
25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | 25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
26 | user-session \ | 26 | user-session \ |
27 | " | 27 | " |
28 | PACKAGECONFIG_class-native = "" | 28 | PACKAGECONFIG:class-native = "" |
29 | PACKAGECONFIG_class-nativesdk = "" | 29 | PACKAGECONFIG:class-nativesdk = "" |
30 | 30 | ||
31 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" | 31 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" |
32 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" | 32 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" |
diff --git a/meta/recipes-core/dbus/dbus_1.12.20.bb b/meta/recipes-core/dbus/dbus_1.12.20.bb index 2f6da67510..48947209d9 100644 --- a/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/meta/recipes-core/dbus/dbus_1.12.20.bb | |||
@@ -7,10 +7,10 @@ require dbus.inc | |||
7 | 7 | ||
8 | DEPENDS = "expat virtual/libintl autoconf-archive" | 8 | DEPENDS = "expat virtual/libintl autoconf-archive" |
9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | 9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" |
10 | ALLOW_EMPTY_dbus-ptest = "1" | 10 | ALLOW_EMPTY:dbus-ptest = "1" |
11 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" | 11 | RDEPENDS:dbus-ptest:class-target = "dbus-test-ptest" |
12 | RDEPENDS_${PN} += "${PN}-common ${PN}-tools" | 12 | RDEPENDS:${PN} += "${PN}-common ${PN}-tools" |
13 | RDEPENDS_${PN}_class-native = "" | 13 | RDEPENDS:${PN}:class-native = "" |
14 | 14 | ||
15 | inherit useradd update-rc.d | 15 | inherit useradd update-rc.d |
16 | 16 | ||
@@ -25,22 +25,22 @@ python __anonymous() { | |||
25 | PACKAGES =+ "${PN}-lib ${PN}-common ${PN}-tools" | 25 | PACKAGES =+ "${PN}-lib ${PN}-common ${PN}-tools" |
26 | 26 | ||
27 | USERADD_PACKAGES = "dbus-common" | 27 | USERADD_PACKAGES = "dbus-common" |
28 | USERADD_PARAM_dbus-common = "--system --home ${localstatedir}/lib/dbus \ | 28 | USERADD_PARAM:dbus-common = "--system --home ${localstatedir}/lib/dbus \ |
29 | --no-create-home --shell /bin/false \ | 29 | --no-create-home --shell /bin/false \ |
30 | --user-group messagebus" | 30 | --user-group messagebus" |
31 | 31 | ||
32 | CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" | 32 | CONFFILES:${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" |
33 | 33 | ||
34 | DEBIANNAME_${PN} = "dbus-1" | 34 | DEBIANNAME:${PN} = "dbus-1" |
35 | 35 | ||
36 | OLDPKGNAME = "dbus-x11" | 36 | OLDPKGNAME = "dbus-x11" |
37 | OLDPKGNAME_class-nativesdk = "" | 37 | OLDPKGNAME:class-nativesdk = "" |
38 | 38 | ||
39 | # for compatibility | 39 | # for compatibility |
40 | RPROVIDES_${PN} = "${OLDPKGNAME}" | 40 | RPROVIDES:${PN} = "${OLDPKGNAME}" |
41 | RREPLACES_${PN} += "${OLDPKGNAME}" | 41 | RREPLACES:${PN} += "${OLDPKGNAME}" |
42 | 42 | ||
43 | FILES_${PN} = "${bindir}/dbus-daemon* \ | 43 | FILES:${PN} = "${bindir}/dbus-daemon* \ |
44 | ${bindir}/dbus-cleanup-sockets \ | 44 | ${bindir}/dbus-cleanup-sockets \ |
45 | ${bindir}/dbus-launch \ | 45 | ${bindir}/dbus-launch \ |
46 | ${bindir}/dbus-run-session \ | 46 | ${bindir}/dbus-run-session \ |
@@ -51,7 +51,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ | |||
51 | ${systemd_user_unitdir} \ | 51 | ${systemd_user_unitdir} \ |
52 | ${nonarch_libdir}/tmpfiles.d/dbus.conf \ | 52 | ${nonarch_libdir}/tmpfiles.d/dbus.conf \ |
53 | " | 53 | " |
54 | FILES_${PN}-common = "${sysconfdir}/dbus-1 \ | 54 | FILES:${PN}-common = "${sysconfdir}/dbus-1 \ |
55 | ${datadir}/dbus-1/services \ | 55 | ${datadir}/dbus-1/services \ |
56 | ${datadir}/dbus-1/system-services \ | 56 | ${datadir}/dbus-1/system-services \ |
57 | ${datadir}/dbus-1/session.d \ | 57 | ${datadir}/dbus-1/session.d \ |
@@ -64,17 +64,17 @@ FILES_${PN}-common = "${sysconfdir}/dbus-1 \ | |||
64 | ${systemd_user_unitdir}/sockets.target.wants \ | 64 | ${systemd_user_unitdir}/sockets.target.wants \ |
65 | ${nonarch_libdir}/sysusers.d/dbus.conf \ | 65 | ${nonarch_libdir}/sysusers.d/dbus.conf \ |
66 | " | 66 | " |
67 | FILES_${PN}-tools = "${bindir}/dbus-uuidgen \ | 67 | FILES:${PN}-tools = "${bindir}/dbus-uuidgen \ |
68 | ${bindir}/dbus-send \ | 68 | ${bindir}/dbus-send \ |
69 | ${bindir}/dbus-monitor \ | 69 | ${bindir}/dbus-monitor \ |
70 | ${bindir}/dbus-update-activation-environment \ | 70 | ${bindir}/dbus-update-activation-environment \ |
71 | " | 71 | " |
72 | FILES_${PN}-lib = "${libdir}/lib*.so.*" | 72 | FILES:${PN}-lib = "${libdir}/lib*.so.*" |
73 | RRECOMMENDS_${PN}-lib = "${PN}" | 73 | RRECOMMENDS:${PN}-lib = "${PN}" |
74 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" | 74 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" |
75 | 75 | ||
76 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" | 76 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" |
77 | pkg_postinst_dbus() { | 77 | pkg_postinst:dbus() { |
78 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script | 78 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script |
79 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then | 79 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then |
80 | if [ -n "$D" ]; then | 80 | if [ -n "$D" ]; then |
@@ -130,7 +130,7 @@ do_install() { | |||
130 | rm -rf ${D}${localstatedir}/run | 130 | rm -rf ${D}${localstatedir}/run |
131 | } | 131 | } |
132 | 132 | ||
133 | do_install_class-native() { | 133 | do_install:class-native() { |
134 | autotools_do_install | 134 | autotools_do_install |
135 | 135 | ||
136 | # dbus-launch has no X support so lets not install it in case the host | 136 | # dbus-launch has no X support so lets not install it in case the host |
@@ -138,7 +138,7 @@ do_install_class-native() { | |||
138 | rm -f ${D}${bindir}/dbus-launch | 138 | rm -f ${D}${bindir}/dbus-launch |
139 | } | 139 | } |
140 | 140 | ||
141 | do_install_class-nativesdk() { | 141 | do_install:class-nativesdk() { |
142 | autotools_do_install | 142 | autotools_do_install |
143 | 143 | ||
144 | # dbus-launch has no X support so lets not install it in case the host | 144 | # dbus-launch has no X support so lets not install it in case the host |
@@ -150,4 +150,4 @@ do_install_class-nativesdk() { | |||
150 | } | 150 | } |
151 | BBCLASSEXTEND = "native nativesdk" | 151 | BBCLASSEXTEND = "native nativesdk" |
152 | 152 | ||
153 | INSANE_SKIP_${PN}-ptest += "build-deps" | 153 | INSANE_SKIP:${PN}-ptest += "build-deps" |