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/inetutils | |
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/inetutils')
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils_2.0.bb | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.0.bb b/meta/recipes-connectivity/inetutils/inetutils_2.0.bb index a4d05b0542..4b25f9c0b5 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.0.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.0.bb | |||
@@ -47,10 +47,10 @@ EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ | |||
47 | " | 47 | " |
48 | 48 | ||
49 | # These are horrible for security, disable them | 49 | # These are horrible for security, disable them |
50 | EXTRA_OECONF_append = " --disable-rsh --disable-rshd --disable-rcp \ | 50 | EXTRA_OECONF:append = " --disable-rsh --disable-rshd --disable-rcp \ |
51 | --disable-rlogin --disable-rlogind --disable-rexec --disable-rexecd" | 51 | --disable-rlogin --disable-rlogind --disable-rexec --disable-rexecd" |
52 | 52 | ||
53 | do_configure_prepend () { | 53 | do_configure:prepend () { |
54 | export HELP2MAN='true' | 54 | export HELP2MAN='true' |
55 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath | 55 | cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath |
56 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} | 56 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} |
@@ -58,7 +58,7 @@ do_configure_prepend () { | |||
58 | rm -f ${S}/glob/configure* | 58 | rm -f ${S}/glob/configure* |
59 | } | 59 | } |
60 | 60 | ||
61 | do_install_append () { | 61 | do_install:append () { |
62 | install -m 0755 -d ${D}${base_sbindir} | 62 | install -m 0755 -d ${D}${base_sbindir} |
63 | install -m 0755 -d ${D}${sbindir} | 63 | install -m 0755 -d ${D}${sbindir} |
64 | install -m 0755 -d ${D}${sysconfdir}/xinetd.d | 64 | install -m 0755 -d ${D}${sysconfdir}/xinetd.d |
@@ -114,34 +114,34 @@ PACKAGES =+ "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg" | |||
114 | NOAUTOPACKAGEDEBUG = "1" | 114 | NOAUTOPACKAGEDEBUG = "1" |
115 | 115 | ||
116 | ALTERNATIVE_PRIORITY = "79" | 116 | ALTERNATIVE_PRIORITY = "79" |
117 | ALTERNATIVE_${PN} = "whois dnsdomainname" | 117 | ALTERNATIVE:${PN} = "whois dnsdomainname" |
118 | ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" | 118 | ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" |
119 | ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" | 119 | ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" |
120 | 120 | ||
121 | ALTERNATIVE_PRIORITY_${PN}-logger = "60" | 121 | ALTERNATIVE_PRIORITY_${PN}-logger = "60" |
122 | ALTERNATIVE_${PN}-logger = "logger" | 122 | ALTERNATIVE:${PN}-logger = "logger" |
123 | ALTERNATIVE_${PN}-syslogd = "syslogd" | 123 | ALTERNATIVE:${PN}-syslogd = "syslogd" |
124 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" | 124 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" |
125 | 125 | ||
126 | ALTERNATIVE_${PN}-ftp = "ftp" | 126 | ALTERNATIVE:${PN}-ftp = "ftp" |
127 | ALTERNATIVE_${PN}-ftpd = "ftpd" | 127 | ALTERNATIVE:${PN}-ftpd = "ftpd" |
128 | ALTERNATIVE_${PN}-tftp = "tftp" | 128 | ALTERNATIVE:${PN}-tftp = "tftp" |
129 | ALTERNATIVE_${PN}-tftpd = "tftpd" | 129 | ALTERNATIVE:${PN}-tftpd = "tftpd" |
130 | ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd" | 130 | ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd" |
131 | ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd" | 131 | ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd" |
132 | 132 | ||
133 | ALTERNATIVE_${PN}-telnet = "telnet" | 133 | ALTERNATIVE:${PN}-telnet = "telnet" |
134 | ALTERNATIVE_${PN}-telnetd = "telnetd" | 134 | ALTERNATIVE:${PN}-telnetd = "telnetd" |
135 | ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" | 135 | ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" |
136 | ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" | 136 | ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" |
137 | 137 | ||
138 | ALTERNATIVE_${PN}-inetd= "inetd" | 138 | ALTERNATIVE:${PN}-inetd= "inetd" |
139 | ALTERNATIVE_${PN}-traceroute = "traceroute" | 139 | ALTERNATIVE:${PN}-traceroute = "traceroute" |
140 | 140 | ||
141 | ALTERNATIVE_${PN}-hostname = "hostname" | 141 | ALTERNATIVE:${PN}-hostname = "hostname" |
142 | ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" | 142 | ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" |
143 | 143 | ||
144 | ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \ | 144 | ALTERNATIVE:${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \ |
145 | tftpd.8 tftp.1 telnetd.8" | 145 | tftpd.8 tftp.1 telnetd.8" |
146 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | 146 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" |
147 | ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" | 147 | ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" |
@@ -151,62 +151,62 @@ ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8" | |||
151 | ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" | 151 | ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" |
152 | ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" | 152 | ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" |
153 | 153 | ||
154 | ALTERNATIVE_${PN}-ifconfig = "ifconfig" | 154 | ALTERNATIVE:${PN}-ifconfig = "ifconfig" |
155 | ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" | 155 | ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" |
156 | 156 | ||
157 | ALTERNATIVE_${PN}-ping = "ping" | 157 | ALTERNATIVE:${PN}-ping = "ping" |
158 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 158 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
159 | 159 | ||
160 | ALTERNATIVE_${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" | 160 | ALTERNATIVE:${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" |
161 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" | 161 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" |
162 | 162 | ||
163 | 163 | ||
164 | FILES_${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug" | 164 | FILES:${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug" |
165 | FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" | 165 | FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" |
166 | FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" | 166 | FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}" |
167 | FILES_${PN}-hostname = "${base_bindir}/hostname.${BPN}" | 167 | FILES:${PN}-hostname = "${base_bindir}/hostname.${BPN}" |
168 | FILES_${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" | 168 | FILES:${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" |
169 | FILES_${PN}-traceroute = "${bindir}/traceroute.${BPN}" | 169 | FILES:${PN}-traceroute = "${bindir}/traceroute.${BPN}" |
170 | FILES_${PN}-logger = "${bindir}/logger.${BPN}" | 170 | FILES:${PN}-logger = "${bindir}/logger.${BPN}" |
171 | 171 | ||
172 | FILES_${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" | 172 | FILES:${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" |
173 | RCONFLICTS_${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" | 173 | RCONFLICTS:${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" |
174 | 174 | ||
175 | FILES_${PN}-ftp = "${bindir}/ftp.${BPN}" | 175 | FILES:${PN}-ftp = "${bindir}/ftp.${BPN}" |
176 | 176 | ||
177 | FILES_${PN}-tftp = "${bindir}/tftp.${BPN}" | 177 | FILES:${PN}-tftp = "${bindir}/tftp.${BPN}" |
178 | FILES_${PN}-telnet = "${bindir}/telnet.${BPN}" | 178 | FILES:${PN}-telnet = "${bindir}/telnet.${BPN}" |
179 | 179 | ||
180 | # We make us of RCONFLICTS / RPROVIDES here rather than using the normal | 180 | # We make us of RCONFLICTS / RPROVIDES here rather than using the normal |
181 | # alternatives method as this leads to packaging QA issues when using | 181 | # alternatives method as this leads to packaging QA issues when using |
182 | # musl as that library does not provide what these applications need to | 182 | # musl as that library does not provide what these applications need to |
183 | # build. | 183 | # build. |
184 | FILES_${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp" | 184 | FILES:${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp" |
185 | RCONFLICTS_${PN}-rsh += "netkit-rsh-client" | 185 | RCONFLICTS:${PN}-rsh += "netkit-rsh-client" |
186 | RPROVIDES_${PN}-rsh = "rsh" | 186 | RPROVIDES:${PN}-rsh = "rsh" |
187 | 187 | ||
188 | FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ | 188 | FILES:${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ |
189 | ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" | 189 | ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" |
190 | FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" | 190 | FILES:${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" |
191 | RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers" | 191 | RDEPENDS:${PN}-rshd += "xinetd tcp-wrappers" |
192 | RCONFLICTS_${PN}-rshd += "netkit-rshd-server" | 192 | RCONFLICTS:${PN}-rshd += "netkit-rshd-server" |
193 | RPROVIDES_${PN}-rshd = "rshd" | 193 | RPROVIDES:${PN}-rshd = "rshd" |
194 | 194 | ||
195 | FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}" | 195 | FILES:${PN}-ftpd = "${bindir}/ftpd.${BPN}" |
196 | FILES_${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" | 196 | FILES:${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" |
197 | RDEPENDS_${PN}-ftpd += "xinetd" | 197 | RDEPENDS:${PN}-ftpd += "xinetd" |
198 | 198 | ||
199 | FILES_${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" | 199 | FILES:${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" |
200 | FILES_${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" | 200 | FILES:${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" |
201 | RCONFLICTS_${PN}-tftpd += "netkit-tftpd" | 201 | RCONFLICTS:${PN}-tftpd += "netkit-tftpd" |
202 | RDEPENDS_${PN}-tftpd += "xinetd" | 202 | RDEPENDS:${PN}-tftpd += "xinetd" |
203 | 203 | ||
204 | FILES_${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet" | 204 | FILES:${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet" |
205 | FILES_${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd" | 205 | FILES:${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd" |
206 | RCONFLICTS_${PN}-telnetd += "netkit-telnet" | 206 | RCONFLICTS:${PN}-telnetd += "netkit-telnet" |
207 | RPROVIDES_${PN}-telnetd = "telnetd" | 207 | RPROVIDES:${PN}-telnetd = "telnetd" |
208 | RDEPENDS_${PN}-telnetd += "xinetd" | 208 | RDEPENDS:${PN}-telnetd += "xinetd" |
209 | 209 | ||
210 | FILES_${PN}-inetd = "${bindir}/inetd.${BPN}" | 210 | FILES:${PN}-inetd = "${bindir}/inetd.${BPN}" |
211 | 211 | ||
212 | RDEPENDS_${PN} = "xinetd" | 212 | RDEPENDS:${PN} = "xinetd" |