From 025d7bd800a666876ae420c212b9e5df76251cd5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 26 May 2017 18:49:25 +0200
Subject: drbd-utils: rename package and update
---
package/drbd/Makefile | 41 --------------------------------
package/drbd/files/drbd.conf | 21 ----------------
package/drbd/files/drbd.conffiles | 1 -
package/drbd/patches/patch-Makefile_in | 13 ----------
package/drbd/patches/patch-configure | 11 ---------
package/drbd/patches/patch-drbd_Makefile | 13 ----------
6 files changed, 100 deletions(-)
delete mode 100644 package/drbd/Makefile
delete mode 100644 package/drbd/files/drbd.conf
delete mode 100644 package/drbd/files/drbd.conffiles
delete mode 100644 package/drbd/patches/patch-Makefile_in
delete mode 100644 package/drbd/patches/patch-configure
delete mode 100644 package/drbd/patches/patch-drbd_Makefile
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
deleted file mode 100644
index 29b78c904..000000000
--- a/package/drbd/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:= drbd
-PKG_VERSION:= 8.4.4
-PKG_RELEASE:= 2
-PKG_HASH:= a056219c5c23b079c3354179f7a1b9f55d47e573a4cd3178f2ef4c15604288f0
-PKG_DESCR:= admin tools for drbd
-PKG_SECTION:= sys/fs
-PKG_URL:= http://www.drbd.org/
-PKG_SITES:= http://oss.linbit.com/drbd/8.4/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_LIBC_DEPENDS:= uclibc-ng glibc
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-XAKE_FLAGS+= GENETLINK_H=$(STAGING_TARGET_DIR)/usr/include/linux/genetlink.h
-CONFIGURE_ARGS+= --with-distro=generic \
- --with-pacemaker \
- --without-heartbeat \
- --without-km \
- --without-xen \
- --without-udev
-
-drbd-install:
- $(INSTALL_DIR) $(IDIR_DRBD)/etc
- $(CP) ./files/drbd.conf $(IDIR_DRBD)/etc
- $(INSTALL_DIR) $(IDIR_DRBD)/usr/lib/drbd
- $(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin
- $(CP) $(WRKINST)/usr/lib/drbd/* \
- $(IDIR_DRBD)/usr/lib/drbd/
- $(INSTALL_BIN) $(WRKINST)/usr/sbin/drbd* \
- $(IDIR_DRBD)/usr/sbin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/drbd/files/drbd.conf b/package/drbd/files/drbd.conf
deleted file mode 100644
index 8eb55e497..000000000
--- a/package/drbd/files/drbd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#resource r1 {
-# protocol C;
-#
-# startup { wfc-timeout 0; degr-wfc-timeout 120; }
-# disk { on-io-error detach; }
-# net { timeout 60; connect-int 10; ping-int 10;
-# max-buffers 2048; max-epoch-size 2048; }
-# syncer { rate 5M; } # sync when r0 and r1 are finished syncing.
-# on alice {
-# address 192.168.1.1:7790;
-# disk /dev/sdb1;
-# device /dev/drbd1;
-# meta-disk "internal";
-# }
-# on bob {
-# address 192.168.1.2:7790;
-# disk "/dev/sdb1";
-# device "/dev/drbd2";
-# meta-disk "internal";
-# }
-#}
diff --git a/package/drbd/files/drbd.conffiles b/package/drbd/files/drbd.conffiles
deleted file mode 100644
index 9096001bf..000000000
--- a/package/drbd/files/drbd.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/drbd.conf
diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in
deleted file mode 100644
index ad87d221d..000000000
--- a/package/drbd/patches/patch-Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- drbd-8.3.10.orig/Makefile.in 2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/Makefile.in 2011-10-23 10:20:12.000000000 +0200
-@@ -54,9 +54,7 @@ KDIR ?= /lib/modules/$(KVER)/build
-
- # for some reason some of the commands below only work correctly in bash,
- # and not in e.g. dash. I'm too lazy to fix it to be compatible.
--SHELL=/bin/bash
--
--SUBDIRS = user scripts documentation drbd
-+SUBDIRS = user scripts drbd
-
- REL_VERSION := $(shell $(SED) -ne '/^\#define REL_VERSION/{s/^[^"]*"\([^ "]*\).*/\1/;p;q;}' drbd/linux/drbd_config.h)
- ifdef FORCE
diff --git a/package/drbd/patches/patch-configure b/package/drbd/patches/patch-configure
deleted file mode 100644
index ac69badd6..000000000
--- a/package/drbd/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- drbd-8.4.1.orig/configure 2011-12-20 12:43:14.000000000 +0100
-+++ drbd-8.4.1/configure 2012-07-24 23:02:23.000000000 +0200
-@@ -3389,7 +3389,7 @@ fi
-
-
- cat >>confdefs.h <<_ACEOF
--#define DRBD_LIB_DIR "$localstatedir/lib/$PACKAGE_TARNAME"
-+#define DRBD_LIB_DIR "/etc/$PACKAGE_TARNAME"
- _ACEOF
-
- cat >>confdefs.h <<_ACEOF
diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile
deleted file mode 100644
index 753454cd1..000000000
--- a/package/drbd/patches/patch-drbd_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- drbd-8.4.1.orig/drbd/Makefile 2011-11-17 10:01:55.000000000 +0100
-+++ drbd-8.4.1/drbd/Makefile 2012-07-24 23:03:11.000000000 +0200
-@@ -116,8 +116,8 @@ else
- else \
- grep return $@ ; \
- fi ; \
-- echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \
-- mv --force $@.new $@
-+ printf "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \
-+ mv $@.new $@
-
- kbuild: drbd_buildtag.c
- @rm -f .drbd_kernelrelease*
--
cgit v1.2.3