Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow busybox to provide ip/tc #15836

Closed
wants to merge 2 commits into from
+12 −3
Closed

Allow busybox to provide ip/tc #15836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6d34b
iproute2: switch to alternatives for ip/tc
CameronNemo Oct 27, 2019
7640dc1
busybox: add ip and tc alternatives
CameronNemo Oct 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions srcpkgs/busybox/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'busybox'
pkgname=busybox
version=1.31.1
revision=1
revision=2
hostmakedepends="perl"
checkdepends="zip"
short_desc="Swiss Army Knife of Embedded Linux"
Expand All @@ -17,7 +17,9 @@ _alternatives_core="
hostname:hostname:/usr/bin/busybox
sh:sh:/usr/bin/busybox
vi:vi:/usr/bin/busybox
logger:logger:/usr/bin/busybox"
logger:logger:/usr/bin/busybox
ip:ip:/usr/bin/busybox
tc:tc:/usr/bin/busybox"

_alternatives="
${_alternatives_core}
Expand Down
9 changes: 8 additions & 1 deletion srcpkgs/iproute2/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'iproute2'
pkgname=iproute2
version=5.3.0
revision=1
revision=2
build_style=configure
make_install_args="SBINDIR=/usr/bin"
hostmakedepends="pkg-config perl flex"
Expand All @@ -13,6 +13,10 @@ homepage="https://wiki.linuxfoundation.org/networking/iproute2"
distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f

alternatives="
ip:ip:/usr/bin/iproute2-ip
tc:tc:/usr/bin/iproute2-tc"

conf_files="
/etc/iproute2/ematch_map
/etc/iproute2/rt_dsfield
Expand All @@ -26,6 +30,9 @@ do_check() {
}

post_install() {
for bin in ip tc; do
mv "${DESTDIR}/usr/bin/${bin}" "${DESTDIR}/usr/bin/iproute2-${bin}"
done
rm -r ${DESTDIR}/usr/share/doc
rm -r ${DESTDIR}/usr/share/man/man3
}
Expand Down