* fix following error:
systemd-analyze --man=false verify /lib/systemd/system/drbd.service
drbd.service: Command /lib/drbd/scripts/drbd is not executable: No such file or directory
* enhancement for usrmerge
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Dropped patch which is merged upstream:
0001-v84-Make-setup_options-definitions-as-extern.patch
Refreshed patch:
0001-drbd-utils-support-usrmerge.patch
The compiled binaries are not linked to LDFLAGS options provided
by the build system cause QA issue:
do_package_qa: QA Issue: File /usr/sbin/drbdmon in package
drbd-utils doesn't have GNU_HASH (didn't pass LDFLAGS?)
Add LDFLAGS when linking drmdmon binary.
Suppress new Clang warning -Wdefaulted-function-deleted and -Wunused-private-field
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
it is not proper change source in do_configure, it will make
source not updated even local.conf have change the DISTRO_FEATURES
[YOCTO: #13493]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1. add submodule drbd-headers into SRC_URI
drbd-headers is git submodule of drbd-utils, so drbd-headers's
code will not fetch during do_fetch. but it will get during
do_compile(there is a logic in drbd-utils's makefile to do this),
but if during do_compile, network is broken, fetch drbd-headers
will fail, then do_compile will fail since missing header file.
2. add patch for fix drbd init script
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1.Upgrade drbd-utils from 8.9.6 to 9.4.0.
2.Delete 0001-Makefile.in-fix-permission-bits-for-drbd.service.patch, since it is integrated upstream.
3.Upgrade the SRC_URI to use git fetcher
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
It is already in the source, fixed do_patch failure:
Patch 0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch is already applied; check your series file
ERROR: drbd-utils-8.9.6-r0 do_patch: Function failed: patch_do_patch
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Account for the case if the DRBD drive is built into
the kernel. Otherwise, errors, like the following,
will occur:
root@localhost:~# /etc/init.d/drbd stop
Stopping all DRBD resources: ERROR: Module drbd does not exist in
/proc/modules
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>