summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-connectivity/avahi
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-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/avahi')
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.8.bb82
1 files changed, 41 insertions, 41 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 79ce669a3e..934044d5da 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -69,16 +69,16 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
69EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" 69EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
70EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 70EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
71 71
72do_configure_prepend() { 72do_configure:prepend() {
73 # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes 73 # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
74 rm "${S}/common/introspection.m4" || true 74 rm "${S}/common/introspection.m4" || true
75} 75}
76 76
77do_compile_prepend() { 77do_compile:prepend() {
78 export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs" 78 export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
79} 79}
80 80
81RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" 81RRECOMMENDS:${PN}:append:libc-glibc = " libnss-mdns"
82 82
83do_install() { 83do_install() {
84 autotools_do_install 84 autotools_do_install
@@ -95,41 +95,41 @@ do_install() {
95 95
96PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}" 96PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
97 97
98FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*" 98FILES:libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
99 99
100RPROVIDES_libavahi-compat-libdnssd = "libdns-sd" 100RPROVIDES:libavahi-compat-libdnssd = "libdns-sd"
101 101
102inherit update-rc.d systemd useradd 102inherit update-rc.d systemd useradd
103 103
104PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui" 104PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
105 105
106FILES_avahi-ui = "${libdir}/libavahi-ui*.so.*" 106FILES:avahi-ui = "${libdir}/libavahi-ui*.so.*"
107FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ 107FILES:avahi-discover = "${datadir}/applications/avahi-discover.desktop \
108 ${datadir}/avahi/interfaces/avahi-discover.ui \ 108 ${datadir}/avahi/interfaces/avahi-discover.ui \
109 ${bindir}/avahi-discover-standalone \ 109 ${bindir}/avahi-discover-standalone \
110 " 110 "
111 111
112LICENSE_libavahi-gobject = "LGPLv2.1+" 112LICENSE:libavahi-gobject = "LGPLv2.1+"
113LICENSE_avahi-daemon = "LGPLv2.1+" 113LICENSE:avahi-daemon = "LGPLv2.1+"
114LICENSE_libavahi-common = "LGPLv2.1+" 114LICENSE:libavahi-common = "LGPLv2.1+"
115LICENSE_libavahi-core = "LGPLv2.1+" 115LICENSE:libavahi-core = "LGPLv2.1+"
116LICENSE_libavahi-client = "LGPLv2.1+" 116LICENSE:libavahi-client = "LGPLv2.1+"
117LICENSE_avahi-dnsconfd = "LGPLv2.1+" 117LICENSE:avahi-dnsconfd = "LGPLv2.1+"
118LICENSE_libavahi-glib = "LGPLv2.1+" 118LICENSE:libavahi-glib = "LGPLv2.1+"
119LICENSE_avahi-autoipd = "LGPLv2.1+" 119LICENSE:avahi-autoipd = "LGPLv2.1+"
120LICENSE_avahi-utils = "LGPLv2.1+" 120LICENSE:avahi-utils = "LGPLv2.1+"
121 121
122# As avahi doesn't put any files into PN, clear the files list to avoid problems 122# As avahi doesn't put any files into PN, clear the files list to avoid problems
123# if extra libraries appear. 123# if extra libraries appear.
124FILES_${PN} = "" 124FILES:${PN} = ""
125FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ 125FILES:avahi-autoipd = "${sbindir}/avahi-autoipd \
126 ${sysconfdir}/avahi/avahi-autoipd.action \ 126 ${sysconfdir}/avahi/avahi-autoipd.action \
127 ${sysconfdir}/dhcp/*/avahi-autoipd \ 127 ${sysconfdir}/dhcp/*/avahi-autoipd \
128 ${sysconfdir}/udhcpc.d/00avahi-autoipd \ 128 ${sysconfdir}/udhcpc.d/00avahi-autoipd \
129 ${sysconfdir}/udhcpc.d/99avahi-autoipd" 129 ${sysconfdir}/udhcpc.d/99avahi-autoipd"
130FILES_libavahi-common = "${libdir}/libavahi-common.so.*" 130FILES:libavahi-common = "${libdir}/libavahi-common.so.*"
131FILES_libavahi-core = "${libdir}/libavahi-core.so.* ${libdir}/girepository-1.0/AvahiCore*.typelib" 131FILES:libavahi-core = "${libdir}/libavahi-core.so.* ${libdir}/girepository-1.0/AvahiCore*.typelib"
132FILES_avahi-daemon = "${sbindir}/avahi-daemon \ 132FILES:avahi-daemon = "${sbindir}/avahi-daemon \
133 ${sysconfdir}/avahi/avahi-daemon.conf \ 133 ${sysconfdir}/avahi/avahi-daemon.conf \
134 ${sysconfdir}/avahi/hosts \ 134 ${sysconfdir}/avahi/hosts \
135 ${sysconfdir}/avahi/services \ 135 ${sysconfdir}/avahi/services \
@@ -139,44 +139,44 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
139 ${datadir}/avahi/avahi-service.dtd \ 139 ${datadir}/avahi/avahi-service.dtd \
140 ${datadir}/avahi/service-types \ 140 ${datadir}/avahi/service-types \
141 ${datadir}/dbus-1/system-services" 141 ${datadir}/dbus-1/system-services"
142FILES_libavahi-client = "${libdir}/libavahi-client.so.*" 142FILES:libavahi-client = "${libdir}/libavahi-client.so.*"
143FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ 143FILES:avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
144 ${sysconfdir}/avahi/avahi-dnsconfd.action \ 144 ${sysconfdir}/avahi/avahi-dnsconfd.action \
145 ${sysconfdir}/init.d/avahi-dnsconfd" 145 ${sysconfdir}/init.d/avahi-dnsconfd"
146FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" 146FILES:libavahi-glib = "${libdir}/libavahi-glib.so.*"
147FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib" 147FILES:libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib"
148FILES_avahi-utils = "${bindir}/avahi-* ${bindir}/b* ${datadir}/applications/b*" 148FILES:avahi-utils = "${bindir}/avahi-* ${bindir}/b* ${datadir}/applications/b*"
149 149
150RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})" 150RDEPENDS:${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})"
151RDEPENDS_${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}" 151RDEPENDS:${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
152RDEPENDS_${PN}-dnsconfd = "${PN}-daemon" 152RDEPENDS:${PN}-dnsconfd = "${PN}-daemon"
153 153
154RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" 154RRECOMMENDS:avahi-daemon:append:libc-glibc = " libnss-mdns"
155 155
156CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" 156CONFFILES:avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
157 157
158USERADD_PACKAGES = "avahi-daemon avahi-autoipd" 158USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
159USERADD_PARAM_avahi-daemon = "--system --home /run/avahi-daemon \ 159USERADD_PARAM:avahi-daemon = "--system --home /run/avahi-daemon \
160 --no-create-home --shell /bin/false \ 160 --no-create-home --shell /bin/false \
161 --user-group avahi" 161 --user-group avahi"
162 162
163USERADD_PARAM_avahi-autoipd = "--system --home /run/avahi-autoipd \ 163USERADD_PARAM:avahi-autoipd = "--system --home /run/avahi-autoipd \
164 --no-create-home --shell /bin/false \ 164 --no-create-home --shell /bin/false \
165 --user-group \ 165 --user-group \
166 -c \"Avahi autoip daemon\" \ 166 -c \"Avahi autoip daemon\" \
167 avahi-autoipd" 167 avahi-autoipd"
168 168
169INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" 169INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
170INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" 170INITSCRIPT_NAME:avahi-daemon = "avahi-daemon"
171INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" 171INITSCRIPT_PARAMS:avahi-daemon = "defaults 21 19"
172INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" 172INITSCRIPT_NAME:avahi-dnsconfd = "avahi-dnsconfd"
173INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" 173INITSCRIPT_PARAMS:avahi-dnsconfd = "defaults 22 19"
174 174
175SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd" 175SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
176SYSTEMD_SERVICE_${PN}-daemon = "avahi-daemon.service" 176SYSTEMD_SERVICE:${PN}-daemon = "avahi-daemon.service"
177SYSTEMD_SERVICE_${PN}-dnsconfd = "avahi-dnsconfd.service" 177SYSTEMD_SERVICE:${PN}-dnsconfd = "avahi-dnsconfd.service"
178 178
179do_install_append() { 179do_install:append() {
180 install -d ${D}${sysconfdir}/udhcpc.d 180 install -d ${D}${sysconfdir}/udhcpc.d
181 install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d 181 install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d
182 install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d 182 install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
@@ -184,7 +184,7 @@ do_install_append() {
184 184
185# At the time the postinst runs, dbus might not be setup so only restart if running 185# At the time the postinst runs, dbus might not be setup so only restart if running
186# Don't exit early, because update-rc.d needs to run subsequently. 186# Don't exit early, because update-rc.d needs to run subsequently.
187pkg_postinst_avahi-daemon () { 187pkg_postinst:avahi-daemon () {
188if [ -z "$D" ]; then 188if [ -z "$D" ]; then
189 killall -q -HUP dbus-daemon || true 189 killall -q -HUP dbus-daemon || true
190fi 190fi