pool/drbd
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 845859 from home:wanghaisu:branches:network:ha-clustering:Factory

Browse Source 
bsc#1178388, build error with -Wreturn-type

OBS-URL: https://build.opensuse.org/request/show/845859
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=121
This commit is contained in:
nick wang 2020-11-04 05:22:39 +00:00 committed by Git OBS Bridge
parent eea075f12a
commit e26ad2500c
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drbd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 3 11:21:13 UTC 2020 - nick wang <nwang@suse.com>
- bsc#1178388, build error with -Wreturn-type
Add patch fix-err-of-wrong-return-type.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 20 03:49:16 UTC 2020 - nick wang <nwang@suse.com> Tue Oct 20 03:49:16 UTC 2020 - nick wang <nwang@suse.com>

2
drbd.spec
View File

@ -45,6 +45,7 @@ Patch7: compat_generic_make_request.patch
Patch8: blk_alloc_queue_make_request.patch Patch8: blk_alloc_queue_make_request.patch
Patch9: remove_congested_fn_congested_data.patch Patch9: remove_congested_fn_congested_data.patch
Patch10: compat_blk_queue_stack_limits.patch Patch10: compat_blk_queue_stack_limits.patch
Patch11: fix-err-of-wrong-return-type.patch
Patch99: suse-coccinelle.patch Patch99: suse-coccinelle.patch
#https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py #https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
BuildRequires: coccinelle >= 1.0.8 BuildRequires: coccinelle >= 1.0.8
@ -88,6 +89,7 @@ installed kernel.
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%patch99 -p1 %patch99 -p1
mkdir source mkdir source

11
fix-err-of-wrong-return-type.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c
--- drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c 2020-11-03 17:45:49.362231056 +0800
+++ drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c 2020-11-03 19:11:54.843913135 +0800
@@ -11,6 +11,7 @@
blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio)
{
+ return 0;
}
#ifndef __same_type