SHA256
1
0
forked from pool/kmod
Jan Engelhardt 2017-07-06 23:44:38 +00:00 committed by Git OBS Bridge
parent 41d684ed7d
commit 32fbf5e7e6
2 changed files with 26 additions and 44 deletions

View File

@ -12,6 +12,10 @@ Thu Jul 6 08:07:50 UTC 2017 - jengelh@inai.de
0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch, 0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch,
0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
(applied upstream) (applied upstream)
- Remove support for openSUSE < 13.2 (non-dracut mkinitrd)
- Separate bash completion functions into extra package
- Move some of the symlinks from kmod-compat to kmod,
as kmod still does not have native support for all functions.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 09:10:54 UTC 2016 - yousaf.kaukab@suse.com Tue Nov 22 09:10:54 UTC 2016 - yousaf.kaukab@suse.com

View File

@ -54,6 +54,15 @@ These tools are designed on top of libkmod, a library that is shipped
with kmod. The aim is to be compatible with tools, configurations and with kmod. The aim is to be compatible with tools, configurations and
indexes from module-init-tools project. indexes from module-init-tools project.
%package bash-completion
Summary: Bash completion routines for the kmod utilities
License: LGPL-2.1+ and GPL-2.0+
Group: System/Shells
BuildArch: noarch
%description bash-completion
Contains bash completion support for kmod utilities.
%package compat %package compat
Summary: Compat symlinks for kernel module utilities Summary: Compat symlinks for kernel module utilities
License: GPL-2.0+ License: GPL-2.0+
@ -114,19 +123,10 @@ b="%buildroot"
%make_install %make_install
rm -f "$b/%_libdir"/*.la rm -f "$b/%_libdir"/*.la
mkdir -p "$b/%_libexecdir/kmod" "$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
#
# kmod-compat and kmod-compat(usrmerge)
#
ln -s "%_bindir/kmod" "$b/%_sbindir/$i" ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
ln -s "%_bindir/kmod" "$b/sbin/$i" ln -s "%_bindir/kmod" "$b/sbin/$i"
#
# Make symlinks also available in normal fashion,
# so one can actually run it.
#
ln -s "%_bindir/kmod" "$b/%_libexecdir/kmod/$i"
done done
mkdir -p "$b/%_bindir" "$b/bin" mkdir -p "$b/%_bindir" "$b/bin"
for i in lsmod; do for i in lsmod; do
@ -134,18 +134,6 @@ for i in lsmod; do
ln -s "%_bindir/kmod" "$b/bin/$i" ln -s "%_bindir/kmod" "$b/bin/$i"
done done
#
# make (all ancient versions of) mkinitrd happy which did not look in /usr
#
mkdir -p "$b"/{bin,sbin,%_lib}
ln -s "%_bindir/kmod" "$b/bin/"
ls -l "$b/%_libdir/"
%if "%_libdir" != "/%_lib"
ln -s "%_libdir/libkmod.so.2.3.1" "$b/%_lib/"
ln -s libkmod.so.2.3.1 "$b/%_lib/libkmod.so.2"
ls -l "$b/%_lib/"
%endif
%post %post
%{?regenerate_initrd_post} %{?regenerate_initrd_post}
@ -158,15 +146,22 @@ ls -l "$b/%_lib/"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/kmod %_bindir/kmod
%_libexecdir/kmod %_bindir/lsmod
/bin/kmod %_sbindir/depmod
%_sbindir/insmod
%_sbindir/lsmod
%_sbindir/modinfo
%_sbindir/modprobe
%_sbindir/rmmod
%_mandir/man[58]/*.[58]*
%files bash-completion
%defattr(-,root,root)
%_datadir/bash-completion/ %_datadir/bash-completion/
%_mandir/man8/kmod.8*
%files -n %lname %files -n %lname
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libkmod.so.2* %_libdir/libkmod.so.2*
/%_lib/libkmod.so.2*
%files -n libkmod-devel %files -n libkmod-devel
%defattr(-,root,root) %defattr(-,root,root)
@ -176,14 +171,7 @@ ls -l "$b/%_lib/"
%files compat %files compat
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/lsmod # The very very old paths (UsrMerge)
%_sbindir/depmod
%_sbindir/insmod
%_sbindir/lsmod
%_sbindir/modinfo
%_sbindir/modprobe
%_sbindir/rmmod
# UsrMerge
/bin/lsmod /bin/lsmod
/sbin/depmod /sbin/depmod
/sbin/insmod /sbin/insmod
@ -192,15 +180,5 @@ ls -l "$b/%_lib/"
/sbin/modprobe /sbin/modprobe
/sbin/rmmod /sbin/rmmod
# EndUsrMerge # EndUsrMerge
%_mandir/man5/depmod.d.5*
%_mandir/man5/modprobe.d.5*
%_mandir/man5/modules.dep.5*
%_mandir/man5/modules.dep.bin.5*
%_mandir/man8/depmod.8*
%_mandir/man8/insmod.8*
%_mandir/man8/lsmod.8*
%_mandir/man8/modinfo.8*
%_mandir/man8/modprobe.8*
%_mandir/man8/rmmod.8*
%changelog %changelog