drbd-utils: 8.9.6 -> 9.4.0

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>

2 files changed, 6 insertions, 30 deletions

diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch
deleted file mode 100644
index 90dd1f861..000000000
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-Subject:  Makefile.in: fix permission bits for drbd.service
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- scripts/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/Makefile.in b/scripts/Makefile.in
-index 402b93b..4a45407 100644
---- a/scripts/Makefile.in
-+++ b/scripts/Makefile.in
-@@ -65,7 +65,7 @@ endif
- # yes, debian apparently allows installing both types from the same package
- ifneq ($(initscripttype),sysv)         # "systemd" or "both"
-        install -d $(DESTDIR)$(systemdunitdir)
--       install -m 755 drbd.service $(DESTDIR)$(systemdunitdir)/
-+       install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
-        install -d $(DESTDIR)/lib/drbd/
-        install -m 755 drbd $(DESTDIR)/lib/drbd/
-        install -d $(DESTDIR)$(tmpfilesdir)/
--- 
-1.9.1
-
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.4.0.bb
index 90c920447..d6e913f00 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.4.0.bb
@@ -8,13 +8,14 @@ SECTION = "admin"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
-SRC_URI = "http://www.linbit.com/downloads/drbd/utils/archive/${BP}.tar.gz \
-           file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \
+SRC_URI = "git://github.com/LINBIT/drbd-utils \
           "
-SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b"
-SRC_URI[sha256sum] = "297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913"
+# v9.4.0
+SRCREV = "eff6423ee72931aa0f8d0eb51742acee7c7cd3e1"
 
-UPSTREAM_CHECK_URI = "http://www.linbit.com/downloads/drbd/utils/"
+S = "${WORKDIR}/git"
+
+UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases"
 
 SYSTEMD_SERVICE_${PN} = "drbd.service"
 SYSTEMD_AUTO_ENABLE = "disable"