diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 47a68a59a..45d7bf452 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -75,6 +75,10 @@ do_configure() { # we pre-generate desired options and copy to source directory instead cp ${WORKDIR}/net-tools-config.h ${S}/config.h cp ${WORKDIR}/net-tools-config.make ${S}/config.make + + if [ "${USE_NLS}" = "no" ]; then + sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make + fi } do_compile() { @@ -93,6 +97,17 @@ do_install() { unset CFLAGS unset LDFLAGS oe_runmake 'BASEDIR=${D}' install + + if [ "${base_bindir}" != "/bin" ]; then + mkdir -p ${D}/${base_bindir} + mv ${D}/bin/* ${D}/${base_bindir}/ + rmdir ${D}/bin + fi + if [ "${base_sbindir}" != "/sbin" ]; then + mkdir ${D}/${base_sbindir} + mv ${D}/sbin/* ${D}/${base_sbindir}/ + rmdir ${D}/sbin + fi } inherit update-alternatives @@ -101,15 +116,17 @@ base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig r base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname" ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" -ALTERNATIVE_${PN}-doc += "hostname.1" +ALTERNATIVE_${PN}-doc += "hostname.1 dnsdomainname.1" ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" +ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" ALTERNATIVE_PRIORITY[hostname.1] = "10" python __anonymous() { - for prog in d.getVar('base_sbindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) - for prog in d.getVar('base_bindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) } ALTERNATIVE_PRIORITY = "100" +BBCLASSEXTEND = "native nativesdk" |