[pve-devel] [PATCH 2/2] Updated package build files for PVE4 and GFS2-3.1.8

[Thomas Lamprecht]

Updated debian package control files and Makefile
to build GFS2-3.1.8 for Proxmox VE 4.
We use the following sources to build GFS2:
https://git.fedorahosted.org/cgit/gfs2-utils.git/snapshot/gfs2-utils-3.1.8.tar.gz

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 Makefile         | 6 +++---
 debian/changelog | 4 ++--
 debian/control   | 2 +-
 debian/copyright | 2 +-
 debian/docs      | 1 -
 debian/rules     | 6 ++----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 101cdc2..3acf18d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-RELEASE=3.0
+RELEASE=4.0
 
 PACKAGE=gfs2-utils
 PKGREL=1
-GFSUVER=3.1.3
-GFSUDIR=gfs2-utils
+GFSUVER=3.1.8
+GFSUDIR=gfs2-utils-${GFSUVER}
 GFSUSRC=gfs2-utils-${GFSUVER}.tar.gz
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
diff --git a/debian/changelog b/debian/changelog
index 1b6aa0a..4bb8086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-gfs2-utils (3.1.3-1) unstable; urgency=low
+gfs2-utils (3.1.8-1) unstable; urgency=low
 
-  * Initial release 
+  * bump to version 3.1.8, compiling for PVE4
 
  -- Proxmox Support Team <support at proxmox.com>  Thu, 16 Feb 2012 13:44:11 +0100
diff --git a/debian/control b/debian/control
index 6199451..8a348ff 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 
 Package: gfs2-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, redhat-cluster-pve 
+Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, python, corosync
 Description:  Global file system 2 tools
  The Global File System allows a cluster of machines to concurrently access
  shared storage hardware like SANs or iSCSI and network block devices. GFS
diff --git a/debian/copyright b/debian/copyright
index 281b00f..6d617c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Proxmox Support Team <support at proxmox.com> on thu, 16 Feb 2012
+    Proxmox Support Team <support at proxmox.com> on mon, 27 Jul 2015
 
 It was downloaded from:
 
diff --git a/debian/docs b/debian/docs
index 1729ad5..8dfca40 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,4 @@
 README.build
-doc/usage.txt
 doc/gfs2.txt
 doc/journaling.txt
 debian/SOURCE
diff --git a/debian/rules b/debian/rules
index d8ae795..5256dca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,14 +18,12 @@ BUILDDIR=debian/gfs2-utils
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(BUILDROOT)/$(BUILDDIR)
 
-	rmdir $(BUILDDIR)/var/run/cluster
-
 	# we do not install upstream doc, instead we use
 	# dh_installdocs and dh_installexamples to copy files
 	rm -rf $(BUILDDIR)/usr/share/doc/gfs2-utils
 
 	dh_installdocs
 
-	install -D -m 755 gfs2/init.d/gfs2-cluster $(BUILDDIR)/etc/init.d/gfs2-cluster
+	install -D -m 755 gfs2/init.d/gfs2 $(BUILDDIR)/etc/init.d/gfs2
 
-	dh_installinit --onlyscripts --init-script=gfs2-cluster
\ No newline at end of file
+	dh_installinit --onlyscripts --init-script=gfs2
-- 
2.1.4