rpms/dkms/FC-6 .cvsignore, 1.7, 1.8 dkms.spec, 1.11, 1.12 sources, 1.7, 1.8
Matt Domsch (mdomsch)
fedora-extras-commits at redhat.com
Fri Oct 19 20:57:51 UTC 2007
Author: mdomsch
Update of /cvs/extras/rpms/dkms/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22617
Modified Files:
.cvsignore dkms.spec sources
Log Message:
upgrade to latest upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 29 Jun 2006 16:06:59 -0000 1.7
+++ .cvsignore 19 Oct 2007 20:57:18 -0000 1.8
@@ -1 +1 @@
-dkms-2.0.13.tar.gz
+dkms-2.0.17.5.tar.gz
Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-6/dkms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dkms.spec 29 Jun 2006 16:06:59 -0000 1.11
+++ dkms.spec 19 Oct 2007 20:57:18 -0000 1.12
@@ -1,33 +1,35 @@
Summary: Dynamic Kernel Module Support Framework
Name: dkms
-Version: 2.0.13
+Version: 2.0.17.5
Release: 1%{?dist}
License: GPL
Group: System Environment/Base
BuildArch: noarch
Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
Requires: bash > 1.99
-Provides: dkms-minimal
+# because Mandriva calls this package dkms-minimal
+Provides: dkms-minimal = %{version}
URL: http://linux.dell.com/dkms
Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# when building for Fedora, uncomment this Requires
Requires: kernel-devel
%description
This package contains the framework for the Dynamic
Kernel Module Support (DKMS) method for installing
-module RPMS as originally developed by the Dell
-Computer Corporation.
+module RPMS as originally developed by Dell.
%prep
%setup -q
+%build
-%triggerpostun -- dkms < 1.90.00-1
-for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
- mv -f $dir /var/lib/dkms
+%triggerpostun -- %{name} < 1.90.00-1
+for dir in `find %{_localstatedir}/%{name} -type d -maxdepth 1 -mindepth 1`; do
+ mv -f $dir %{_localstatedir}/lib/%{name}
done
-[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
+[ -e %{_sysconfdir}/dkms_framework.conf ] && ! [ -e %{_sysconfdir}/%{name}/framework.conf ] && mkdir %{_sysconfdir}/%{name} && cp -a %{_sysconfdir}/dkms_framework.conf %{_sysconfdir}/%{name}/framework.conf
arch_used=""
[ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
echo ""
@@ -38,10 +40,10 @@
echo ""
echo "The upgrade will assume all built modules are for arch: $arch_used"
current_kernel=`uname -r`
-dkms_tree="/var/lib/dkms"
-source_tree="/usr/src"
+dkms_tree="%{_localstatedir}/lib/%{name}"
+source_tree="%{_prefix}/src"
tmp_location="/tmp"
-dkms_frameworkconf="/etc/dkms/framework.conf"
+dkms_frameworkconf="%{_sysconfdir}/%{name}/framework.conf"
. $dkms_frameworkconf 2>/dev/null
echo ""
echo "Fixing directories."
@@ -49,18 +51,18 @@
dir_to_fix=`echo $directory | sed 's#/module$##'`
echo "Creating $dir_to_fix/$arch_used..."
mkdir $dir_to_fix/$arch_used
- mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null
+ mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null
done
echo ""
-echo "Fixing symlinks."
+echo "Fixing symlinks."
for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
cd $dir_of_symlink
- read_link="$symlink"
- while [ -L "$read_link" ]; do
- read_link=`ls -l $read_link | sed 's/.*-> //'`
- done
+ read_link="$symlink"
+ while [ -L "$read_link" ]; do
+ read_link=`ls -l $read_link | sed 's/.*-> //'`
+ done
if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
echo "Updating $symlink..."
ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
@@ -72,97 +74,180 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
-install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
-gzip -c -9 dkms.8 > $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-chmod 644 $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-install -m 644 dkms_framework.conf $RPM_BUILD_ROOT/etc/dkms/framework.conf
-install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
-install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
-install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
-install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth
+make install-redhat DESTDIR=$RPM_BUILD_ROOT \
+ SBIN=$RPM_BUILD_ROOT%{_sbindir} \
+ VAR=$RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} \
+ MAN=$RPM_BUILD_ROOT%{_mandir}/man8 \
+ ETC=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+ BASHDIR=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d \
+ LIBDIR=$RPM_BUILD_ROOT%{_prefix}/lib/%{name}
-%clean
+%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%attr(0755,root,root) /usr/sbin/dkms
-%attr(0755,root,root) /var/lib/dkms
-%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
-%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
-%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
-%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING README.dkms
-%doc %attr (-,root,root) sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
-%dir /etc/dkms
-%config(noreplace) /etc/dkms/framework.conf
-%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec
+%{_sbindir}/%{name}
+%{_localstatedir}/lib/%{name}
+/etc/init.d/dkms_autoinstaller
+%{_prefix}/lib/dkms/*
+%{_mandir}/*/*
+%doc sample.spec sample.conf AUTHORS COPYING README.dkms
+%doc sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/framework.conf
+%config(noreplace) %{_sysconfdir}/%{name}/template-dkms-mkrpm.spec
+%{_sysconfdir}/bash_completion.d/%{name}
%post
[ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
-/sbin/chkconfig dkms_autoinstaller on
+# enable on initial install
+[ $1 -lt 2 ] && /sbin/chkconfig dkms_autoinstaller on ||:
+%preun
+# remove on uninstall
+[ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
%changelog
-* Thu Jun 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.13-1
-- Update to 2.0.13
- - fix version comparison for all 2.6 kernels
- - add README.dkms to %doc
- - use -n <val> to all head and tail calls
- - fix munging of /etc/sysconfig/kernel INITRD_MODULES= line
- so it doesn't move already-present entries to the end
-
-* Fri Mar 17 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.10-1
-- Update to 2.0.10
- - add PRE_INSTALL dkms.conf directive
- - add SuSE Kernel Module Package (mkkmp) support
- - patch from Eric Devolder enables mkinitrd for Debian Sarge
- - include debian/ directory in upstream tarball
-
-* Sun Feb 12 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.9-2
-- rebuild for FC5
-
-* Sat Dec 10 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.9-1
-- Added URL tag
-- Update to 2.0.9
- - fix DF28947 (remove word 'only') from a printed message
- - gzip -9 dkms.8 manpage
- - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
- - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
- - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
- - Cleanup tempdir when ldtarball fails
- - mkrpm now is built with -ba, not -bb (creates source RPM)
-
-* Mon Nov 7 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.8-1
-- Update to 2.0.8 from Gary Lerhaupt
- - In dkms_autoinstaller added -no-clean-kernel to builds of multiple
- modules to avoid mrproper
- - Updated dkms_mkkerneldoth to know about VMWare kernel
- - Changed root check on ldtarball to only care about root if it sees
- --force
-
-* Tue Sep 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-3
-- no kernel-devel for FC-3
-
-* Mon Sep 12 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-2
-- requires kernel-devel
-
-* Sun Sep 4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-1
-- bump to 2.0.6
-- include COPYING AUTHORS in %%doc
-
-* Tue May 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.5.2-4
-- dist tag
-
-* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.0.5.2-3
-- Include /etc/dkms directory.
-
-* Tue Mar 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.5.2-2
-- Minor spec cleanups:
- Removed check for / before performing clean, unnecessary.
- Removed "Packager" tag.
- Removed "Vendor" tag.
- Replaced "Source" with "Source0".
+* Wed Oct 10 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.17.5
+- call udevtrigger if we install a module for the currently running kernel
+- uninstall from /extra before DEST_MODULE_LOCATION (Red Hat BZ#264981)
+- Run depmod after uninstall
+
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.17.4
+- upgrade to latest upstream
+
+* Wed Jun 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.2
+- updated for Ubuntu support, other bugfixes.
+
+* Tue Mar 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.1
+- spec file cleanups per re-review in Fedora
+- add bash completion, rpmbuild check, pinit, pass-arch patches from
+ Mandriva. These are generic. The other Mandriva patches appear to
+ be distro-specific.
+- Look for /etc/sysconfig/module-init-tools to get some values.
+
+* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16
+- fix override_dest_module_location() for historical distro versions
+- don't run weak-modules if it doesn't exist
+
+* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15
+- release with no changes
+
+* Fri Feb 23 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.14.1
+- After upgrading from older DKMS versions to 2.0.14, any previously
+ installed modules wouldn't show status properly, and wouldn't
+ uninstall properly, due to the new policy of using /extras/ and
+ /updates/. Needed to take that into account and look in both places.
+- SuSE puts weak-modules in /usr/lib/module-init-tools not /sbin.
+
+* Thu Feb 22 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.14
+- RHEL5 weak module status report fixed
+
+* Mon Feb 19 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.13.2
+- RHEL5 weak module recognition with new state installed-weak
+- autoinstaller recognizes installed-weak and doesn't rebuild
+- RHEL5 and SLES10 and higher weak module code expects modules to go
+ into /lib/modules/$kern/{extra,updates} respectively, so force that.
+
+* Mon Feb 5 2007 Matt Domsch <Matt_Domsch at dell.com>
+- patch from http://qa.mandriva.com/show_bug.cgi?id=27985 assigns new
+ modprobe.conf alias ordinals starting at zero.
+
+* Fri Jan 12 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.13.1
+- properly create driver disks for Fedora Core 6 and RHEL5
+- make .iso, .tar, and floppy .img driver disks for Red Hat and SuSE
+- set CLEAN properly even if MAKE[] isn't set.
+- fix install.sh buglet installing the manpage
+
+* Thu Jun 29 2006 Matt Domsch <Matt_Domsch at dell.com>
+- cleanups to match Fedora Extras spec file
+
+* Thu Jun 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.13
+- bump to 2.0.13
+
+* Wed Jun 28 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.12.1-1
+- fix version comparison awk pattern matching invocation and a line continuation
+
+* Mon Jun 26 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.12-1
+- bump to 2.0.12
+
+* Wed Jun 14 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.11.1-1
+- fix version comparison for all 2.6 kernels
+
+* Mon Apr 10 2006 Matt Domsch <Matt_Domsch at dell.com>
+- add README.dkms to doc
+
+* Wed Mar 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.11-1
+- use -n <val> to all head and tail calls
+
+* Tue Mar 28 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.10.1-1
+- fix munging of /etc/sysconfig/kernel INITRD_MODULES= line
+ so it doesn't move already-present entries to the end
+
+* Thu Mar 16 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.10-1
+- bump to 2.0.10
+
+* Wed Mar 15 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.9.3-1
+- add PRE_INSTALL dkms.conf directive
+
+* Tue Mar 14 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.9.2-1
+- add SuSE Kernel Module Package (mkkmp) support
+
+* Tue Dec 13 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.9.1-1
+- patch from Eric Devolder enables mkinitrd for Debian Sarge
+- include debian/ directory in upstream tarball
+
+* Thu Dec 8 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.9-1
+- fix DF28947 (remove word 'only') from a printed message
+- gzip -9 dkms.8 manpage
+
+* Wed Dec 7 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.8.3
+- look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+- don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+
+* Mon Nov 7 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8.2
+- Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+- Cleanup tempdir when ldtarball fails
+
+* Mon Nov 7 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8.1
+- mkrpm now is built with -ba, not -bb (creates source RPM)
+
+* Fri Nov 4 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8
+- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper
+
+* Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.7
+- Repackaged 2.0.6.2 as 2.0.7
+
+* Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6.2
+- Updated dkms_mkkerneldoth to know about VMWare kernel
+
+* Sun Oct 9 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6.1
+- Changed root check on ldtarball to only care about root if it sees --force
+
+* Fri Sep 2 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6
+- renamed 2.0.5.9 to 2.0.6
+
+* Mon Jul 25 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.9
+- FIXED BUG, when only some modules have original_modules, ARCHIVE_PREF3 wasn't getting reset causing big problems
+
+* Mon Jul 18 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.8
+- DKMS install now moves out original modules, does not copy them out
+
+* Tue Jun 7 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.7
+- Get rid of grep error when looking for RH file on non RH distro (Matt Domsch)
+
+* Wed May 11 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.6
+- handle obsolete modules in /etc/sysconfig/kernel
+
+* Fri Apr 29 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.5
+- dkms remove now properly removes modules_conf_aliases (thanks Matthew Melvin)
+
+* Wed Apr 20 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.4
+- Mktarball fails if it can't find dkms_dbversion
+
+* Tue Mar 15 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.3
+- More spec cleanups
* Mon Mar 14 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.5.2
- Tweaked spec to follow http://fedoraproject.org/wiki/PackagingGuidelines
@@ -210,7 +295,7 @@
* Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
- Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
-- Andreas Gruenbacher's removal of IFS usage
+- Andreas Gruenbacher's removal of IFS usage
- Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
- Andreas Gruenbacher's patch to cut down on line length by using $base_dir
- fixed $base_dir so it gets set after setup_kernels_arches
@@ -218,7 +303,7 @@
* Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
- patch to remove tick usage
- patch to rewrite version comparison code
-- patch to switch to usage of case, remove use of grep -c, remove use of IFS
+- patch to switch to usage of case, remove use of grep -c, remove use of IFS
- patch to change handling of stderr
* Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
@@ -584,7 +669,7 @@
- Added --no-prepare-kernel cli option
* Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
-- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>)
+- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>)
- Added Fred Treasure to the AUTHORS list
- Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout
@@ -633,7 +718,7 @@
* Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
- Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
-- Redid handling of modifying modules.conf
+- Redid handling of modifying modules.conf
- Added MODULE_CONF_ALIAS_TYPE to specs
* Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 29 Jun 2006 16:06:59 -0000 1.7
+++ sources 19 Oct 2007 20:57:18 -0000 1.8
@@ -1 +1 @@
-a0c2c66568f47d94dac9ee6af23c29f3 dkms-2.0.13.tar.gz
+d0c40299aa09d7b7d355a53cd7f04b64 dkms-2.0.17.5.tar.gz
More information about the fedora-extras-commits
mailing list