openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package drbd (Revision dd1f845e1636e3de43a9c9fd936ccd4f)

Currently displaying revision dd1f845e1636e3de43a9c9fd936ccd4f , Show latest

--- drbd.changes.orig
+++ drbd.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Tue Oct 20 03:49:16 UTC 2020 - nick wang <nwang@suse.com>
+
+- bsc#1177910, compat to kernel v5.9
+  Add patch blk_alloc_queue_make_request.patch
+  Add patch compat_generic_make_request.patch
+  Add patch remove_congested_fn_congested_data.patch
+- Add tumbleweed only patch
+  Add patch compat_blk_queue_stack_limits.patch
+
+-------------------------------------------------------------------
 Fri Sep 18 07:38:21 UTC 2020 - nick wang <nwang@suse.com>
 
 - bsc#1175257, update to 9.0.25-0rc1
--- drbd.spec.orig
+++ drbd.spec
@@ -40,6 +40,11 @@ Patch3:         drbd-fix-zero-metadata-l
 Patch4:         compat_remove_pgprot_88dca4c.patch
 Patch5:         compat_remove_include_vermagic.patch
 Patch6:         compat_remove_kernel_setsockopt.patch
+# Compat to kernel v5.9
+Patch7:         compat_generic_make_request.patch
+Patch8:         blk_alloc_queue_make_request.patch
+Patch9:         remove_congested_fn_congested_data.patch
+Patch10:        compat_blk_queue_stack_limits.patch
 Patch99:        suse-coccinelle.patch
 #https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
 BuildRequires:  coccinelle >= 1.0.8
@@ -79,6 +84,10 @@ installed kernel.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 %patch99 -p1
 
 mkdir source
--- suse-coccinelle.patch.orig
+++ suse-coccinelle.patch
@@ -1,14 +1,27 @@
-diff -Naur drbd-9.0.21~1+git.449d6bf2.orig/drbd/drbd-kernel-compat/gen_compat_patch.sh drbd-9.0.21~1+git.449d6bf2/drbd/drbd-kernel-compat/gen_compat_patch.sh
---- drbd-9.0.21~1+git.449d6bf2.orig/drbd/drbd-kernel-compat/gen_compat_patch.sh	2019-12-16 14:42:10.832866579 +0800
-+++ drbd-9.0.21~1+git.449d6bf2/drbd/drbd-kernel-compat/gen_compat_patch.sh	2019-12-16 15:11:08.209750606 +0800
-@@ -56,29 +56,49 @@
+diff -Naur drbd-9.0.25~0+git.bd41626d.orig/drbd/drbd-kernel-compat/gen_compat_patch.sh drbd-9.0.25~0+git.bd41626d/drbd/drbd-kernel-compat/gen_compat_patch.sh
+--- drbd-9.0.25~0+git.bd41626d.orig/drbd/drbd-kernel-compat/gen_compat_patch.sh	2020-09-19 08:34:40.643919136 +0800
++++ drbd-9.0.25~0+git.bd41626d/drbd/drbd-kernel-compat/gen_compat_patch.sh	2020-09-19 08:50:59.095231966 +0800
+@@ -44,9 +44,15 @@
+ 
+ if hash spatch && spatch_is_recent; then
+     K=$(cat $incdir/kernelrelease.txt)
++    echo "  compat.h content ";
++    cat $incdir/compat.h;
++    echo "  -------------------   ";
+     echo "  GENPATCHNAMES   "$K
+     gcc -I $incdir -o $incdir/gen_patch_names -std=c99 drbd-kernel-compat/gen_patch_names.c
+     $incdir/gen_patch_names > $incdir/applied_cocci_files.txt
++    echo "  APPLIED_COCCI_FILES   ";
++    cat $incdir/applied_cocci_files.txt;
++    echo "  -------------------   ";
+     rm $incdir/gen_patch_names
+     rm -f $incdir/.compat.cocci
+     rm -f $incdir/.compat.patch
+@@ -61,29 +67,46 @@
  		< drbd-kernel-compat/cocci/debugfs_compat_template.cocci.in \
  		>> $incdir/.compat.cocci
      done
 +
-+    echo "  APPLIED_COCCI_FILES   ";
-+    cat $incdir/applied_cocci_files.txt;
-+
 +    coccilibpath=$(rpm -ql coccinelle|grep standard.h|xargs dirname);
 +    echo "  SPATCH_SOURCES: "$*;
 +    echo "  COCCI_LIBPATH: "$coccilibpath;
@@ -21,20 +34,10 @@ diff -Naur drbd-9.0.21~1+git.449d6bf2.or
 -	# are "the rest of the shell argument array", so after shifting the first
 -	# argument away this is shell $@ respectively $* now.
 -	# we know we don't have white-space in the argument list
--
--	command="spatch --sp-file $incdir/.compat.cocci $* --macro-file drbd-kernel-compat/cocci_macros.h --very-quiet > $compat_patch.tmp 2> $incdir/.spatch.stderr;"
--
--	if test -t 0; then
--	    $SHELL -c "$command"
--	else
--	    # spatch is broken in a way: it "requires" a tty.
--	    # provide a tty using "script", so I can have several spatch in parallel.
--	    # They may ignore INT and TERM; if you have to, use HUP.
--	    </dev/null &> /dev/null script --append $incdir/.spatch.tty.out --return --quiet --command "$command"
--	fi
 +    	echo "  GENCOCCIRULES .compat.cocci";
 +    	cat $incdir/.compat.cocci;
-+
+ 
+-	command="spatch --sp-file $incdir/.compat.cocci $* --macro-file drbd-kernel-compat/cocci_macros.h --very-quiet > $compat_patch.tmp 2> $incdir/.spatch.stderr;"
 +		echo "  SPATCH   $chksum  "$K
 +		# Note: $* (or $@) is NOT make magic variable now, this is a shell script
 +		# make $@, the target file, was passed as $1, and is now $compat_patch
@@ -42,7 +45,15 @@ diff -Naur drbd-9.0.21~1+git.449d6bf2.or
 +		# are "the rest of the shell argument array", so after shifting the first
 +		# argument away this is shell $@ respectively $* now.
 +		# we know we don't have white-space in the argument list
-+
+ 
+-	if test -t 0; then
+-	    $SHELL -c "$command"
+-	else
+-	    # spatch is broken in a way: it "requires" a tty.
+-	    # provide a tty using "script", so I can have several spatch in parallel.
+-	    # They may ignore INT and TERM; if you have to, use HUP.
+-	    </dev/null &> /dev/null script --append $incdir/.spatch.tty.out --return --quiet --command "$command"
+-	fi
 +    	command="spatch --sp-file $incdir/.compat.cocci $* --macro-file drbd-kernel-compat/cocci_macros.h --macro-file-builtins $coccilibpath/standard.h --iso-file $coccilibpath/standard.iso --very-quiet > $compat_patch.tmp 2> $incdir/.spatch.stderr;"                                           
 +    	echo "  SPATCH COMMAND $command  ";
 +

Places

File project.diff of Package drbd (Revision dd1f845e1636e3de43a9c9fd936ccd4f)

Places