jengelh/kmod
SHA256
1
0
Fork 0
forked from pool/kmod
Code Pull Requests Activity

Accepting request 849624 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849624
OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=172
This commit is contained in:
Jan Engelhardt 2020-11-20 10:52:59 +00:00 committed by Git OBS Bridge
parent 5dbd08ba68
commit 98f3e148e0
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kmod.changes
View File

@ -3,6 +3,11 @@ Fri Nov 6 11:41:50 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Add usr-lib-modprobe.patch [boo#1092648] - Add usr-lib-modprobe.patch [boo#1092648]
-------------------------------------------------------------------
Fri Oct 16 10:00:21 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 7 13:05:53 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Tue Jul 7 13:05:53 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

6
kmod.spec
View File

@ -117,12 +117,16 @@ rm -f "$b/%_libdir"/*.la
mkdir -p "$b/%_sbindir" "$b/sbin" mkdir -p "$b/%_sbindir" "$b/sbin"
for i in depmod insmod lsmod modinfo modprobe rmmod; do for i in depmod insmod lsmod modinfo modprobe rmmod; do
ln -s "%_bindir/kmod" "$b/%_sbindir/$i" ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
%if !0%{?usrmerged}
ln -s "%_bindir/kmod" "$b/sbin/$i" ln -s "%_bindir/kmod" "$b/sbin/$i"
%endif
done done
mkdir -p "$b/%_bindir" "$b/bin" mkdir -p "$b/%_bindir" "$b/bin"
for i in lsmod; do for i in lsmod; do
ln -s "%_bindir/kmod" "$b/%_bindir/$i" ln -s "%_bindir/kmod" "$b/%_bindir/$i"
%if !0%{?usrmerged}
ln -s "%_bindir/kmod" "$b/bin/$i" ln -s "%_bindir/kmod" "$b/bin/$i"
%endif
done done
%post %post
@ -144,6 +148,7 @@ done
%_sbindir/modprobe %_sbindir/modprobe
%_sbindir/rmmod %_sbindir/rmmod
%_mandir/man[58]/*.[58]* %_mandir/man[58]/*.[58]*
%if !0%{?usrmerged}
/bin/lsmod /bin/lsmod
/sbin/depmod /sbin/depmod
/sbin/insmod /sbin/insmod
@ -151,6 +156,7 @@ done
/sbin/modinfo /sbin/modinfo
/sbin/modprobe /sbin/modprobe
/sbin/rmmod /sbin/rmmod
%endif
%files bash-completion %files bash-completion
%_datadir/bash-completion/ %_datadir/bash-completion/