changed debian/source/format to native

This commit is contained in:
luoyaoming 2022-10-09 17:17:08 +08:00 committed by cckylin-cibot
parent 13dec9fbdd
commit 11099c6a0b
6 changed files with 77 additions and 34 deletions

View File

@ -1,9 +1,17 @@
Author: Andreas Beckmann <anbe@debian.org> From: Andreas Beckmann <anbe@debian.org>
Description: add BUILD_EXCLUSIVE_CONFIG Date: Sun, 9 Oct 2022 09:17:33 +0000
support build exclusion depending on kernel features being present/absent, Subject: add BUILD_EXCLUSIVE_CONFIG
e.g. BUILD_EXCLUSIVE_CONFIG="CONFIG_FOO !CONFIG_BAR"
Forwarded: https://github.com/dell/dkms/issues/219 Forwarded: https://github.com/dell/dkms/issues/219
support build exclusion depending on kernel features being present/absent,
e.g. BUILD_EXCLUSIVE_CONFIG="CONFIG_FOO !CONFIG_BAR"
---
dkms.in | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/dkms.in b/dkms.in
index e002b1c..68272d3 100644
--- a/dkms.in --- a/dkms.in
+++ b/dkms.in +++ b/dkms.in
@@ -28,6 +28,7 @@ shopt -s extglob @@ -28,6 +28,7 @@ shopt -s extglob
@ -14,7 +22,7 @@ Forwarded: https://github.com/dell/dkms/issues/219
build_exclude OBSOLETE_BY MAKE MAKE_MATCH build_exclude OBSOLETE_BY MAKE MAKE_MATCH
PATCH PATCH_MATCH patch_array BUILT_MODULE_NAME PATCH PATCH_MATCH patch_array BUILT_MODULE_NAME
built_module_name BUILT_MODULE_LOCATION built_module_location built_module_name BUILT_MODULE_LOCATION built_module_location
@@ -605,6 +606,15 @@ read_conf() @@ -612,6 +613,15 @@ read_conf()
# Set build_exclude # Set build_exclude
[[ $BUILD_EXCLUSIVE_KERNEL && ! $1 =~ $BUILD_EXCLUSIVE_KERNEL ]] && build_exclude="yes" [[ $BUILD_EXCLUSIVE_KERNEL && ! $1 =~ $BUILD_EXCLUSIVE_KERNEL ]] && build_exclude="yes"
[[ $BUILD_EXCLUSIVE_ARCH && ! $2 =~ $BUILD_EXCLUSIVE_ARCH ]] && build_exclude="yes" [[ $BUILD_EXCLUSIVE_ARCH && ! $2 =~ $BUILD_EXCLUSIVE_ARCH ]] && build_exclude="yes"
@ -30,7 +38,7 @@ Forwarded: https://github.com/dell/dkms/issues/219
# Fail if absolutely no DEST_MODULE_LOCATION # Fail if absolutely no DEST_MODULE_LOCATION
if ((${#dest_module_location[@]} == 0)); then if ((${#dest_module_location[@]} == 0)); then
@@ -949,7 +959,7 @@ prepare_build() @@ -948,7 +958,7 @@ prepare_build()
# Error out if build_exclude is set # Error out if build_exclude is set
[[ $build_exclude ]] && die 9 \ [[ $build_exclude ]] && die 9 \

View File

@ -1,13 +1,21 @@
Author: Andreas Beckmann <anbe@debian.org> From: Andreas Beckmann <anbe@debian.org>
Description: make deprecation warnings less noisy and more informative Date: Sun, 9 Oct 2022 09:17:33 +0000
print the dkms.conf file name containing the deprecated setting Subject: make deprecation warnings less noisy and more informative
silence duplicate deprecation warnings emitted from
module_status_built_extra() which reads the dkms.conf file again
Bug-Debian: https://bugs.debian.org/1012043 Bug-Debian: https://bugs.debian.org/1012043
print the dkms.conf file name containing the deprecated setting
silence duplicate deprecation warnings emitted from
module_status_built_extra() which reads the dkms.conf file again
---
dkms.in | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/dkms.in b/dkms.in
index 4e9e99e..e002b1c 100644
--- a/dkms.in --- a/dkms.in
+++ b/dkms.in +++ b/dkms.in
@@ -411,6 +411,12 @@ safe_source() { @@ -418,6 +418,12 @@ safe_source() {
) )
. "$tmpfile" . "$tmpfile"
rm "$tmpfile" rm "$tmpfile"
@ -20,7 +28,7 @@ Bug-Debian: https://bugs.debian.org/1012043
} }
# Source a dkms.conf file and perform appropriate postprocessing on it. # Source a dkms.conf file and perform appropriate postprocessing on it.
@@ -456,12 +462,6 @@ read_conf() @@ -463,12 +469,6 @@ read_conf()
[ -e "$_conf_file" ] && safe_source "$_conf_file" $dkms_conf_variables [ -e "$_conf_file" ] && safe_source "$_conf_file" $dkms_conf_variables
done done
@ -33,7 +41,7 @@ Bug-Debian: https://bugs.debian.org/1012043
# Source in the directive_array # Source in the directive_array
for directive in "${directive_array[@]}"; do for directive in "${directive_array[@]}"; do
directive_name=${directive%%=*} directive_name=${directive%%=*}
@@ -1633,7 +1633,7 @@ do_status_weak() @@ -1638,7 +1638,7 @@ do_status_weak()
# interested in, but that the DKMS internals do not usually care about. # interested in, but that the DKMS internals do not usually care about.
module_status_built_extra() ( module_status_built_extra() (
set_module_suffix "$3" set_module_suffix "$3"
@ -42,7 +50,7 @@ Bug-Debian: https://bugs.debian.org/1012043
[[ -d $dkms_tree/$1/original_module/$3/$4 ]] && echo -n " (original_module exists)" [[ -d $dkms_tree/$1/original_module/$3/$4 ]] && echo -n " (original_module exists)"
for ((count=0; count < ${#dest_module_name[@]}; count++)); do for ((count=0; count < ${#dest_module_name[@]}; count++)); do
tree_mod=$(compressed_or_uncompressed "$dkms_tree/$1/$2/$3/$4/module" "${dest_module_name[$count]}") tree_mod=$(compressed_or_uncompressed "$dkms_tree/$1/$2/$3/$4/module" "${dest_module_name[$count]}")
@@ -1692,6 +1692,9 @@ module_status() { @@ -1697,6 +1697,9 @@ module_status() {
# is easier to parse. # is easier to parse.
do_status() { do_status() {
local status mvka m v k a local status mvka m v k a
@ -52,7 +60,7 @@ Bug-Debian: https://bugs.debian.org/1012043
while read status mvka; do while read status mvka; do
IFS=/ read m v k a <<< "$mvka" IFS=/ read m v k a <<< "$mvka"
case $status in case $status in
@@ -1704,7 +1707,8 @@ do_status() { @@ -1709,7 +1712,8 @@ do_status() {
echo echo
;; ;;
esac esac

View File

@ -1,12 +1,17 @@
Description: Use exact compiler for dkms as used to build the kernel From: Openkylin Developers <packaging@lists.openkylin.top>
Ubuntu kernel builds do not export .kernelvariables file, thus extend Date: Sun, 9 Oct 2022 09:17:33 +0000
CC detection to read compiler binary from the .config file Subject: Use exact compiler for dkms as used to build the kernel
Ubuntu kernel builds do not export .kernelvariables file, thus extend
CC detection to read compiler binary from the .config file
---
dkms.in | 7 +++++++
1 file changed, 7 insertions(+)
Index: dkms-3.0.7/dkms.in diff --git a/dkms.in b/dkms.in
=================================================================== index 68272d3..0db6f72 100644
--- dkms-3.0.7.orig/dkms.in --- a/dkms.in
+++ dkms-3.0.7/dkms.in +++ b/dkms.in
@@ -1006,6 +1006,13 @@ actual_build() @@ -1006,6 +1006,13 @@ actual_build()
unset CC unset CC
fi fi

View File

@ -1,13 +1,18 @@
Description: export CC pointing to the kernel's compiler From: Andreas Beckmann <anbe@debian.org>
export the CC variable from .kernelvariables in the kernel source to allow Date: Sun, 9 Oct 2022 09:17:33 +0000
module build systems use the kernel's compiler also outside of Kbuild Subject: export CC pointing to the kernel's compiler
Author: Andreas Beckmann <anbe@debian.org>
Index: dkms/dkms.in export the CC variable from .kernelvariables in the kernel source to allow
=================================================================== module build systems use the kernel's compiler also outside of Kbuild
--- dkms.orig/dkms.in ---
+++ dkms/dkms.in dkms.in | 6 ++++++
@@ -991,6 +991,12 @@ 1 file changed, 6 insertions(+)
diff --git a/dkms.in b/dkms.in
index 9a9b3f0..4e9e99e 100644
--- a/dkms.in
+++ b/dkms.in
@@ -990,6 +990,12 @@ actual_build()
echo $"" echo $""
echo $"Building module:" echo $"Building module:"

View File

@ -1,3 +1,13 @@
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Sun, 9 Oct 2022 09:17:33 +0000
Subject: messaging
---
dkms_autoinstaller | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dkms_autoinstaller b/dkms_autoinstaller
index 2638ce8..89c1cd6 100755
--- a/dkms_autoinstaller --- a/dkms_autoinstaller
+++ b/dkms_autoinstaller +++ b/dkms_autoinstaller
@@ -47,7 +47,7 @@ case "$1" in @@ -47,7 +47,7 @@ case "$1" in

View File

@ -1,6 +1,13 @@
Author: Andreas Beckmann <anbe@debian.org> From: Andreas Beckmann <anbe@debian.org>
Description: spelling corrections Date: Sun, 9 Oct 2022 09:17:33 +0000
Subject: spelling corrections
---
dkms_common.postinst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dkms_common.postinst b/dkms_common.postinst
index 88caa14..b3dd337 100644
--- a/dkms_common.postinst --- a/dkms_common.postinst
+++ b/dkms_common.postinst +++ b/dkms_common.postinst
@@ -254,7 +254,7 @@ for KERNEL in $KERNELS; do @@ -254,7 +254,7 @@ for KERNEL in $KERNELS; do