Hello community,
here is the log from the commit of package module-init-tools for openSUSE:Factory checked in at 2012-12-03 10:30:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/module-init-tools (Old)
and /work/SRC/openSUSE:Factory/.module-init-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "module-init-tools", Maintainer is "MMarek@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/module-init-tools/module-init-tools.changes 2012-09-26 16:22:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.module-init-tools.new/module-init-tools.changes 2012-12-03 10:30:34.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Nov 14 18:44:10 UTC 2012 - jengelh@inai.de
+
+- Move m-i-t independent files to suse-module-tools, so that
+ kmod-compat can be installed in a system.
+- Remove redundant %clean section
+
+-------------------------------------------------------------------
Old:
----
10-unsupported-modules.conf
README.SUSE
depmod-00-system.conf
driver-check.sh
modprobe.conf.tar.bz2
weak-modules
weak-modules2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.CBXgt3/_old 2012-12-03 10:30:35.000000000 +0100
+++ /var/tmp/diff_new_pack.CBXgt3/_new 2012-12-03 10:30:35.000000000 +0100
@@ -40,18 +40,12 @@
Group: System/Kernel
Url: http://www.kerneltools.org/
Source0: http://www.kernel.org/pub/linux/utils/kernel/%{name}/%{name}-%{version}.tar.bz2
-Source1: README.SUSE
-Source2: modprobe.conf.tar.bz2
-Source3: depmod-00-system.conf
-Source4: 10-unsupported-modules.conf
-Source5: weak-modules
-Source6: weak-modules2
-Source7: driver-check.sh
# Patch1: module-init-tools-upstream.diff
Patch2: module-init-tools-suse.diff
# PATCH-FIX-UPSTREAM module-init-tools-fix-nfs-local.diff [bnc#781737]
Patch3: module-init-tools-fix-nfs-local.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: suse-module-tools
%description
Utilities for loading kernel modules. Included are 'insmod', 'lsmod',
@@ -70,7 +64,7 @@
Jon Masters
%prep
-%setup -q -a2
+%setup -q
# patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -87,99 +81,15 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
-install -m644 %_sourcedir/README.SUSE .
ln -sf /bin/lsmod $RPM_BUILD_ROOT/sbin/lsmod
-#
-# now assemble the parts for modprobe.conf
-#
-cd modprobe.conf
-cp modprobe.conf.common 00-system.conf
-if [ -f modprobe.conf.$RPM_ARCH ] ; then
- cat modprobe.conf.$RPM_ARCH >> 00-system.conf
-fi
-install -d -m 755 $RPM_BUILD_ROOT/etc/modprobe.d
-install -m644 %_sourcedir/10-unsupported-modules.conf \
- $RPM_BUILD_ROOT/etc/modprobe.d/
-install -m644 00-system.conf $RPM_BUILD_ROOT/etc/modprobe.d/
-install -m644 modprobe.conf.local $RPM_BUILD_ROOT/etc/modprobe.d/99-local.conf
-install -d -m 755 $RPM_BUILD_ROOT/etc/depmod.d
-install -m 644 %_sourcedir/depmod-00-system.conf \
- $RPM_BUILD_ROOT/etc/depmod.d/00-system.conf
-install -d -m 755 $RPM_BUILD_ROOT/usr/lib/%name
+#install -d -m 755 $RPM_BUILD_ROOT/usr/lib/%name
#install -m 755 modindex $RPM_BUILD_ROOT/usr/lib/%name/
-install -m 755 %_sourcedir/weak-modules{,2} $RPM_BUILD_ROOT/usr/lib/%name/
-install -m 755 %_sourcedir/driver-check.sh $RPM_BUILD_ROOT/usr/lib/%name/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-test_allow_on_install()
-{
- # configure handling of unsupported modules
- # default is to allow them
- allow=1
- # if the obsolete LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY variable is
- # set to no, don't allow (this was used in SLES 9 and 10)
- if test -e /etc/sysconfig/hardware/config; then
- . /etc/sysconfig/hardware/config
- if test "x$LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY" = "xno"; then
- allow=0
- fi
- # obsolete
- rm /etc/sysconfig/hardware/config
- fi
- # don't change the setting during upgrade
- if test "$1" != 1; then
- return
- fi
- # on SLES, the default is not to allow unsupported modules
- if grep -qs "Enterprise Server" /etc/SuSE-release; then
- allow=0
- else
- return
- fi
- # unless the admin passed "oem-modules=1" to the kernel during install
- if grep -qs '\' /proc/cmdline; then
- allow=1
- return
- fi
- # or if the installer already loaded some unsupported modules
- # (see TAINT_NO_SUPPORT in /usr/src/linux/include/linux/kernel.h)
- tainted=$(cat /proc/sys/kernel/tainted 2>/dev/null || echo 0)
- if test $((tainted & (1<<30))) != 0; then
- allow=1
- return
- fi
-}
-# upgrade from old locations
-if test -e /etc/modprobe.d/unsupported-modules; then
- mv -f /etc/modprobe.d/unsupported-modules \
- /etc/modprobe.d/10-unsupported-modules.conf
-fi
-if test -e /etc/modprobe.conf.local; then
- mv -f /etc/modprobe.conf.local \
- /etc/modprobe.d/99-local.conf
-fi
-test_allow_on_install "$@"
-if test "$allow" = "0"; then
- sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \
- /etc/modprobe.d/10-unsupported-modules.conf
-fi
%files
%defattr(-,root,root)
-%dir /etc/modprobe.d
-%config /etc/modprobe.d/00-system.conf
-%config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf
-%config(noreplace) /etc/modprobe.d/99-local.conf
-%dir /etc/depmod.d
-%config /etc/depmod.d/00-system.conf
%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
-%doc README.SUSE
%doc %{_mandir}/man?/*
/bin/*
/sbin/*
-/usr/lib/%name
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org