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-connectivity/bluez5/bluez5.inc | |
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-connectivity/bluez5/bluez5.inc')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index f2d9a4f937..68f3b586b8 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | |||
8 | file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" | 8 | file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" |
9 | DEPENDS = "dbus glib-2.0" | 9 | DEPENDS = "dbus glib-2.0" |
10 | PROVIDES += "bluez-hcidump" | 10 | PROVIDES += "bluez-hcidump" |
11 | RPROVIDES_${PN} += "bluez-hcidump" | 11 | RPROVIDES:${PN} += "bluez-hcidump" |
12 | 12 | ||
13 | RCONFLICTS_${PN} = "bluez4" | 13 | RCONFLICTS:${PN} = "bluez4" |
14 | 14 | ||
15 | PACKAGECONFIG ??= "obex-profiles \ | 15 | PACKAGECONFIG ??= "obex-profiles \ |
16 | readline \ | 16 | readline \ |
@@ -79,7 +79,7 @@ NOINST_TOOLS = " \ | |||
79 | ${@bb.utils.contains('PACKAGECONFIG', 'tools', '${NOINST_TOOLS_BT}', '', d)} \ | 79 | ${@bb.utils.contains('PACKAGECONFIG', 'tools', '${NOINST_TOOLS_BT}', '', d)} \ |
80 | " | 80 | " |
81 | 81 | ||
82 | do_install_append() { | 82 | do_install:append() { |
83 | install -d ${D}${INIT_D_DIR} | 83 | install -d ${D}${INIT_D_DIR} |
84 | install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth | 84 | install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth |
85 | 85 | ||
@@ -107,25 +107,25 @@ do_install_append() { | |||
107 | 107 | ||
108 | PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" | 108 | PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" |
109 | 109 | ||
110 | FILES_${PN} += " \ | 110 | FILES:${PN} += " \ |
111 | ${libdir}/bluetooth/plugins/*.so \ | 111 | ${libdir}/bluetooth/plugins/*.so \ |
112 | ${systemd_unitdir}/ ${datadir}/dbus-1 \ | 112 | ${systemd_unitdir}/ ${datadir}/dbus-1 \ |
113 | ${libdir}/cups \ | 113 | ${libdir}/cups \ |
114 | " | 114 | " |
115 | FILES_${PN}-dev += " \ | 115 | FILES:${PN}-dev += " \ |
116 | ${libdir}/bluetooth/plugins/*.la \ | 116 | ${libdir}/bluetooth/plugins/*.la \ |
117 | " | 117 | " |
118 | 118 | ||
119 | FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ | 119 | FILES:${PN}-obex = "${libexecdir}/bluetooth/obexd \ |
120 | ${exec_prefix}/lib/systemd/user/obex.service \ | 120 | ${exec_prefix}/lib/systemd/user/obex.service \ |
121 | ${systemd_system_unitdir}/obex.service \ | 121 | ${systemd_system_unitdir}/obex.service \ |
122 | ${sysconfdir}/systemd/system/multi-user.target.wants/obex.service \ | 122 | ${sysconfdir}/systemd/system/multi-user.target.wants/obex.service \ |
123 | ${datadir}/dbus-1/services/org.bluez.obex.service \ | 123 | ${datadir}/dbus-1/services/org.bluez.obex.service \ |
124 | ${sysconfdir}/dbus-1/system.d/obexd.conf \ | 124 | ${sysconfdir}/dbus-1/system.d/obexd.conf \ |
125 | " | 125 | " |
126 | SYSTEMD_SERVICE_${PN}-obex = "obex.service" | 126 | SYSTEMD_SERVICE:${PN}-obex = "obex.service" |
127 | 127 | ||
128 | FILES_${PN}-testtools = "${libdir}/bluez/test/*" | 128 | FILES:${PN}-testtools = "${libdir}/bluez/test/*" |
129 | 129 | ||
130 | def get_noinst_tools_paths (d, bb, tools): | 130 | def get_noinst_tools_paths (d, bb, tools): |
131 | s = list() | 131 | s = list() |
@@ -135,14 +135,14 @@ def get_noinst_tools_paths (d, bb, tools): | |||
135 | s.append("%s/%s" % (bindir, f)) | 135 | s.append("%s/%s" % (bindir, f)) |
136 | return "\n".join(s) | 136 | return "\n".join(s) |
137 | 137 | ||
138 | FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS'))}" | 138 | FILES:${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS'))}" |
139 | 139 | ||
140 | RDEPENDS_${PN}-testtools += "python3-core python3-dbus" | 140 | RDEPENDS:${PN}-testtools += "python3-core python3-dbus" |
141 | RDEPENDS_${PN}-testtools += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}" | 141 | RDEPENDS:${PN}-testtools += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}" |
142 | 142 | ||
143 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'bluetooth.service', '', d)}" | 143 | SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'bluetooth.service', '', d)}" |
144 | INITSCRIPT_PACKAGES = "${PN}" | 144 | INITSCRIPT_PACKAGES = "${PN}" |
145 | INITSCRIPT_NAME_${PN} = "bluetooth" | 145 | INITSCRIPT_NAME:${PN} = "bluetooth" |
146 | 146 | ||
147 | do_compile_ptest() { | 147 | do_compile_ptest() { |
148 | oe_runmake buildtests | 148 | oe_runmake buildtests |
@@ -153,4 +153,4 @@ do_install_ptest() { | |||
153 | rm -f ${D}${PTEST_PATH}/unit/*.o | 153 | rm -f ${D}${PTEST_PATH}/unit/*.o |
154 | } | 154 | } |
155 | 155 | ||
156 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-utf-16" | 156 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-utf-16" |