From d27c48cfeeb16718241b7cf2cc21ab15ecfd15937e96f3ab458c3f9586527dc8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 2 Mar 2021 15:08:49 +0000 Subject: [PATCH] Accepting request 876254 from home:lnussel:usrmove - missed /usr/bin/ip link in usrmerge OBS-URL: https://build.opensuse.org/request/show/876254 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=209 --- iproute2.changes | 5 +++++ iproute2.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/iproute2.changes b/iproute2.changes index 7a2539f..e1892d3 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -7,6 +7,11 @@ Wed Jan 27 18:25:04 UTC 2021 - Jan Engelhardt * ss: add support for XDP statistics * bridge: mdb: add support for source address +------------------------------------------------------------------- +Fri Dec 4 09:49:34 UTC 2020 - Ludwig Nussel + +- missed /usr/bin/ip link in usrmerge + ------------------------------------------------------------------- Sat Oct 17 11:23:47 UTC 2020 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index c560082..051ce2b 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -121,7 +121,9 @@ install -pm0644 "lib/libnetlink.a" "$b/%_libdir/" chmod -x "$b/%_libdir/libnetlink.a" install -pm0644 "include/libnetlink.h" "$b/%_includedir/" chmod -x "$b/%_includedir/libnetlink.h" -%if !0%{?usrmerged} +%if 0%{?usrmerged} +ln -sf "%_sbindir/ip" "$b%_bindir/ip" +%else ln -s "%_sbindir/ip" "$b/sbin" mkdir -p "$b/bin" ln -sf "%_sbindir/ip" "$b/bin/ip" @@ -142,7 +144,9 @@ cp -an README* examples/bpf "$b/%_docdir/%name/" %_bindir/ss %_sbindir/* %exclude %_sbindir/arpd -%if !0%{?usrmerged} +%if 0%{?usrmerged} +%_bindir/ip +%else /sbin/* /bin/ip %endif