mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
Merge pull request #100 from flatcar-linux/t-lo/iproute2-5.8.0-with-elf-support
sys-apps/iproute2: bump to 5.8.0, add ELF support
This commit is contained in:
Thilo Fromm
GitHub
commit
5ede2a63eb
@ -31,3 +31,5 @@ app-admin/sudo -ldap
|
||||
# Bug #295615 - Disable cxx by default, in order to avoid a die
|
||||
# in pkg_setup with default USE settings (cxx requires sasl).
|
||||
net-nds/openldap -cxx
|
||||
|
||||
sys-apps/iproute2 elf
|
||||
|
||||
@ -8,3 +8,4 @@ DIST iproute2-4.6.0.tar.xz 570960 SHA256 74fc6a8ad085be095a159f8158bbaf385b42af9
|
||||
DIST iproute2-4.7.0.tar.xz 589928 SHA256 8f60dbcfb33a79daae0638f53bdcaa4310c0aa59ae39af8a234020dc69bb7b92 SHA512 dd884b192ede7f165d565dce6819fb7280eda880d4d53e06a604ab20e7ce343ba37847750172fd52061892e9db3d18bd8ae13d37bd4410e50a8f704cb3fe4ece WHIRLPOOL 191335f76f816ec1c86b2b9cac398129a475993e5a6366d0d0a35287eb07ae61d873e1a8a25a0083b28953011d8dfd492e7a718bacfd7f872130cdb2e3a5729d
|
||||
DIST iproute2-4.8.0.tar.xz 594636 SHA256 a30959c8421bc8ef42719bed41d14e1d7cfdbad80d7d70c5c42ad31f2c2cb389 SHA512 9b9db053e5d6ae2e7dd17870a3081ef61788a7eeb07473430e1a26c3c948123d33840bd6bb81b4a553ac6913ea89f02ac2a1b7d52ced65523a43991f03e84f49 WHIRLPOOL 83015c0bcfc6739ce688307a6824047910d453265883d4fbb9bec67c8720a5f478d2d72e5095ffc75191e64f3525a25f019032f20fc428b622e4a5c1b8fcbe3d
|
||||
DIST iproute2-4.9.0.tar.xz 613032 SHA256 c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 SHA512 0d974d7c001eac75def0d90b628e432d9847024843d02a6cd27266ff30e3f7a9c874fa91115da74db5f321c2e815b486a847059ca6df3aa8ea49432ffa39a889 WHIRLPOOL 83c8d42ef43f42a58835ff3b1df7460c67db4de1ae9d5df775d8aa15bfe2c488a626dd40c4327c2772436ed88bea1a1f57a953cd6bf650955465e76aec9476a2
|
||||
DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1 SHA512 f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152
|
||||
|
||||
@ -0,0 +1,208 @@
|
||||
The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
|
||||
a variable as well as modifying CFLAGS & LDLIBS.
|
||||
|
||||
If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
|
||||
are still in place.
|
||||
|
||||
Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
|
||||
are only passed when correctly needed.
|
||||
|
||||
Prior Gentoo testcase for reproduction:
|
||||
USE=minimal ebuild ... compile.
|
||||
- Linking with libelf, libmnl & libcap based only on presence.
|
||||
- Links based on libselinux based only on presence.
|
||||
|
||||
Closes: https://bugs.gentoo.org/643722
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
--- iproute2-4.20.0/bridge/Makefile
|
||||
+++ iproute2-4.20.0/bridge/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
all: bridge
|
||||
|
||||
--- iproute2-4.20.0/config.include
|
||||
+++ iproute2-4.20.0/config.include
|
||||
@@ -0,0 +1,26 @@
|
||||
+# We can only modify CFLAGS/LDLIBS after all the config options are known.
|
||||
+ifeq ($(IP_CONFIG_SETNS),y)
|
||||
+ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_ELF),y)
|
||||
+ CFLAGS += $(HAVE_ELF_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_ELF_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_SELINUX),y)
|
||||
+ CFLAGS += $(HAVE_SELINUX_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_SELINUX_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_MNL),y)
|
||||
+ CFLAGS += $(HAVE_MNL_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_MNL_LDLIBS)
|
||||
+endif
|
||||
+ifeq ($(HAVE_CAP),y)
|
||||
+ CFLAGS += $(HAVE_CAP_CFLAGS)
|
||||
+ LDLIBS += $(HAVE_CAP_LDLIBS)
|
||||
+endif
|
||||
+
|
||||
+# Rules can only be declared after all variables in them are known.
|
||||
+%.o: %.c
|
||||
+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
+
|
||||
+# vim: ft=make:
|
||||
--- iproute2-4.20.0/configure
|
||||
+++ iproute2-4.20.0/configure
|
||||
@@ -188,7 +188,7 @@
|
||||
if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
|
||||
echo "IP_CONFIG_SETNS:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
|
||||
+ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -231,8 +231,8 @@
|
||||
echo "HAVE_ELF:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
|
||||
- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
|
||||
+ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
|
||||
+ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -245,8 +245,8 @@
|
||||
echo "HAVE_SELINUX:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
|
||||
- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
|
||||
+ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
|
||||
+ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -258,8 +258,8 @@
|
||||
echo "HAVE_MNL:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
|
||||
+ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -316,8 +316,8 @@
|
||||
echo "HAVE_CAP:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -397,7 +397,3 @@
|
||||
|
||||
echo -n "libcap support: "
|
||||
check_cap
|
||||
-
|
||||
-echo >> $CONFIG
|
||||
-echo "%.o: %.c" >> $CONFIG
|
||||
-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
|
||||
--- iproute2-4.20.0/devlink/Makefile
|
||||
+++ iproute2-4.20.0/devlink/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-4.20.0/genl/Makefile
|
||||
+++ iproute2-4.20.0/genl/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
GENLOBJ=genl.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
--- iproute2-4.20.0/ip/Makefile
|
||||
+++ iproute2-4.20.0/ip/Makefile
|
||||
@@ -15,6 +15,7 @@
|
||||
RTMONOBJ=rtmon.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
|
||||
SCRIPTS=ifcfg rtpr routel routef
|
||||
--- iproute2-4.20.0/lib/Makefile
|
||||
+++ iproute2-4.20.0/lib/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -fPIC
|
||||
|
||||
--- iproute2-4.20.0/misc/Makefile
|
||||
+++ iproute2-4.20.0/misc/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
TARGETS=ss nstat ifstat rtacct lnstat
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
TARGETS += arpd
|
||||
--- iproute2-4.20.0/netem/Makefile
|
||||
+++ iproute2-4.20.0/netem/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DISTGEN = maketable normal pareto paretonormal
|
||||
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
|
||||
--- iproute2-4.20.0/rdma/Makefile
|
||||
+++ iproute2-4.20.0/rdma/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-4.20.0/tc/Makefile
|
||||
+++ iproute2-4.20.0/tc/Makefile
|
||||
@@ -4,6 +4,7 @@
|
||||
emp_ematch.yacc.o emp_ematch.lex.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
--- iproute2-4.20.0/tipc/Makefile
|
||||
+++ iproute2-4.20.0/tipc/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001
|
||||
From: Jory Pratt <anarchy@gentoo.org>
|
||||
Date: Tue, 11 Jun 2019 01:48:01 -0500
|
||||
Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever,
|
||||
but removing it breaks glibc's userspace header, which includes kernel.h
|
||||
instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical
|
||||
mistake. on musl, including any header that uses kernel.h directly or
|
||||
indirectly plus sys/sysinfo.h will produce a compile error due to
|
||||
redefinition of struct sysinfo. so for now, only include it on glibc in order
|
||||
not to break their headers.
|
||||
|
||||
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
|
||||
---
|
||||
include/uapi/linux/kernel.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
|
||||
index d99ffa1..f917115 100644
|
||||
--- a/include/uapi/linux/kernel.h
|
||||
+++ b/include/uapi/linux/kernel.h
|
||||
@@ -2,7 +2,9 @@
|
||||
#ifndef _LINUX_KERNEL_H
|
||||
#define _LINUX_KERNEL_H
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
#include <linux/sysinfo.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* 'kernel.h' contains some often-used function prototypes etc
|
||||
--
|
||||
2.22.0
|
||||
@ -0,0 +1,10 @@
|
||||
--- a/devlink/devlink.c
|
||||
+++ b/devlink/devlink.c
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
#include <unistd.h>
|
||||
+#include <signal.h>
|
||||
#include <getopt.h>
|
||||
#include <limits.h>
|
||||
#include <errno.h>
|
||||
159
sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.8.0.ebuild
vendored
Normal file
159
sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-5.8.0.ebuild
vendored
Normal file
@ -0,0 +1,159 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs flag-o-matic multilib
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="kernel routing and traffic control utilities"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
|
||||
|
||||
# We could make libmnl optional, but it's tiny, so eh
|
||||
RDEPEND="
|
||||
!net-misc/arpd
|
||||
dev-libs/libbsd
|
||||
!minimal? ( net-libs/libmnl )
|
||||
caps? ( sys-libs/libcap )
|
||||
elf? ( virtual/libelf )
|
||||
iptables? ( >=net-firewall/iptables-1.4.20:= )
|
||||
berkdb? ( sys-libs/db:= )
|
||||
atm? ( net-dialup/linux-atm )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
"
|
||||
# We require newer linux-headers for ipset support #549948 and some defines #553876
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-3.16
|
||||
"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
>=sys-devel/bison-2.4
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
|
||||
"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
|
||||
"${FILESDIR}"/${PN}-5.1.0-portability.patch
|
||||
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if ! use ipv6 ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
# echo -n is not POSIX compliant
|
||||
sed 's@echo -n@printf@' -i configure || die
|
||||
|
||||
sed -i \
|
||||
-e '/^CC :\?=/d' \
|
||||
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
|
||||
-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
|
||||
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
|
||||
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
|
||||
Makefile || die
|
||||
|
||||
# build against system headers
|
||||
rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
|
||||
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AR CC PKG_CONFIG
|
||||
|
||||
# This sure is ugly. Should probably move into toolchain-funcs at some point.
|
||||
local setns
|
||||
pushd "${T}" >/dev/null
|
||||
printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
|
||||
${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
|
||||
echo 'int main(){return 0;}' > test.c
|
||||
${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
|
||||
popd >/dev/null
|
||||
|
||||
# run "configure" script first which will create "config.mk"...
|
||||
econf
|
||||
|
||||
# ...now switch on/off requested features via USE flags
|
||||
# this is only useful if the test did not set other things, per bug #643722
|
||||
cat <<-EOF >> config.mk
|
||||
TC_CONFIG_ATM := $(usex atm y n)
|
||||
TC_CONFIG_XT := $(usex iptables y n)
|
||||
TC_CONFIG_NO_XT := $(usex iptables n y)
|
||||
# We've locked in recent enough kernel headers #549948
|
||||
TC_CONFIG_IPSET := y
|
||||
HAVE_BERKELEY_DB := $(usex berkdb y n)
|
||||
HAVE_CAP := $(usex caps y n)
|
||||
HAVE_MNL := $(usex minimal n y)
|
||||
HAVE_ELF := $(usex elf y n)
|
||||
HAVE_SELINUX := $(usex selinux y n)
|
||||
IP_CONFIG_SETNS := ${setns}
|
||||
# Use correct iptables dir, #144265 #293709
|
||||
IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 NETNS_RUN_DIR=/run/netns
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal ; then
|
||||
into /
|
||||
dosbin tc/tc
|
||||
dobin ip/ip
|
||||
return 0
|
||||
fi
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LIBDIR="${EPREFIX}"/$(get_libdir) \
|
||||
SBINDIR="${EPREFIX}"/sbin \
|
||||
CONFDIR="${EPREFIX}"/etc/iproute2 \
|
||||
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
ARPDDIR="${EPREFIX}"/var/lib/arpd \
|
||||
install
|
||||
|
||||
dodir /bin
|
||||
mv "${ED}"/{s,}bin/ip || die #330115
|
||||
|
||||
dolib.a lib/libnetlink.a
|
||||
insinto /usr/include
|
||||
doins include/libnetlink.h
|
||||
# This local header pulls in a lot of linux headers it
|
||||
# doesn't directly need. Delete this header that requires
|
||||
# linux-headers-3.8 until that goes stable. #467716
|
||||
sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
|
||||
|
||||
if use berkdb ; then
|
||||
keepdir /var/lib/arpd
|
||||
# bug 47482, arpd doesn't need to be in /sbin
|
||||
dodir /usr/bin
|
||||
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
|
||||
elif [[ -d "${ED}"/var/lib/arpd ]]; then
|
||||
rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user