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
This commit is contained in:
Jan Engelhardt 2021-03-02 15:08:49 +00:00 committed by Git OBS Bridge
parent 60c0c62c0c
commit d27c48cfee
2 changed files with 11 additions and 2 deletions

View File

@ -7,6 +7,11 @@ Wed Jan 27 18:25:04 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
* ss: add support for XDP statistics
* bridge: mdb: add support for source address
-------------------------------------------------------------------
Fri Dec 4 09:49:34 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- missed /usr/bin/ip link in usrmerge
-------------------------------------------------------------------
Sat Oct 17 11:23:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

View File

@ -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