[Pkg-dkms-commits] [SCM] Maintenance of the dkms package branch, master, updated. upstream/2.0.20.4-50-g5cb2c60
Giuseppe Iuculano
giuseppe at iuculano.it
Sat Jan 24 10:56:10 UTC 2009
The following commit has been merged in the master branch:
commit 6723982f2e569022dbee7f2358e2203631e200c0
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date: Sat Jan 24 11:37:21 2009 +0100
debian/patches/: Refreshed patches, and deleted 03-remove_dkms_lib_directory_if_empty.patch (now it is in upstream)
diff --git a/debian/patches/01-fix_manpage.patch b/debian/patches/01-fix_manpage.patch
index 361b604..b9869c0 100644
--- a/debian/patches/01-fix_manpage.patch
+++ b/debian/patches/01-fix_manpage.patch
@@ -22,7 +22,7 @@ fix Lintian info hypen-used-as-minus-sign
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/dkms/<module>/<module-version>/build/.
+-.I /var/lib/dkms/<module>/<module-version>/build/.
+.I /var/lib/dkms/<module>/<module\-version>/build/.
.TP
.B install
@@ -383,15 +383,6 @@ fix Lintian info hypen-used-as-minus-sign
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.
-@@ -417,7 +417,7 @@ replaced.
- If more than one is found, then the first one located (by preference indicated
- above) will be considered the "original_module". As well, all copies of the same-named
- module will be removed from your kernel tree and placed into
--.I /var/dkms/<module>/original_module/$kernelver/collisions
-+.I /var/lib/dkms/<module>/original_module/$kernelver/collisions
- so that they can be *manually* accessible later. DKMS will never actually do anything
- with the modules found underneath the /collisions directory, and they will be stored there
- until you manually delete them.
@@ -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
@@ -455,7 +446,7 @@ fix Lintian info hypen-used-as-minus-sign
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
-@@ -622,7 +622,7 @@ implications of modifying
+@@ -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
@@ -464,7 +455,7 @@ fix Lintian info hypen-used-as-minus-sign
represent an ABI bump for a kernel. Both are valid in this area.
Please avoid the use of
-@@ -643,8 +643,8 @@ If you feel you must use it, please use
+@@ -651,8 +651,8 @@ If you feel you must use it, please use
ubuntu_804="Ubuntu
8.04"
@@ -475,7 +466,7 @@ fix Lintian info hypen-used-as-minus-sign
OBSOLETE_BY="2.6.25"
fi
fi
-@@ -652,13 +652,13 @@ If you feel you must use it, please use
+@@ -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.
@@ -487,12 +478,12 @@ fix Lintian info hypen-used-as-minus-sign
+.I /usr/src/<module>\-<module\-version>/patches/
). If any patch fails to apply, the build will be halted and the rejections can be
inspected in
--.I /var/dkms/<module>/<module-version>/build/.
+-.I /var/lib/dkms/<module>/<module-version>/build/.
+.I /var/lib/dkms/<module>/<module\-version>/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
-@@ -729,14 +729,14 @@ is performed. The path should be given r
+@@ -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
@@ -509,13 +500,11 @@ fix Lintian info hypen-used-as-minus-sign
values.
.TP
.B $kernelver
-@@ -748,15 +748,15 @@ module (eg. MAKE="make all INCLUDEDIR=/l
- .B $dkms_tree
+@@ -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/dkms
+ .I /var/lib/dkms
-, but this value should not be hard-coded into a dkms.conf in the event that the local user
-+.I /var/lib/dkms
+, 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
@@ -528,7 +517,7 @@ fix Lintian info hypen-used-as-minus-sign
has changed it on their system.
.TP
.B $kernel_source_dir
-@@ -764,7 +764,7 @@ This variable holds the value of the loc
+@@ -772,7 +772,7 @@ This variable holds the value of the loc
will be
.I /lib/modules/$kernelver/build
, unless otherwise specified with the
@@ -537,7 +526,7 @@ fix Lintian info hypen-used-as-minus-sign
option.
.SH /etc/dkms/framework.conf
This configuration file controls how the overall DKMS framework handles. It is sourced
-@@ -776,10 +776,10 @@ default values for the variables.
+@@ -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
@@ -551,7 +540,7 @@ fix Lintian info hypen-used-as-minus-sign
.B AUTOINSTALL="yes"
set in its
.B dkms.conf
-@@ -860,8 +860,8 @@ file packaged with
+@@ -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
@@ -562,7 +551,7 @@ fix Lintian info hypen-used-as-minus-sign
and then employ
.B dkms
itself to do all the work of installation. As such, the RPM should first untar the source into
-@@ -869,29 +869,28 @@ this directory. From here, within the R
+@@ -877,29 +877,28 @@ this directory. From here, within the R
.I .spec
file, a
.B dkms add
@@ -599,7 +588,7 @@ fix Lintian info hypen-used-as-minus-sign
It should be noted that a binary RPM which contains source is not a traditional practice.
However, given the benefits of
-@@ -903,29 +902,29 @@ is not architecture specific,
+@@ -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
diff --git a/debian/patches/02-fix_distribution.patch b/debian/patches/02-fix_distribution.patch
index 7d32d21..4beda4e 100644
--- a/debian/patches/02-fix_distribution.patch
+++ b/debian/patches/02-fix_distribution.patch
@@ -1,7 +1,7 @@
replace intrepid (Ubuntu) DIST with unstable
---- trunk.orig/Makefile
-+++ trunk/Makefile
-@@ -6,7 +6,7 @@
+--- 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)
diff --git a/debian/patches/03-remove_dkms_lib_directory_if_empty.patch b/debian/patches/03-remove_dkms_lib_directory_if_empty.patch
deleted file mode 100644
index 93cd335..0000000
--- a/debian/patches/03-remove_dkms_lib_directory_if_empty.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Merge from Ubuntu, ensure that the /lib/modules/<version>/updates/dkms
-directory is removed if it is empty after a removal. This allows the
-modules directory to be removed as it becomes empty.
---- a/kernel_prerm.d_dkms
-+++ b/kernel_prerm.d_dkms
-@@ -13,4 +13,7 @@
- done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
- fi
-
-+rmdir --ignore-fail-on-non-empty \
-+ "/lib/modules/$inst_kern/updates/dkms" \
-+ "/lib/modules/$inst_kern/updates"
- exit 0
diff --git a/debian/patches/04-use_su-to-root.patch b/debian/patches/04-use_su-to-root.patch
index e0e3db1..0315e20 100644
--- a/debian/patches/04-use_su-to-root.patch
+++ b/debian/patches/04-use_su-to-root.patch
@@ -1,7 +1,7 @@
Use su-to-root if available
--- a/dkms
+++ b/dkms
-@@ -3005,7 +3005,9 @@
+@@ -3088,7 +3088,9 @@ function make_debian()
ROOT=""
ADMINABLE=""
if [ "$USER" != "root" ]; then
diff --git a/debian/patches/05-do_not_check_admin_group.patch b/debian/patches/05-do_not_check_admin_group.patch
index 7365534..555dc31 100644
--- a/debian/patches/05-do_not_check_admin_group.patch
+++ b/debian/patches/05-do_not_check_admin_group.patch
@@ -1,7 +1,7 @@
admin group is not a standard group in Debian, so check only if $ROOT is non-null
--- a/dkms
+++ b/dkms
-@@ -2993,7 +2993,7 @@
+@@ -3076,7 +3076,7 @@ function make_debian()
make_common_test "mk${create_type}"
@@ -10,7 +10,7 @@ admin group is not a standard group in Debian, so check only if $ROOT is non-nul
SYNAPTIC=""
#Synaptic availablity
-@@ -3033,7 +3033,7 @@
+@@ -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
diff --git a/debian/patches/06-fakeroot.patch b/debian/patches/06-fakeroot.patch
index ed4ceea..41dcb93 100644
--- a/debian/patches/06-fakeroot.patch
+++ b/debian/patches/06-fakeroot.patch
@@ -1,7 +1,7 @@
Do not use fakeroot for source-only build, and use -rfakeroot for binary build
--- a/dkms
+++ b/dkms
-@@ -3127,11 +3127,11 @@
+@@ -3210,11 +3210,11 @@ function make_debian()
pushd "$temp_dir_debian" > /dev/null 2>&1
case "$create_type" in
dsc)
diff --git a/debian/patches/07-exit-if-build-fails.patch b/debian/patches/07-exit-if-build-fails.patch
index f10b0a9..0a7ae26 100644
--- a/debian/patches/07-exit-if-build-fails.patch
+++ b/debian/patches/07-exit-if-build-fails.patch
@@ -1,7 +1,7 @@
Fix exit when build fails
--- a/dkms
+++ b/dkms
-@@ -3128,10 +3128,27 @@
+@@ -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"
@@ -29,8 +29,8 @@ Fix exit when build fails
invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
;;
esac
-@@ -3140,12 +3157,9 @@
- invoke_command "rm $temp_dir -fr" "Cleaning up temporary files"
+@@ -3230,12 +3247,9 @@ function make_debian()
+ delete_temporary_trees
#done
- if [ "$?" -eq 0 ]; then
diff --git a/debian/patches/08-support_kernel-img.conf.patch b/debian/patches/08-support_kernel-img.conf.patch
index 832a716..cc73ca7 100644
--- a/debian/patches/08-support_kernel-img.conf.patch
+++ b/debian/patches/08-support_kernel-img.conf.patch
@@ -1,7 +1,7 @@
Use update-initramfs tool instead of mkinitrd/mkinitrd.yaird/mkinitramfs
--- a/dkms
+++ b/dkms
-@@ -212,6 +212,20 @@
+@@ -212,6 +212,20 @@ function remake_initrd()
mkinitrd='mkinitramfs'
fi
@@ -22,7 +22,7 @@ Use update-initramfs tool instead of mkinitrd/mkinitrd.yaird/mkinitramfs
$mkinitrd --version >/dev/null 2>&1
if [ "$?" -eq 0 ]; then
echo $""
-@@ -235,11 +249,20 @@
+@@ -235,11 +249,20 @@ function remake_initrd()
elif [ -e /etc/debian_version ]; then
echo $""
initrd_dir="/boot"
diff --git a/debian/patches/09-lilo_detection.patch b/debian/patches/09-lilo_detection.patch
index 02806b2..57861a5 100644
--- a/debian/patches/09-lilo_detection.patch
+++ b/debian/patches/09-lilo_detection.patch
@@ -1,7 +1,7 @@
check /etc/kernel-img.conf to find if user is using grub
---- dkms.orig/dkms
-+++ dkms/dkms
-@@ -272,7 +272,7 @@
+--- a/dkms
++++ b/dkms
+@@ -272,7 +272,7 @@ function remake_initrd()
fi
# Rerun lilo if necessary
diff --git a/debian/patches/10-lsb.patch b/debian/patches/10-lsb.patch
index 7ab8f27..d5c30df 100644
--- a/debian/patches/10-lsb.patch
+++ b/debian/patches/10-lsb.patch
@@ -1,7 +1,7 @@
/etc/lsb-release is not present in Debian, so run run lsb_release
---- dkms.orig/dkms
-+++ dkms/dkms
-@@ -317,6 +317,12 @@
+--- a/dkms
++++ b/dkms
+@@ -317,6 +317,12 @@ function distro_version()
if [ -r /etc/lsb-release ]; then
. /etc/lsb-release
LSB_RELEASE=1
@@ -14,7 +14,7 @@
fi
if [ -n "${FEDORA_RELEASE}" ]; then
-@@ -362,6 +368,7 @@
+@@ -362,6 +368,7 @@ function override_dest_module_location()
sles*) echo "/updates" && return ;;
suse*) echo "/updates" && return ;;
Ubuntu*) echo "/updates/dkms" && return ;;
diff --git a/debian/patches/11-bash-completion.patch b/debian/patches/11-bash-completion.patch
index 3d36c71..a1e91e1 100644
--- a/debian/patches/11-bash-completion.patch
+++ b/debian/patches/11-bash-completion.patch
@@ -1,63 +1,28 @@
Merge patch from Mandriva to bash-completion snippet.
Edited by David Paleino <d.paleino at gmail.com>
---- dkms.orig/dkms.bash-completion
-+++ dkms/dkms.bash-completion
-@@ -5,7 +5,20 @@
+--- 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=( $( 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'/$' \
-+ | sed -r -e 's/^([^-]+)-(.+)\/$/\'$2'/' | grep "^$cur" ) )
}
- _dkms()
-@@ -22,9 +35,14 @@
- else
-
- prev=${COMP_WORDS[COMP_CWORD-1]}
-+ command=${COMP_WORDS[1]}
- case $prev in
- -m)
-- COMPREPLY=( $( command ls -F /var/lib/dkms | grep '/$' | sed -e 's|/$||' | grep "^$cur" ) )
-+ if [ "$command" = 'add' ]; then
-+ _filename_parts '.*-.*' 1
-+ else
-+ _subdirectories /var/lib/dkms
-+ fi
- return 0
- ;;
- -v)
-@@ -35,7 +53,11 @@
- fi
- done
- if [ -n "$module" ]; then
-- COMPREPLY=( $( command ls -F /var/lib/dkms/$module | grep '/$' | sed -e 's|/$||' | grep "^$cur" ) )
-+ if [ "$command" = 'add' ]; then
-+ _filename_parts "$module-.*" 2
-+ else
-+ _subdirectories /var/lib/dkms/$module
-+ fi
- return 0
- fi
- ;;
-@@ -53,7 +75,6 @@
- ;;
- esac
+ # 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" ) )
+ }
-- command=${COMP_WORDS[1]}
+ # 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" ) )
+ }
- if [[ "$cur" == -* ]]; then
- case $command in
diff --git a/debian/patches/series b/debian/patches/series
index cafa19f..f2fa718 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
01-fix_manpage.patch
02-fix_distribution.patch
-03-remove_dkms_lib_directory_if_empty.patch
04-use_su-to-root.patch
05-do_not_check_admin_group.patch
06-fakeroot.patch
--
Maintenance of the dkms package
More information about the Pkg-dkms-commits
mailing list