From 6d6d34b9d607718c0ec082053868fa32899c4157 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 27 Oct 2019 13:12:51 -0700 Subject: [PATCH 1/2] iproute2: switch to alternatives for ip/tc --- srcpkgs/iproute2/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 1e918d98abfa02..4b30861ddc608f 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -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" @@ -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 @@ -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 } From 7640dc12af66fce1fb1a56a1bf7497bf326f8120 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 27 Oct 2019 12:39:47 -0700 Subject: [PATCH 2/2] busybox: add ip and tc alternatives --- srcpkgs/busybox/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index 986397d992b925..a62e9824f541fa 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -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" @@ -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}