iproute2: install tools to mirror install under Debian/Ubuntu
PATCH 1/2 iproute2: install tools to mirror install under Debian/Ubuntu
Many scripts exist that expect the iproute2 tools to be found in the same directories where they are found in Debian or Ubuntu. For the iproute2 tools included in the iproute2 recipe, move them to those directories or create links there. Also, add bash-completion files as is done by Debian and Ubuntu.
--- .../iproute2/iproute2.inc | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
meta/recipes-connectivity/iproute2/iproute2.inc +19 -2
@@ -41,6 +41,21 @@ do_install () { install -d ${D}${datadir} mv ${D}/share/* ${D}${datadir}/ || true rm ${D}/share -rf || true + + install -d ${D}${base_bindir} + ln -s /sbin/ip ${D}${base_bindir}/ip + mv ${D}${base_sbindir}/ss ${D}${base_bindir}/ss + + install -d ${D}${bindir} + mv ${D}${base_sbindir}/nstat ${D}${bindir}/nstat + mv ${D}${base_sbindir}/lnstat ${D}${bindir}/lnstat + mv ${D}${base_sbindir}/ctstat ${D}${bindir}/ctstat + mv ${D}${base_sbindir}/rtstat ${D}${bindir}/rtstat + mv ${D}${base_sbindir}/routef ${D}${bindir}/routef + mv ${D}${base_sbindir}/routel ${D}${bindir}/routel + + install -d ${D}${sbindir} + mv ${D}${base_sbindir}/genl ${D}${sbindir}/genl } # The .so files in iproute2-tc are modules, not traditional libraries
@@ -59,7 +74,8 @@ PACKAGES =+ "\ " FILES_${PN}-tc = "${base_sbindir}/tc* \ - ${libdir}/tc/*.so" + ${libdir}/tc/*.so \ + ${datadir}/bash-completion/completions/tc" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ ${base_sbindir}/ctstat \ ${base_sbindir}/rtstat"
@@ -69,7 +85,8 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" -FILES_${PN}-devlink = "${base_sbindir}/devlink" +FILES_${PN}-devlink = "${base_sbindir}/devlink \ + ${datadir}/bash-completion/completions/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
Signature · 1 line
2.17.1
PATCH 2/2 iproute2: rearrange FILES to improve readability
Rearranged the PACKAGES' FILES to match PACKAGES to make the recipe more readable and easier to find the FILES.
--- meta/recipes-connectivity/iproute2/iproute2.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
meta/recipes-connectivity/iproute2/iproute2.inc +8 -8
@@ -73,20 +73,20 @@ PACKAGES =+ "\ ${PN}-tipc \ " -FILES_${PN}-tc = "${base_sbindir}/tc* \ - ${libdir}/tc/*.so \ - ${datadir}/bash-completion/completions/tc" +FILES_${PN}-devlink = "${base_sbindir}/devlink \ + ${datadir}/bash-completion/completions/devlink" +FILES_${PN}-genl = "${base_sbindir}/genl" +FILES_${PN}-ifstat = "${base_sbindir}/ifstat" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ ${base_sbindir}/ctstat \ ${base_sbindir}/rtstat" -FILES_${PN}-ifstat = "${base_sbindir}/ifstat" -FILES_${PN}-genl = "${base_sbindir}/genl" -FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" +FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-ss = "${base_sbindir}/ss" +FILES_${PN}-tc = "${base_sbindir}/tc* \ + ${libdir}/tc/*.so \ + ${datadir}/bash-completion/completions/tc" FILES_${PN}-tipc = "${base_sbindir}/tipc" -FILES_${PN}-devlink = "${base_sbindir}/devlink \ - ${datadir}/bash-completion/completions/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
Signature · 1 line
2.17.1
Hi Alan,
Quoted 1 line
+ mv ${D}${base_sbindir}/genl ${D}${sbindir}/genl
this is going to break setups where ${base_sbindir} equals ${sbindir}, so you'll need make this conditional.
Best regards,
Andreas
Good catch. Thanks.
Quoted 10 lines · Andreas Oberritter
Hi Alan,
Quoted 1 line
+ mv ${D}${base_sbindir}/genl ${D}${sbindir}/genl
this is going to break setups where ${base_sbindir} equals ${sbindir}, so you'll need make this conditional.
Best regards,
Andreas
Quoted 6 lines · Alan Perry
Many scripts exist that expect the iproute2 tools to be found in the same directories where they are found in Debian or Ubuntu. For the iproute2 tools included in the iproute2 recipe, move them to those directories or create links there. Also, add bash-completion files as is done by Debian and Ubuntu.
Rather than creating symlinks etc, could this be done more cleanly by having "make install" install to the Debian paths directly?
(Presumably Debian isn't manually moving files after "make install", they are just configuring the build differently).
Quoted 56 lines
Signed-off-by Alan Perry <[email protected]>> ---.../iproute2/iproute2.inc | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)meta/recipes-connectivity/iproute2/iproute2.inc +19
-3@@ -41,6 +41,21 @@ do_install () { install -d ${D}${datadir} mv ${D}/share/* ${D}${datadir}/ || true rm ${D}/share -rf || true + + install -d ${D}${base_bindir} + ln -s /sbin/ip ${D}${base_bindir}/ip + mv ${D}${base_sbindir}/ss ${D}${base_bindir}/ss + + install -d ${D}${bindir} + mv ${D}${base_sbindir}/nstat ${D}${bindir}/nstat + mv ${D}${base_sbindir}/lnstat ${D}${bindir}/lnstat + mv ${D}${base_sbindir}/ctstat ${D}${bindir}/ctstat + mv ${D}${base_sbindir}/rtstat ${D}${bindir}/rtstat + mv ${D}${base_sbindir}/routef ${D}${bindir}/routef + mv ${D}${base_sbindir}/routel ${D}${bindir}/routel + + install -d ${D}${sbindir} + mv ${D}${base_sbindir}/genl ${D}${sbindir}/genl } # The .so files in iproute2-tc are modules, not traditional libraries@@ -59,7 +74,8 @@ PACKAGES =+ "\ " FILES_${PN}-tc = "${base_sbindir}/tc* \ - ${libdir}/tc/*.so" + ${libdir}/tc/*.so \ + ${datadir}/bash-completion/completions/tc" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ ${base_sbindir}/ctstat \ ${base_sbindir}/rtstat"@@ -69,7 +85,8 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" -FILES_${PN}-devlink = "${base_sbindir}/devlink" +FILES_${PN}-devlink = "${base_sbindir}/devlink \ + ${datadir}/bash-completion/completions/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" --2.17.1
Quoted 11 lines · Andre McCurdy
Quoted 5 lines · Alan Perry
Many scripts exist that expect the iproute2 tools to be found in the same directories where they are found in Debian or Ubuntu. For the iproute2 tools included in the iproute2 recipe, move them to those directories or create links there. Also, add bash-completion files as is done by Debian and Ubuntu.
Rather than creating symlinks etc, could this be done more cleanly by having "make install" install to the Debian paths directly?
(Presumably Debian isn't manually moving files after "make install", they are just configuring the build differently).
I am not an expert in how Debian does its build, but it appears that all of the iproute2 tools are in sbin after they are built and then an install file in Debian source and not in the iproute2 upstream directs some of what is built to be installed in other directories.
Quoted 57 lines
Quoted 57 lines
Signed-off-by Alan Perry <[email protected]>> ---.../iproute2/iproute2.inc | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)meta/recipes-connectivity/iproute2/iproute2.inc +19
-3@@ -41,6 +41,21 @@ do_install () { install -d ${D}${datadir} mv ${D}/share/* ${D}${datadir}/ || true rm ${D}/share -rf || true + + install -d ${D}${base_bindir} + ln -s /sbin/ip ${D}${base_bindir}/ip + mv ${D}${base_sbindir}/ss ${D}${base_bindir}/ss + + install -d ${D}${bindir} + mv ${D}${base_sbindir}/nstat ${D}${bindir}/nstat + mv ${D}${base_sbindir}/lnstat ${D}${bindir}/lnstat + mv ${D}${base_sbindir}/ctstat ${D}${bindir}/ctstat + mv ${D}${base_sbindir}/rtstat ${D}${bindir}/rtstat + mv ${D}${base_sbindir}/routef ${D}${bindir}/routef + mv ${D}${base_sbindir}/routel ${D}${bindir}/routel + + install -d ${D}${sbindir} + mv ${D}${base_sbindir}/genl ${D}${sbindir}/genl } # The .so files in iproute2-tc are modules, not traditional libraries@@ -59,7 +74,8 @@ PACKAGES =+ "\ " FILES_${PN}-tc = "${base_sbindir}/tc* \ - ${libdir}/tc/*.so" + ${libdir}/tc/*.so \ + ${datadir}/bash-completion/completions/tc" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ ${base_sbindir}/ctstat \ ${base_sbindir}/rtstat"@@ -69,7 +85,8 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" -FILES_${PN}-devlink = "${base_sbindir}/devlink" +FILES_${PN}-devlink = "${base_sbindir}/devlink \ + ${datadir}/bash-completion/completions/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" --2.17.1