--- dkms-2.0.21.0.orig/debian/copyright +++ dkms-2.0.21.0/debian/copyright @@ -0,0 +1,22 @@ +Source: http://linux.dell.com/dkms/ + +Files: debian/HOWTO.Debian +Copyright: © 2008, Dell, Inc. + Mario Limonciello +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +Files: debian/* +Copyright: © 2008, David Paleino + © 2005-2008, Matt Domsch +License: GPL-2+ + +Files: * +Copyright: © 2003-2007, Dell, Inc. +License: GPL-2+ + +On Debian systems, the complete text of the GNU General +Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. --- dkms-2.0.21.0.orig/debian/modprobe +++ dkms-2.0.21.0/debian/modprobe @@ -0,0 +1,4 @@ +# modprobe information used for DKMS modules +# +# This is a stub file, should be edited when needed, +# used by default by DKMS. --- dkms-2.0.21.0.orig/debian/changelog +++ dkms-2.0.21.0/debian/changelog @@ -0,0 +1,149 @@ +dkms (2.0.21.0-1) unstable; urgency=low + + * [0c2c36b] New Upstream version 2.0.21.0 + * First Debian release (Closes: #481590) + * [6723982] debian/patches/: Refreshed patches, and deleted + 03-remove_dkms_lib_directory_if_empty.patch (now it is in upstream) + * [592acec] debian/patches/04-use_su-to-root.patch: Do not test for $DISPLAY + as su-to-root does not require an X display + * [22d2ce2] debian/patches/09-lilo_detection.patch: grep for + do_bootloader instead of postinst_hook + * [b910eb3] debian/patches/03-use-new- + header_postinst.d_directory.patch: Use new + /etc/kernel/header_postinst.d directory introduced in kernel-package + 11.017 + * [f59cc66] debian/control: Add kernel-package (>= 11.017) in Depends + * [6ebb0c4] Removed debian/postinst and debian/prerm + + -- Giuseppe Iuculano Mon, 16 Feb 2009 11:06:58 +0100 + +dkms (2.0.20.4-1) unstable; urgency=low + + [ David Paleino ] + * debian/control: + - using new Homepage field in source stanza + - setting team as Maintainer + - adding myself and Mario Limonciello as Uploaders + - removed awk and bash dependencies: they are "essential" (de facto) + packages (LP: #314774) + - DM-Upload-Allowed set + - added menu|sudo to Recommends + * debian/copyright: + - updated to machine-readable format + - clarified license for debian/HOWTO.Debian + * debian/compat bumped to 7 + * debian/docs: + - sample.{conf,spec} moved to debian/examples + * debian/rules updated + * debian/patches/01-fix_manpage.patch added, to fix hyphen-used-as-minus-sign + lintian warning + * debian/postinst added + * debian/HOWTO.Debian from Ubuntu package added + * debian/modprobe added + * debian/prerm: + - use sed instead of tricky grep hack + - always do the default thing + * added get-svn-source to debian/rules + * debian/patches/08-use_update-initramfs.patch: updated to parse + /etc/kernel-img.conf + * debian/patches/11-bash-completion.patch: + - better usage of bash builtins + - _filename_parts(): fix wrong behaviour when /usr/src/ is a symlink + - added patch description + + [ Giuseppe Iuculano ] + * Added myself as Uploader + * Standards-Version bumped to 3.8.0 + - Add debian/README.source to document quilt usage + * debian/prerm: quiet grep, do not write anything to standard output. + * debian/rules: + - remove some pointless blank lines + - fix dh-clean-k-is-deprecated lintian warning, use dh_prep instead of + dh_clean -k + * debian/patches/03-remove_dkms_lib_directory_if_empty.patch: Merge from + Ubuntu, ensure that the /lib/modules//updates/dkms directory is + removed if it is empty after a removal. This allows the modules directory + to be removed as it becomes empty. + * debian/patches/04-use_su-to-root.patch: Use su-to-root if available + * debian/patches/05-do_not_check_admin_group.patch: + - Do not check for admin group, this isn't a Debian standard group. + - added a g modifier to replace all underscores in function make_debian() + * debian/patches/06-fakeroot.patch: Do not use fakeroot for source- + only build, and use -rfakeroot for binary build + * debian/patches/07-exit-if-build-fails.patch: Fix exit when build + fails + * debian/patches/08-support_kernel-img.conf.patch: Use update-initramfs + if ramdisk value in /etc/kernel-img.conf is missing + * debian/patches/09-lilo_detection.patch: check /etc/kernel-img.conf + to find if user is using grub + * debian/patches/10-lsb.patch: + - /etc/lsb-release is not present in Debian, so run run lsb_release + - Added Debian as known distro in override_dest_module_location() + * debian/control: + - Added lsb-release in Recommends + - Updated VCS control field + - Added build-essential in Depends (LP: #304014), + Removed ${shlibs:Depends} from Depends and removed make, dpkg-dev and + gcc from Recommends + * debian/patches/11-bash-completion.patch: Improve bash-completion + support (Origin Mandriva) + * debian/patches/01-fix_manpage.patch: fix wrong path into man page + (LP: #292289) + * debian/patches/12-use_invoke-rc.d.patch: Use invoke-rc.d in + kernel_postinst.d_dkms and fix script-calls-init-script-directly lintian + warning + + -- Giuseppe Iuculano Thu, 08 Jan 2009 15:01:39 +0100 + +dkms (2.0.19-0ubuntu2) hardy; urgency=low + + * Depend on awk instead of gawk. All variants of awk provide the + currently required functionality. + + -- Mario Limonciello Wed, 26 Mar 2008 16:51:33 -0500 + +dkms (2.0.19-0ubuntu1) hardy; urgency=low + + * New upstream version. + - Fixes appending date to debian/changelog in mkdeb. + + -- Mario Limonciello Wed, 26 Mar 2008 10:46:52 -0500 + +dkms (2.0.17.6-0ubuntu1) hardy; urgency=low + + [ Matt Domsch ] + * Correct kernel uninstall trigger (LP: #192240) + * Call udevadm trigger if present, fall back to udevtrigger (LP: #192241) + * Fix uninstallation with weak modules (Red Hat BZ#429410) + * debian/control: + - Update standards version to 3.7.3 + - Add Vcs-git repository. + + -- Mario Limonciello Mon, 18 Feb 2008 09:40:18 -0600 + +dkms (2.0.17.4-0ubuntu4) hardy; urgency=low + + * Fix -x call. + + -- Scott James Remnant Fri, 14 Dec 2007 16:52:51 +0000 + +dkms (2.0.17.4-0ubuntu3) hardy; urgency=low + + * dkms: call udevadm instead of udevtrigger + + -- Scott James Remnant Fri, 14 Dec 2007 16:15:13 +0000 + +dkms (2.0.17.5-0ubuntu1) hardy; urgency=low + + * Correct DKMS file install/uninstall problems (LP: #151644) + - call udevtrigger if we install a module for the currently running kernel + - uninstall from /extra before DEST_MODULE_LOCATION + - Run depmod after uninstall + + -- Matt Domsch Mon, 10 Oct 2007 16:50:00 -0500 + +dkms (2.0.17.4-0ubuntu1) gutsy; urgency=low + + * initial debian packaging for Ubuntu (LP: #121676) + + -- Matt Domsch Mon, 17 Sep 2007 09:58:46 -0500 --- dkms-2.0.21.0.orig/debian/examples +++ dkms-2.0.21.0/debian/examples @@ -0,0 +1,4 @@ +sample.conf +sample.spec +sample-suse-10-mkkmp.spec +sample-suse-9-mkkmp.spec --- dkms-2.0.21.0.orig/debian/compat +++ dkms-2.0.21.0/debian/compat @@ -0,0 +1 @@ +7 --- dkms-2.0.21.0.orig/debian/watch +++ dkms-2.0.21.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://linux.dell.com/dkms/permalink/dkms-(.*)\.tar\.gz --- dkms-2.0.21.0.orig/debian/rules +++ dkms-2.0.21.0/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 ) + +include /usr/share/quilt/quilt.make + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) clean-dpkg + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install-ubuntu DESTDIR=$(CURDIR)/debian/dkms + chmod a+x $(CURDIR)/debian/dkms/etc/dkms/template-dkms-mkdeb/debian/postinst + chmod a+x $(CURDIR)/debian/dkms/etc/dkms/template-dkms-mkdeb/debian/postrm + chmod a+x $(CURDIR)/debian/dkms/etc/dkms/template-dkms-mkdeb/debian/prerm + chmod a+x $(CURDIR)/debian/dkms/etc/dkms/template-dkms-mkdeb/debian/rules + rm -rf $(CURDIR)/debian/dkms/usr/share/doc/dkms/sample* + +binary-arch: build install +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs AUTHORS debian/HOWTO.Debian + dh_installexamples + dh_installinit --name dkms_autoinstaller + dh_installman + dh_installmodules + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep + +get-orig-source: + uscan \ + --force-download \ + --download-version $(CURVER) \ + --rename + +get-svn-source: + [ -d ../tarballs ] || mkdir ../tarballs + cd ../tarballs && make -f $(CURDIR)/debian/rules get-orig-source + +.PHONY: build clean binary-indep binary-arch binary install --- dkms-2.0.21.0.orig/debian/HOWTO.Debian +++ dkms-2.0.21.0/debian/HOWTO.Debian @@ -0,0 +1,40 @@ +HOWTO Build DKMS debs w/ Debian & Ubuntu systems +Copyright 2008 Dell Inc. + Author: Mario Limonciello + +------------ + +A dkms deb is a common representation of a DKMS package that can be distributed across multiple machines. +After you have a functional DKMS package, you can follow these steps to build a DKMS deb. + +1) Start out by putting together a tree in /usr/src/PACKAGE-VERSION. For our example, we are going to use +the PACKAGE lirc and VERSION 0.8.3~pre1. Create a dkms.conf per the recommendations in the DKMS guide. + +2) "Add" the package to the dkms tree system: + dkms add -m lirc -v 0.8.3~pre1 + +3) "Build" the binary modules for the current kernel: + dkms build -m lirc -v 0.8.3~pre1 + +4) Make the deb and/or dsc for the package: + dkms mkdeb -m lirc -v 0.8.3~pre1 + dkms mkdsc -m lirc -v 0.8.3~pre1 + +The end result will be a deb and/or dsc in /var/lib/dkms/lirc/0.8.3~pre1/deb or /var/lib/dkms/lirc/0.8.3~pre1/dsc + +------------ +If you would prefer not to contaminate your system with the changes from building these debs, you should +create a framework.conf that contains these variables (adjust for your use case): + + source_tree="/path/to/source/tree" + dkms_tree="/path/to/dkms/tree" + +You will then call DKMS with an extra variable, '--dkmsframework'. Here is an example of how this would work +using the same lirc example above: + + dkms add -m lirc -v 0.8.3~pre1 --dkmsframework framework.conf + dkms build -m lirc -v 0.8.3~pre1 --dkmsframework framework.conf + dkms mkdeb -m lirc -v 0.8.3~pre1 --dkmsframework framework.conf + dkms mkdsc -m lirc -v 0.8.3~pre1 --dkmsframework framework.conf + +The end result will be both a debian binary package and a debian source package that you can use. --- dkms-2.0.21.0.orig/debian/control +++ dkms-2.0.21.0/debian/control @@ -0,0 +1,27 @@ +Source: dkms +Section: admin +Priority: optional +Maintainer: Dynamic Kernel Modules Support Team +Uploaders: David Paleino , + Mario Limonciello , + Giuseppe Iuculano +Build-Depends: debhelper (>= 7), quilt +Standards-Version: 3.8.0 +Homepage: http://linux.dell.com/dkms +Vcs-Git: git://git.debian.org/git/users/hanska-guest/dkms.git +Vcs-Browser: http://git.debian.org/git/users/hanska-guest/dkms.git + +Package: dkms +Architecture: all +Depends: ${misc:Depends}, build-essential, + module-init-tools, + linux-headers, + kernel-package (>= 11.017) +Recommends: patch, + fakeroot, + lsb-release, + menu | sudo +Description: Dynamic Kernel Module Support Framework + DKMS is a framework designed to allow individual kernel modules to be upgraded + without changing the whole kernel. It is also very easy to rebuild modules as + you upgrade kernels. --- dkms-2.0.21.0.orig/debian/README.source +++ dkms-2.0.21.0/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. --- dkms-2.0.21.0.orig/debian/patches/series +++ dkms-2.0.21.0/debian/patches/series @@ -0,0 +1,12 @@ +01-fix_manpage.patch +02-fix_distribution.patch +03-use-new-header_postinst.d_directory.patch +04-use_su-to-root.patch +05-do_not_check_admin_group.patch +06-fakeroot.patch +07-exit-if-build-fails.patch +08-support_kernel-img.conf.patch +09-lilo_detection.patch +10-lsb.patch +11-bash-completion.patch +12-use_invoke-rc.d.patch --- dkms-2.0.21.0.orig/debian/patches/07-exit-if-build-fails.patch +++ dkms-2.0.21.0/debian/patches/07-exit-if-build-fails.patch @@ -0,0 +1,46 @@ +Fix exit when build fails +--- a/dkms ++++ b/dkms +@@ -3211,10 +3211,27 @@ function make_debian() + case "$create_type" in + dsc) + invoke_command "dpkg-buildpackage -S -us -uc 1>/dev/null" "Building source package" ++ if [ "$?" -eq 0 ]; then ++ echo $"" ++ echo $"DKMS: mk${create_type} Completed." ++ else ++ echo $"" >&2 ++ echo $"Error! There was a problem creating your ${create_type}." >&2 ++ exit 7 ++ fi + invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" + ;; + deb) + invoke_command "dpkg-buildpackage -rfakeroot -b -us -uc 1>/dev/null" "Building binary package" ++ if [ "$?" -eq 0 ]; then ++ echo $"" ++ echo $"DKMS: mk${create_type} Completed." ++ else ++ echo $"" >&2 ++ echo $"Error! There was a problem creating your ${create_type}." >&2 ++ exit 7 ++ fi ++ + invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir" + ;; + esac +@@ -3230,12 +3247,9 @@ function make_debian() + delete_temporary_trees + + #done +- if [ "$?" -eq 0 ]; then +- echo $"" +- echo $"DKMS: mk${create_type} Completed." +- else ++ if [ "$?" -ne 0 ]; then + echo $"" >&2 +- echo $"Error! There was a problem creating your ${create_type}." >&2 ++ echo $"Error! There was a problem cleaning up temporary files." >&2 + exit 7 + fi + } --- dkms-2.0.21.0.orig/debian/patches/01-fix_manpage.patch +++ dkms-2.0.21.0/debian/patches/01-fix_manpage.patch @@ -0,0 +1,629 @@ +fix Lintian info hypen-used-as-minus-sign +--- a/dkms.8 ++++ b/dkms.8 +@@ -14,7 +14,7 @@ for each kernel on your system in a simp + .B add + Adds a module/version combination to the tree for builds and installs. + Requires source in +-.I /usr/src/-/ ++.I /usr/src/\-/ + as well as a properly + formatted + .I dkms.conf +@@ -24,14 +24,14 @@ file. + Removes a module/version or module/version/kernel combination from the + tree. If the modules is currently installed, it first uninstalls it + and if applicable, will replace it with its original_module. Use the +-.B --all ++.B \-\-all + option in order to remove all instances for every kernel at once. + .TP + .B build + Builds the specified module/version combo for the specified kernel. If + no kernel is specified it builds for the currently running kernel. All builds + occur in the directory +-.I /var/lib/dkms///build/. ++.I /var/lib/dkms///build/. + .TP + .B install + Installs a built module/version combo onto the kernel it was built for. If +@@ -61,15 +61,15 @@ subdirectory of your module source direc + must specify the distro while using this action. Driver disks can be made + for single kernels or can be made to support multiple kernels. To create + a driver disk image with modules for multiple kernels, just specify multiple +--k parameters on the command line (-k kernel1 -k kernel2 -a arch1 -a arch2). ++\-k parameters on the command line (\-k kernel1 \-k kernel2 \-a arch1 \-a arch2). + + Red Hat began supporting multi-arched driver disks in RHEL3. To force creation + of a driver disk with arch information, specify +-.B -d redhat2 ++.B \-d redhat2 + or if you specify multiple architectures on the command-line and use +-.B -d redhat ++.B \-d redhat + , DKMS will create a version 2 driver disk. By specifying +-.B -d redhat1 ++.B \-d redhat1 + , you can force a version 1 driver disk image. + + Note that redhat1 driver disks actually supported multiple architectures when +@@ -87,21 +87,21 @@ or higher to generate a proper driver di + + For suse/UnitedLinux driver disks, /usr/share/YaST2/modules/Vendor.ycp + will also be copied to the driver disk; no other files are needed. +-However, for these distros, you must specify a -r release. For +-SuSE 9.1, it would be -d suse -r 9.1. For SLES9, it would be -d suse -r sles9. ++However, for these distros, you must specify a \-r release. For ++SuSE 9.1, it would be \-d suse \-r 9.1. For SLES9, it would be \-d suse \-r sles9. + + By default the disk image it creates is 1440 (k) in size. This can be + overridden by specifying a different +-.B --size #### ++.B \-\-size #### + which should should be given as a number in kilobytes divisible by 20. + + You may have more content than will fit on a floppy. Therefore, DKMS + can now generate image files of different types. +-.B --media=floppy (default) ++.B \-\-media=floppy (default) + to generate a floppy disk image, or +-.B --media=iso ++.B \-\-media=iso + to generate a CD-ROM ISO file, or +-.B --media=tar ++.B \-\-media=tar + to generate a tar file. + + You may copy the floppy or ISO image file to a USB key to be used with +@@ -115,13 +115,13 @@ in the DKMS tree for that module/version + the source and any built modules for kernels in the tree (as specified). + Otherwise, you can specify + a singular kernel to archive only, or multiple kernels to archive +-(-k kernel1 -k kernel2 -a arch1 -a arch2). Optionally, you can use +-.B --archive ++(\-k kernel1 \-k kernel2 \-a arch1 \-a arch2). Optionally, you can use ++.B \-\-archive + to specify the name (with no preceding path) that you would like this + tarball to have. You can also specify +-.B --binaries-only ++.B \-\-binaries\-only + if you want the resultant tarball not to include the module source. Likewise, +-.B --source-only ++.B \-\-source-only + can be used to specify that no prebuilt binaries should be included in the tarball. + In general, + .B mktarball +@@ -135,7 +135,7 @@ without having to wait for anything to c + This takes a tarball made from the + .B mktarball + command and specified with the +-.B --archive ++.B \-\-archive + option and loads it into your DKMS tree. This will leave any + newly added modules in the built state and + .B dkms install +@@ -143,33 +143,33 @@ should then be called to install any of + exist where + .B ldtarball + is attempting to place them, it will warn and not copy over them. The +-.B --force ++.B \-\-force + option should be used to override this. + .TP + .B mkrpm + This action allows you to create an RPM package for a specified module / version. + It uses a template .spec file found in +-.I /etc/dkms/template-dkms-mkrpm.spec ++.I /etc/dkms/template\-dkms\-mkrpm.spec + as the basis for the RPM. Alternatively, if DKMS finds a file called +-.I /usr/src/-/-dkms-mkrpm.spec ++.I /usr/src/\-/\-dkms\-mkrpm.spec + it will use that .spec file instead. In general, a DKMS tarball is placed inside + the contents of this RPM, and the RPM itself calls various DKMS commands to + load this tarball, build and install modules on the end user's system. If you do + not want your RPM to contain any prebuilt binaries, be sure to specify +-.B --source-only ++.B \-\-source\-only + in the mkrpm command. + .TP + .B mkdeb + This action allows you to create a debian binary package for a specified module / version. + It uses a template debian directory found in +-.I /etc/dkms/template-dkms-mkdeb ++.I /etc/dkms/template\-dkms\-mkdeb + as the basis for the package. Alternatively, if DKMS finds a file called +-.I /usr/src/-/-dkms-mkdeb ++.I /usr/src/\-/\-dkms\-mkdeb + it will use that folder instead. In general, a DKMS tarball is placed inside the + contents of this package, and the package itself calls various DKMS commands to + load this tarball, build and install modules on the end user's system. If you do + not want your debian package to contain any prebuilt binaries, be sure to specify +-.B --source-only ++.B \-\-source\-only + in the mkdeb command. + .TP + .B mkdsc +@@ -177,20 +177,20 @@ This action allows you to create a debia + It will create a .tar.gz, and a .dsc. All options supported by + .B mkdeb + are supported by it. The main difference in it's usage is that it will look in +-.I /etc/dkms/template-dkms-mkdsc ++.I /etc/dkms/template\-dkms\-mkdsc + as the basis for the package. Alternatively, if DKMS finds a file called +-.I /usr/src/-/-dkms-mkdsc ++.I /usr/src/\-/\-dkms\-mkdsc + it will use that folder instead. If you do not want your debian source package to + contain any prebuilt binaries, be sure to specify +-.B --source-only ++.B \-\-source\-only + in the mkdsc command. + .TP + .B mkkmp + This action allows you to create an Kernel Module Package source RPM for a specified module / version. + It uses the .spec file specified by +-.I --spec=specfile ++.I \-\-spec=specfile + else +-.I $module-kmp.spec ++.I $module\-kmp.spec + as the basis for the RPM. The generated source RPM may then be built using SuSE's build.rpm or + Fedora/RHEL's mock chroot environments. See http://kerneldrivers.org/ for + more details on KMPs. +@@ -202,46 +202,46 @@ Status can be shown for just a certain m + a module/version combination or a module/version/kernel combination. + .SH OPTIONS + .TP +-.B -m ++.B \-m + The name of the module. + .TP +-.B -v ++.B \-v + The version of the module to execute the specified action upon. + .TP +-.B -k ++.B \-k + The kernel to perform the action upon. You can specify multiple kernel versions +-on the command line by repeating the -k argument with a different kernel name. ++on the command line by repeating the \-k argument with a different kernel name. + However, not all actions support multiple kernel versions (it will error out + in this case). + .TP +-.B -a, --arch ++.B \-a, \-\-arch + The system architecture to perform the action upon. If not specified, it assumes +-the arch of the currently running system (`uname -m`). You can specify multiple +-arch parameters on the same command line by repeating the -a argument with a ++the arch of the currently running system (`uname \-m`). You can specify multiple ++arch parameters on the same command line by repeating the \-a argument with a + different arch name. When multiple architectures are specified, there must +-be a 1:1 relationship between -k arguments to -a arguments. DKMS will then +-assume the first -a argument aligns with the first -k kernel and so on for the ++be a 1:1 relationship between \-k arguments to \-a arguments. DKMS will then ++assume the first \-a argument aligns with the first \-k kernel and so on for the + second, third, etc. + +-For example, if you were to specify: -k kernel1 -k kernel2 -a i386 -k kernel3 -a i686 -a x86_64, ++For example, if you were to specify: \-k kernel1 \-k kernel2 \-a i386 \-k kernel3 \-a i686 \-a x86_64, + DKMS would process this as: kernel1-i386, kernel2-i686, kernel3-x86_64. + .TP +-.B -q, --quiet ++.B \-q, \-\-quiet + Quiet. + .TP +-.B -V, --version ++.B \-V, \-\-version + Prints the currently installed version of dkms and exits. + .TP +-.B -c ++.B \-c + The location of the + .I dkms.conf + file. This is needed for the add action and if not specified, + it is assumed to be located in +-.I /usr/src/-/. ++.I /usr/src/\-/. + See below for more information on the format of + .I dkms.conf. + .TP +-.B -d, --distro ++.B \-d, \-\-distro + The distribution being used. This is only currently needed for + .B mkdriverdisk. + The supported distros are +@@ -255,26 +255,26 @@ and + .B mkkmp + for more information. + .TP +-.B -r, --release ++.B \-r, \-\-release + The release being used. This is only currently used for + .B mkdriverdisk +-and is only used for suse or UnitedLinux distros (eg. -r 9.1). It is ++and is only used for suse or UnitedLinux distros (eg. \-r 9.1). It is + used in the internal makeup of the driverdisk. + .TP +-.B --size ++.B \-\-size + The size of the driver disk image to be created. By default, this value is set + at 1440. Any different size should be given as an integer value only, should + be divisible by 20 and should represent the number of kilobytes of the image + size you desire. + .TP +-.B --config ++.B \-\-config + During a + .B build + this option is used to specify an alternate location for the kernel .config + file which was used to compile that kernel. Normally, + .B dkms + uses the Red Hat standard location and config filenames located in +-.I /usr/src/linux-/configs/. ++.I /usr/src/linux\-/configs/. + If the config for the kernel that you + are building a module for is not located here or does not have the expected + name in this location, you will need to tell +@@ -282,25 +282,25 @@ name in this location, you will need to + where the necessary .config can be found so that your kernel can be properly + prepared for the module build. + .TP +-.B --archive ++.B \-\-archive + This option is used during a + .B ldtarball + action to specify the location of the tarball you wish to load into + your DKMS tree. + .TP +-.B --templatekernel ++.B \-\-templatekernel + This option is required for the action: + .B match. + Match will look at the + templatekernel specified and install all of the same module/version + combinations on the other kernel. + .TP +-.B --force ++.B \-\-force + This option can be used in conjunction with + .B ldtarball + to force copying over of already existant files. + .TP +-.B --binaries-only ++.B \-\-binaries\-only + This option can be used in conjunction with + .B mktarball + in order to create a DKMS tarball which does not contain the source for the +@@ -312,7 +312,7 @@ have the module source in that systems D + .B will refuse + to load a binaries-only tarball. + .TP +-.B --source-only ++.B \-\-source\-only + This option can be used in conjunction with + .B mktarball + or +@@ -328,38 +328,38 @@ but do not want the RPM you create to ha + passing this option will keep its internal DKMS tarball from containing any + prebuilt modules. + .TP +-.B --all ++.B \-\-all + This option can be used to automatically specify all relevant kernels/arches + for a module/module-version. This is useful for things like + .B remove + , + .B mktarball +-, etc. This saves the trouble of having to actually specify -k kernel1 -a +-arch1 -k kernel2 -a arch2 for every kernel you have built your module for. ++, etc. This saves the trouble of having to actually specify \-k kernel1 \-a ++arch1 \-k kernel2 \-a arch2 for every kernel you have built your module for. + .TP +-.B --no-prepare-kernel ++.B \-\-no\-prepare\-kernel + This option keeps DKMS from first preparing your kernel before building + a module for it. Generally, this option should not be used so as to + ensure that modules are compiled correctly. + .TP +-.B --no-clean-kernel ++.B \-\-no\-clean\-kernel + This option keeps DKMS from cleaning your kernel source tree after a + build. + .TP +-.B --kernelsourcedir ++.B \-\-kernelsourcedir + Using this option you can specify the location of your kernel source + directory. Most likely you will not need to set this if your kernel + source is accessible via + .I /lib/modules/$kernel_version/build. + .TP +-.B --directive <"cli-directive=cli-value"> ++.B \-\-directive <"cli\-directive=cli\-value"> + Using this option, you can specify additional directives from the command + line. The +-.B --directive ++.B \-\-directive + option can be used multiple times on the same command-line to specify + multiple additional command line directives. + .TP +-.B --rpm_safe_upgrade ++.B \-\-rpm_safe_upgrade + This flag should be used when packaging DKMS enabled modules in RPMs. It should + be specified during both the + .B add +@@ -370,27 +370,27 @@ scenarios when upgrading between various + RPM package. See the sample.spec file for an example or read more in the section + below on Creating RPMs Which Utilize DKMS. + .TP +-.B --spec specfile ++.B \-\-spec specfile + This option is used by the + .B mkkmp + action to specify which RPM spec file to use when generating the KMP. + .I specfile + will be sought in the module source directory. + .TP +-.B --dkmstree path/to/place ++.B \-\-dkmstree path/to/place + Provides a destination tree for building and installing modules to. Useful in + cases that you don't want to contaminate a system when using solely for building. + .TP +-.B --sourcetree path/to/place ++.B \-\-sourcetree path/to/place + Provides a location to build a DKMS package from. Useful for systems that you may + not have root access, but would still like to be able to build DKMS packages. + .TP +-.B --installtree path/to/place ++.B \-\-installtree path/to/place + Provides a location to place modules when a + .I dkms install + command is issued. + .TP +-.B --dkmsframework path/to/file ++.B \-\-dkmsframework path/to/file + A supplemental configuration file to the systemwide dkms framework, typically located + in /etc/dkms/framework.conf. All option that are normally provided on a command line + can be provided in this file. +@@ -433,11 +433,11 @@ how and where the module should be insta + are required, providing as many as possible helps to limit any ambiguity. Note + that the + .I dkms.conf +-is really only a shell-script of variable definitions which are then sourced in ++is really only a shell\-script of variable definitions which are then sourced in + by the + .B dkms + executable (of the format, DIRECTIVE="directive text goes here"). As well, the +-directives are case-sensitive and should be given in ++directives are case\-sensitive and should be given in + .B ALL CAPS. + + It is important to understand that many of the DKMS directives are arrays whose index +@@ -547,7 +547,7 @@ your module will be added as "scsi_hosta + include: + .B scsi_hostadapter + , +-.B sound-slot- ++.B sound\-slot\- + and + .B eth. + Note that the numeric value of +@@ -558,7 +558,7 @@ and DEST_MODULE_LOCATION. The index is + .B MODULES_CONF_OBSOLETES[#]= + This directive array tells DKMS what modules.conf alias references are obsoleted by the + module you are installing. If your module obsoletes more than one module, this directive +-should be a comma-delimited list of those modules that are obsoleted (eg. for megaraid2, ++should be a comma\-delimited list of those modules that are obsoleted (eg. for megaraid2, + MODULES_CONF_OBSOLETES[0]="megaraid,megaraid_2002"). When you are installing your module, + DKMS ensures that any entries in + .I /etc/modules.conf +@@ -568,12 +568,12 @@ are changed over to the new module name. + your module, depending on the modules in your + .I /lib/modules + tree, DKMS will take different actions. +-If you kernel has an original_module, then modules.conf will not be touched and the non-obsolete ++If you kernel has an original_module, then modules.conf will not be touched and the non\-obsolete + reference will remain. If the kernel does not have an original_module but does have one + of the obsolete modules, it will replace those references with the first obsolete module name in +-the comma-delimited list that is also in that kernel (thus, your obsolete list should be prioritized ++the comma\-delimited list that is also in that kernel (thus, your obsolete list should be prioritized + from left to right). If no original_module or obsolete modules are found within the kernel, the alias +-entry is removed all-together. Note that the numeric value of ++entry is removed all\-together. Note that the numeric value of + .B # + is tied to the index of BUILD_MODULE_NAME, BUILT_MODULE_LOCATION, DEST_MODULE_NAME + and DEST_MODULE_LOCATION. The index is also tied to MODULES_CONF_ALIAS_TYPE. +@@ -589,12 +589,12 @@ array directive. + .TP + .B STRIP[#]= + By default strip is considered to be "yes". If set to "no", DKMS will not +-run strip -g against your built module to remove debug symbols from it. ++run strip \-g against your built module to remove debug symbols from it. + .TP + .B PACKAGE_NAME= + This directive is used to give the name associated with the entire package of modules. This is the same + name that is used with the +-.B -m ++.B \-m + option when building, adding, etc. and may not necessarily be the same as the MODULE_NAME. This + directive must be present in every dkms.conf. + .TP +@@ -630,7 +630,7 @@ implications of modifying + .B OBSOLETE_BY= + This directive allows you to specify a kernel version that obsoletes the necessity for this + particular DKMS module. This can be specified as a particular upstream kernel or an ABI +-bump of a kernel. For example, "2.6.24" would be an upstream kernel and "2.6.24-16" would ++bump of a kernel. For example, "2.6.24" would be an upstream kernel and "2.6.24\-16" would + represent an ABI bump for a kernel. Both are valid in this area. + + Please avoid the use of +@@ -651,8 +651,8 @@ If you feel you must use it, please use + + ubuntu_804="Ubuntu + 8.04" +- if [ -x /usr/bin/lsb_release ]; then +- if [ "$(/usr/bin/lsb_release -sir)" == "${ubuntu_804}" ]; then ++ if [ \-x /usr/bin/lsb_release ]; then ++ if [ "$(/usr/bin/lsb_release \-sir)" == "${ubuntu_804}" ]; then + OBSOLETE_BY="2.6.25" + fi + fi +@@ -660,13 +660,13 @@ If you feel you must use it, please use + .TP + .B PATCH[#]= + Use the PATCH directive array to specify patches which should be applied to your source before a build occurs. +-All patches are expected to be in -p1 format and are applied with the patch -p1 command. ++All patches are expected to be in \-p1 format and are applied with the patch \-p1 command. + Each directive should specify the filename of the patch to apply, and all patches must + be located in the patches subdirectory of your source directory ( +-.I /usr/src/-/patches/ ++.I /usr/src/\-/patches/ + ). If any patch fails to apply, the build will be halted and the rejections can be + inspected in +-.I /var/lib/dkms///build/. ++.I /var/lib/dkms///build/. + If a PATCH should only be applied conditionally, the + .B PATCH_MATCH[#] + array should be used, and a corresponding regular expression should be placed in +@@ -737,14 +737,14 @@ is performed. The path should be given r + The name of the script to be run before an + .B install + is performed. The path should be given relative to the root directory +-of your source. If the script exits with a non-zero value, the ++of your source. If the script exits with a non\-zero value, the + install will be aborted. This is typically used to perform a custom + version comparison. + .TP + .SH DKMS.CONF VARIABLES + Within your + .I dkms.conf +-file, you can use certain variables which will be replaced at run-time with their ++file, you can use certain variables which will be replaced at run\-time with their + values. + .TP + .B $kernelver +@@ -757,14 +757,14 @@ module (eg. MAKE="make all INCLUDEDIR=/l + See the section on /etc/dkms/framework.conf for more information. This variable represents + the location of the DKMS tree on the local system. By default this is + .I /var/lib/dkms +-, but this value should not be hard-coded into a dkms.conf in the event that the local user ++, but this value should not be hard\-coded into a dkms.conf in the event that the local user + has changed it on their system. + .TP + .B $source_tree + See the section on /etc/dkms/framework.conf for more information. This variable represents + the location where DKMS keeps source on the local system. By default this is + .I /usr/src +-, but this value should not be hard-coded into a dkms.conf in the event that the local user ++, but this value should not be hard\-coded into a dkms.conf in the event that the local user + has changed it on their system. + .TP + .B $kernel_source_dir +@@ -772,7 +772,7 @@ This variable holds the value of the loc + will be + .I /lib/modules/$kernelver/build + , unless otherwise specified with the +-.B --kernelsourcedir ++.B \-\-kernelsourcedir + option. + .SH /etc/dkms/framework.conf + This configuration file controls how the overall DKMS framework handles. It is sourced +@@ -784,10 +784,10 @@ default values for the variables. + and + .B $install_tree + which control where DKMS looks for its framework. Note that these variables can also +-be manipulated on the command line with --dkmstree, --sourcetree +-and --installtree options. ++be manipulated on the command line with \-\-dkmstree, \-\-sourcetree ++and \-\-installtree options. + .SH dkms_autoinstaller +-This boot-time service automatically installs any module which has ++This boot\-time service automatically installs any module which has + .B AUTOINSTALL="yes" + set in its + .B dkms.conf +@@ -868,8 +868,8 @@ file packaged with + as an example for what your RPM spec file might look like. + Creating RPMs which utilize + .B dkms +-is a fairly straight-forward process. The RPM need only to install the source into +-.I /usr/src/-/ ++is a fairly straight\-forward process. The RPM need only to install the source into ++.I /usr/src/\-/ + and then employ + .B dkms + itself to do all the work of installation. As such, the RPM should first untar the source into +@@ -877,29 +877,28 @@ this directory. From here, within the R + .I .spec + file, a + .B dkms add +-should be called (remember to use the --rpm_safe_upgrade flag during the add) followed by a ++should be called (remember to use the \-\-rpm_safe_upgrade flag during the add) followed by a + .B dkms build + followed by a + .B dkms install. + Your + .I dkms.conf + file should be placed within the +-.I /usr/src/-/ ++.I /usr/src/\-/ + directory. + + Under the removal parts of the + .I .spec +-file, all that needs to be called is a: dkms remove -m -v --all --rpm_safe_upgrade. +- ++file, all that needs to be called is a: dkms remove \-m \-v \-\-all \-\-rpm_safe_upgrade. + Use of the +-.B --rpm_safe_upgrade ++.B \-\-rpm_safe_upgrade + flag is imperative for making sure DKMS and RPM play nicely together in all scenarios of using +-the -Uvh flag with RPM to upgrade dkms enabled packages. It will only function if used during ++the \-Uvh flag with RPM to upgrade dkms enabled packages. It will only function if used during + both the add + .B and + remove actions within the same RPM spec file. Its use makes sure that when upgrading between different +-releases of an RPM for the same , DKMS does not do anything dumb (eg. it ensures +-a smooth upgrade from megaraid-2.09-5.noarch.rpm to megaraid-2.09-6.noarch.rpm). ++releases of an RPM for the same , DKMS does not do anything dumb (eg. it ensures ++a smooth upgrade from megaraid\-2.09-5.noarch.rpm to megaraid\-2.09\-6.noarch.rpm). + + It should be noted that a binary RPM which contains source is not a traditional practice. + However, given the benefits of +@@ -911,29 +910,29 @@ is not architecture specific, + should be specified in the + .I .spec + file to indicate that the package can work regardless of the system architecture. Also +-note that DKMS RPM upgrades (-U option) will automatically work because of the structure ++note that DKMS RPM upgrades (\-U option) will automatically work because of the structure + of the + .B dkms + tree. + + Lastly, as a matter of convention, you should name your RPM: +---dkms.noarch.rpm. The word ++\-\-dkms.noarch.rpm. The word + .B dkms +-as part of the rpm-version signifies that the RPM ++as part of the rpm\-version signifies that the RPM + works within the DKMS framework. + .SH AUTHOR + Gary Lerhaupt + .SH WEBPAGE + .I http://linux.dell.com/dkms +-.SH WHITE-PAPERS +-.I http://linux.dell.com/dkms/dkms-ols2004.pdf ++.SH WHITE\-PAPERS ++.I http://linux.dell.com/dkms/dkms\-ols2004.pdf + +-.I http://www.dell.com/downloads/global/power/1q04-ler.pdf ++.I http://www.dell.com/downloads/global/power/1q04\-ler.pdf + + .I http://www.linuxjournal.com/article.php?sid=6896 +-.SH MAILING-LIST +-dkms-devel@dell.com +-.I http://lists.us.dell.com/mailman/listinfo/dkms-devel ++.SH MAILING\-LIST ++dkms\-devel@dell.com ++.I http://lists.us.dell.com/mailman/listinfo/dkms\-devel + .SH REFERENCES + Kernel Module Packages + .I http://kerneldrivers.org --- dkms-2.0.21.0.orig/debian/patches/12-use_invoke-rc.d.patch +++ dkms-2.0.21.0/debian/patches/12-use_invoke-rc.d.patch @@ -0,0 +1,11 @@ +Fix script-calls-init-script-directly lintian warning +--- a/kernel_postinst.d_dkms ++++ b/kernel_postinst.d_dkms +@@ -4,6 +4,6 @@ + inst_kern=$1 + + [ -x /etc/init.d/dkms_autoinstaller ] && \ +- /etc/init.d/dkms_autoinstaller start $inst_kern ++ invoke-rc.d dkms_autoinstaller start $inst_kern + + exit 0 --- dkms-2.0.21.0.orig/debian/patches/04-use_su-to-root.patch +++ dkms-2.0.21.0/debian/patches/04-use_su-to-root.patch @@ -0,0 +1,14 @@ +Use su-to-root if available +--- a/dkms ++++ b/dkms +@@ -3088,7 +3088,9 @@ function make_debian() + ROOT="" + ADMINABLE="" + if [ "$USER" != "root" ]; then +- if [ -x /usr/bin/gksudo ] && [ ! -z "$DISPLAY" ]; then ++ if [ -x /usr/sbin/su-to-root ]; then ++ ROOT="/usr/sbin/su-to-root -c" ++ elif [ -x /usr/bin/gksudo ] && [ ! -z "$DISPLAY" ]; then + ROOT="/usr/bin/gksudo --description 'DKMS Debian package builder' " + elif [ -x /usr/bin/kdesu ] && [ ! -z "$DISPLAY" ]; then + ROOT="/usr/bin/kdesu" --- dkms-2.0.21.0.orig/debian/patches/10-lsb.patch +++ dkms-2.0.21.0/debian/patches/10-lsb.patch @@ -0,0 +1,24 @@ +/etc/lsb-release is not present in Debian, so run run lsb_release +--- a/dkms ++++ b/dkms +@@ -317,6 +317,12 @@ function distro_version() + if [ -r /etc/lsb-release ]; then + . /etc/lsb-release + LSB_RELEASE=1 ++ else ++ if type lsb_release >/dev/null 2>&1; then ++ DISTRIB_ID=$(lsb_release -i -s) ++ DISTRIB_RELEASE=$(lsb_release -r -s) ++ LSB_RELEASE=1 ++ fi + fi + + if [ -n "${FEDORA_RELEASE}" ]; then +@@ -362,6 +368,7 @@ function override_dest_module_location() + sles*) echo "/updates" && return ;; + suse*) echo "/updates" && return ;; + Ubuntu*) echo "/updates/dkms" && return ;; ++ Debian*) echo "/updates/dkms" && return ;; + *) ;; + esac + echo "$orig_location" --- dkms-2.0.21.0.orig/debian/patches/03-use-new-header_postinst.d_directory.patch +++ dkms-2.0.21.0/debian/patches/03-use-new-header_postinst.d_directory.patch @@ -0,0 +1,15 @@ +Use /etc/kernel/header_postinst.d directory +--- a/Makefile ++++ b/Makefile +@@ -49,9 +49,9 @@ install: + gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz + chmod 0644 $(MAN)/dkms.8.gz + touch --reference=dkms.8 $(MAN)/dkms.8.gz +- mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d ++ mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/header_postinst.d + install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms +- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms ++ install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/header_postinst.d/dkms + + DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec + --- dkms-2.0.21.0.orig/debian/patches/06-fakeroot.patch +++ dkms-2.0.21.0/debian/patches/06-fakeroot.patch @@ -0,0 +1,17 @@ +Do not use fakeroot for source-only build, and use -rfakeroot for binary build +--- a/dkms ++++ b/dkms +@@ -3210,11 +3210,11 @@ function make_debian() + pushd "$temp_dir_debian" > /dev/null 2>&1 + case "$create_type" in + dsc) +- invoke_command "fakeroot dpkg-buildpackage -S -us -uc 1>/dev/null" "Building source package" ++ invoke_command "dpkg-buildpackage -S -us -uc 1>/dev/null" "Building source package" + invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" + ;; + deb) +- invoke_command "fakeroot dpkg-buildpackage -b -us -uc 1>/dev/null" "Building binary package" ++ invoke_command "dpkg-buildpackage -rfakeroot -b -us -uc 1>/dev/null" "Building binary package" + invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir" + ;; + esac --- dkms-2.0.21.0.orig/debian/patches/09-lilo_detection.patch +++ dkms-2.0.21.0/debian/patches/09-lilo_detection.patch @@ -0,0 +1,12 @@ +check /etc/kernel-img.conf to find if user is using grub +--- a/dkms ++++ b/dkms +@@ -272,7 +272,7 @@ function remake_initrd() + fi + + # Rerun lilo if necessary +- if ! [ -e /boot/grub/grub.conf ] && [ -e /etc/lilo.conf ] && ! [ -e /boot/grub/menu.lst ]; then ++ if ( grep ^do_bootloader /etc/kernel-img.conf | grep -qi yes ) && [ -e /etc/lilo.conf ]; then + invoke_command "/sbin/lilo" "Updating lilo" + fi + --- dkms-2.0.21.0.orig/debian/patches/08-support_kernel-img.conf.patch +++ dkms-2.0.21.0/debian/patches/08-support_kernel-img.conf.patch @@ -0,0 +1,49 @@ +Use update-initramfs tool instead of mkinitrd/mkinitrd.yaird/mkinitramfs +--- a/dkms ++++ b/dkms +@@ -212,6 +212,20 @@ function remake_initrd() + mkinitrd='mkinitramfs' + fi + ++ # Support /etc/kernel-img.conf (Debian) ++ if [ -f "/etc/kernel-img.conf" ]; then ++ # we use the first one listed ++ mkinitrd=$(sed -e '/^\s*ramdisk/!d' \ ++ -e 's/^\s*ramdisk\s*=\s*\(.*\)/\1/' \ ++ -e "s/['\"]*//g" \ ++ /etc/kernel-img.conf | \ ++ awk '{print $1}') ++ else ++ if type update-initramfs >/dev/null 2>&1; then ++ mkinitrd='update-initramfs' ++ fi ++ fi ++ + $mkinitrd --version >/dev/null 2>&1 + if [ "$?" -eq 0 ]; then + echo $"" +@@ -235,11 +249,20 @@ function remake_initrd() + elif [ -e /etc/debian_version ]; then + echo $"" + initrd_dir="/boot" +- echo $"Saving old initrd as $initrd_dir/initrd.img_old-$1" +- cp -f "$initrd_dir/initrd.img-$1" "$initrd_dir/initrd.img_old-$1" ++ echo $"Updating initrd" + echo $"Making new initrd as $initrd_dir/initrd.img-$1" +- echo $"(If next boot fails, revert to the _old initrd image)" +- invoke_command "$mkinitrd -o $initrd_dir/initrd.img-$1 $1" "$mkinitrd" background ++ echo $"(If next boot fails, revert to the .bak initrd image)" ++ if [ -f "/etc/initramfs-tools/update-initramfs.conf" ] && \ ++ ! ( grep ^update_initramfs /etc/initramfs-tools/update-initramfs.conf | grep -qi no ) && \ ++ [ "$mkinitrd" == "update-initramfs" ]; then ++ invoke_command "$mkinitrd -u" "$mkinitrd" background ++ else ++ echo $"Saving old initrd as $initrd_dir/initrd.img_old-$1" ++ # we use the same convention as update-initramfs, so that we just ++ # print the warning once ++ cp -f "$initrd_dir/initrd.img-$1" "$initrd_dir/initrd.img-$1.bak" ++ invoke_command "$mkinitrd -o $initrd_dir/initrd.img-$1 $1" "$mkinitrd" background ++ fi + exitval="$?" + else + echo $"" --- dkms-2.0.21.0.orig/debian/patches/02-fix_distribution.patch +++ dkms-2.0.21.0/debian/patches/02-fix_distribution.patch @@ -0,0 +1,12 @@ +replace intrepid (Ubuntu) DIST with unstable +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ RELEASE_EXTRALEVEL := .0 + RELEASE_NAME := dkms + RELEASE_VERSION := $(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL) + RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_VERSION) +-DIST := intrepid ++DIST := unstable + SHELL=bash + + SBIN = $(DESTDIR)/usr/sbin --- dkms-2.0.21.0.orig/debian/patches/05-do_not_check_admin_group.patch +++ dkms-2.0.21.0/debian/patches/05-do_not_check_admin_group.patch @@ -0,0 +1,21 @@ +admin group is not a standard group in Debian, so check only if $ROOT is non-null +--- a/dkms ++++ b/dkms +@@ -3076,7 +3076,7 @@ function make_debian() + + make_common_test "mk${create_type}" + +- debian_package=$(echo $module | sed s/_/-/) ++ debian_package=$(echo $module | sed s/_/-/g) + + SYNAPTIC="" + #Synaptic availablity +@@ -3116,7 +3116,7 @@ function make_debian() + #test if we are missing dependencies that are needed during package build + INSTALL_PACKAGES="`make_debian_test_depends`" + if [ ! -z "$INSTALL_PACKAGES" ]; then +- if [ -z "ADMINABLE" ]; then ++ if [ -z "$ROOT" ]; then + echo $"" >&2 + echo $"Error! Missing $INSTALL_PACKAGES" >&2 + echo $"and unable to install. Please ask an admin to install for you." >&2 --- dkms-2.0.21.0.orig/debian/patches/11-bash-completion.patch +++ dkms-2.0.21.0/debian/patches/11-bash-completion.patch @@ -0,0 +1,28 @@ +Merge patch from Mandriva to bash-completion snippet. +Edited by David Paleino +--- a/dkms.bash-completion ++++ b/dkms.bash-completion +@@ -5,20 +5,19 @@ + # + _kernels() + { +- COMPREPLY=( $( command ls /lib/modules | grep "^$cur" ) ) ++ COMPREPLY=( $( cd /lib/modules && compgen -d -- "$cur" ) ) + } + + # complete on full directory names under $1 + _subdirectories() + { +- COMPREPLY=( $( command ls -F $1 2>/dev/null | awk -F \/ '/\/$/ \ +- {print $1}' | grep "^$cur" ) ) ++ COMPREPLY=( $( cd $1 && compgen -d -- "$cur" ) ) + } + + # complete on $2 part of filenames matching pattern $1 under /usr/src + _filename_parts() + { +- COMPREPLY=( $( command ls -F /usr/src 2>/dev/null | grep -E '^'$1'/$' \ ++ COMPREPLY=( $( command ls -F /usr/src/ 2>/dev/null | grep -E '^'$1'/$' \ + | sed -r -e 's/^([^-]+)-(.+)\/$/\'$2'/' | grep "^$cur" ) ) + } +