| 1 |
commit: 1fb0e75f3491145fa5f2631e3dac9ae14eb79981 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 4 17:31:36 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 4 17:31:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb0e75f |
| 7 |
|
| 8 |
sys-apps/iproute2: Synced live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/iproute2/iproute2-9999.ebuild | 10 +++------- |
| 14 |
1 file changed, 3 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild |
| 17 |
index 9e2e1f7f4e5..7dcb54c51f5 100644 |
| 18 |
--- a/sys-apps/iproute2/iproute2-9999.ebuild |
| 19 |
+++ b/sys-apps/iproute2/iproute2-9999.ebuild |
| 20 |
@@ -70,12 +70,6 @@ src_prepare() { |
| 21 |
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
| 22 |
Makefile || die |
| 23 |
|
| 24 |
- # Use /run instead of /var/run. |
| 25 |
- sed -i \ |
| 26 |
- -e 's:/var/run:/run:g' \ |
| 27 |
- include/namespace.h \ |
| 28 |
- man/man8/ip-netns.8 || die |
| 29 |
- |
| 30 |
# build against system headers |
| 31 |
rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
| 32 |
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
| 33 |
@@ -120,7 +114,7 @@ src_configure() { |
| 34 |
} |
| 35 |
|
| 36 |
src_compile() { |
| 37 |
- emake V=1 |
| 38 |
+ emake V=1 NETNS_RUN_DIR=/run/netns |
| 39 |
} |
| 40 |
|
| 41 |
src_install() { |
| 42 |
@@ -158,5 +152,7 @@ src_install() { |
| 43 |
# bug 47482, arpd doesn't need to be in /sbin |
| 44 |
dodir /usr/bin |
| 45 |
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
| 46 |
+ elif [[ -d "${ED}"/var/lib/arpd ]]; then |
| 47 |
+ rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die |
| 48 |
fi |
| 49 |
} |
Archives