summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/inetutils
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/inetutils
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/inetutils')
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_2.0.bb106
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
50EXTRA_OECONF_append = " --disable-rsh --disable-rshd --disable-rcp \ 50EXTRA_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
53do_configure_prepend () { 53do_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
61do_install_append () { 61do_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"
114NOAUTOPACKAGEDEBUG = "1" 114NOAUTOPACKAGEDEBUG = "1"
115 115
116ALTERNATIVE_PRIORITY = "79" 116ALTERNATIVE_PRIORITY = "79"
117ALTERNATIVE_${PN} = "whois dnsdomainname" 117ALTERNATIVE:${PN} = "whois dnsdomainname"
118ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" 118ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd"
119ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname" 119ALTERNATIVE_LINK_NAME[dnsdomainname] = "${base_bindir}/dnsdomainname"
120 120
121ALTERNATIVE_PRIORITY_${PN}-logger = "60" 121ALTERNATIVE_PRIORITY_${PN}-logger = "60"
122ALTERNATIVE_${PN}-logger = "logger" 122ALTERNATIVE:${PN}-logger = "logger"
123ALTERNATIVE_${PN}-syslogd = "syslogd" 123ALTERNATIVE:${PN}-syslogd = "syslogd"
124ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" 124ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd"
125 125
126ALTERNATIVE_${PN}-ftp = "ftp" 126ALTERNATIVE:${PN}-ftp = "ftp"
127ALTERNATIVE_${PN}-ftpd = "ftpd" 127ALTERNATIVE:${PN}-ftpd = "ftpd"
128ALTERNATIVE_${PN}-tftp = "tftp" 128ALTERNATIVE:${PN}-tftp = "tftp"
129ALTERNATIVE_${PN}-tftpd = "tftpd" 129ALTERNATIVE:${PN}-tftpd = "tftpd"
130ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd" 130ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd"
131ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd" 131ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd"
132 132
133ALTERNATIVE_${PN}-telnet = "telnet" 133ALTERNATIVE:${PN}-telnet = "telnet"
134ALTERNATIVE_${PN}-telnetd = "telnetd" 134ALTERNATIVE:${PN}-telnetd = "telnetd"
135ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" 135ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd"
136ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" 136ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd"
137 137
138ALTERNATIVE_${PN}-inetd= "inetd" 138ALTERNATIVE:${PN}-inetd= "inetd"
139ALTERNATIVE_${PN}-traceroute = "traceroute" 139ALTERNATIVE:${PN}-traceroute = "traceroute"
140 140
141ALTERNATIVE_${PN}-hostname = "hostname" 141ALTERNATIVE:${PN}-hostname = "hostname"
142ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" 142ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname"
143 143
144ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \ 144ALTERNATIVE:${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \
145 tftpd.8 tftp.1 telnetd.8" 145 tftpd.8 tftp.1 telnetd.8"
146ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" 146ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
147ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" 147ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
@@ -151,62 +151,62 @@ ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8"
151ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" 151ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8"
152ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" 152ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1"
153 153
154ALTERNATIVE_${PN}-ifconfig = "ifconfig" 154ALTERNATIVE:${PN}-ifconfig = "ifconfig"
155ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" 155ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig"
156 156
157ALTERNATIVE_${PN}-ping = "ping" 157ALTERNATIVE:${PN}-ping = "ping"
158ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" 158ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
159 159
160ALTERNATIVE_${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" 160ALTERNATIVE:${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}"
161ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" 161ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
162 162
163 163
164FILES_${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug" 164FILES:${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug"
165FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" 165FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
166FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" 166FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}"
167FILES_${PN}-hostname = "${base_bindir}/hostname.${BPN}" 167FILES:${PN}-hostname = "${base_bindir}/hostname.${BPN}"
168FILES_${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" 168FILES:${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}"
169FILES_${PN}-traceroute = "${bindir}/traceroute.${BPN}" 169FILES:${PN}-traceroute = "${bindir}/traceroute.${BPN}"
170FILES_${PN}-logger = "${bindir}/logger.${BPN}" 170FILES:${PN}-logger = "${bindir}/logger.${BPN}"
171 171
172FILES_${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" 172FILES:${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}"
173RCONFLICTS_${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" 173RCONFLICTS:${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng"
174 174
175FILES_${PN}-ftp = "${bindir}/ftp.${BPN}" 175FILES:${PN}-ftp = "${bindir}/ftp.${BPN}"
176 176
177FILES_${PN}-tftp = "${bindir}/tftp.${BPN}" 177FILES:${PN}-tftp = "${bindir}/tftp.${BPN}"
178FILES_${PN}-telnet = "${bindir}/telnet.${BPN}" 178FILES:${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.
184FILES_${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp" 184FILES:${PN}-rsh = "${bindir}/rsh ${bindir}/rlogin ${bindir}/rexec ${bindir}/rcp"
185RCONFLICTS_${PN}-rsh += "netkit-rsh-client" 185RCONFLICTS:${PN}-rsh += "netkit-rsh-client"
186RPROVIDES_${PN}-rsh = "rsh" 186RPROVIDES:${PN}-rsh = "rsh"
187 187
188FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ 188FILES:${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"
190FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" 190FILES:${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd"
191RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers" 191RDEPENDS:${PN}-rshd += "xinetd tcp-wrappers"
192RCONFLICTS_${PN}-rshd += "netkit-rshd-server" 192RCONFLICTS:${PN}-rshd += "netkit-rshd-server"
193RPROVIDES_${PN}-rshd = "rshd" 193RPROVIDES:${PN}-rshd = "rshd"
194 194
195FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}" 195FILES:${PN}-ftpd = "${bindir}/ftpd.${BPN}"
196FILES_${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" 196FILES:${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}"
197RDEPENDS_${PN}-ftpd += "xinetd" 197RDEPENDS:${PN}-ftpd += "xinetd"
198 198
199FILES_${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" 199FILES:${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd"
200FILES_${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" 200FILES:${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd"
201RCONFLICTS_${PN}-tftpd += "netkit-tftpd" 201RCONFLICTS:${PN}-tftpd += "netkit-tftpd"
202RDEPENDS_${PN}-tftpd += "xinetd" 202RDEPENDS:${PN}-tftpd += "xinetd"
203 203
204FILES_${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet" 204FILES:${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet"
205FILES_${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd" 205FILES:${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd"
206RCONFLICTS_${PN}-telnetd += "netkit-telnet" 206RCONFLICTS:${PN}-telnetd += "netkit-telnet"
207RPROVIDES_${PN}-telnetd = "telnetd" 207RPROVIDES:${PN}-telnetd = "telnetd"
208RDEPENDS_${PN}-telnetd += "xinetd" 208RDEPENDS:${PN}-telnetd += "xinetd"
209 209
210FILES_${PN}-inetd = "${bindir}/inetd.${BPN}" 210FILES:${PN}-inetd = "${bindir}/inetd.${BPN}"
211 211
212RDEPENDS_${PN} = "xinetd" 212RDEPENDS:${PN} = "xinetd"