starlingx/integ
Code Issues Proposed changes

CentOS 8: Fix drbd-tools build issue

Browse Source 
Add patch 0010-drbd-include-sysmacros.patch
to fix build error.
as prompt for undefined reference to
`major' and `minor' in file `drbdadm_adjust.c'
so include the header file to fix it

Story: 2006729
Task: 37948

Change-Id: I820cd8aecfe4021db75fdd6ff1b7fe541441e9be
Signed-off-by: Long Li <lilong-neu@neusoft.com>
This commit is contained in:
Long Li 2020-01-03 17:53:20 +08:00
parent 246f33226d
commit 1b6aab2e42
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filesystem/drbd/drbd-tools/centos/drbd.spec
View File

@ -44,6 +44,7 @@ Patch0006: 0006-avoid-kernel-userspace-version-check.patch
Patch0007: 0007-Update-OCF-to-attempt-connect-in-certain-states.patch
Patch0008: 0008-Increase-short-cmd-timeout-to-15-secs.patch
Patch0009: 0009-Check-for-mounted-device-before-demoting-Primary-DRB.patch
Patch0010: 0010-drbd-include-sysmacros.patch
License: GPLv2+
ExclusiveOS: linux
@ -273,6 +274,7 @@ management utility.
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
%build
%configure \

42
filesystem/drbd/drbd-tools/centos/patches/0010-drbd-include-sysmacros.patch Normal file
View File

@ -0,0 +1,42 @@
From 79a3abb5f66b598847c3fb33c89082a542da1ec0 Mon Sep 17 00:00:00 2001
From: Long Li <lilong-neu@neusoft.com>
Date: Thu, 12 Dec 2019 10:54:08 +0800
Subject: [PATCH] 0010-drbd-include-sysmacros.patch
Fix build error, prompt for undefined reference to
`major' and `minor' in file `drbdadm_adjust.c'
so include the header file to fix build error
Signed-off-by: Long Li <lilong-neu@neusoft.com>
---
user/drbdadm_adjust.c | 1 +
user/legacy/drbdadm_adjust.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/user/drbdadm_adjust.c b/user/drbdadm_adjust.c
index efa09a7..0b40763 100644
--- a/user/drbdadm_adjust.c
+++ b/user/drbdadm_adjust.c
@@ -44,6 +44,7 @@
#include "drbdtool_common.h"
#include "drbdadm_parser.h"
#include "config_flags.h"
+#include <sys/sysmacros.h>
/* drbdsetup show might complain that the device minor does
not exist at all. Redirect stderr to /dev/null therefore.
diff --git a/user/legacy/drbdadm_adjust.c b/user/legacy/drbdadm_adjust.c
index 0de5b62..09cb00a 100644
--- a/user/legacy/drbdadm_adjust.c
+++ b/user/legacy/drbdadm_adjust.c
@@ -40,6 +40,7 @@
#include "drbdadm.h"
#include "drbdtool_common.h"
#include "drbdadm_parser.h"
+#include <sys/sysmacros.h>
/* drbdsetup show might complain that the device minor does
not exist at all. Redirect stderr to /dev/null therefore.
--
2.7.4