testing/ocfs2-tools: disable console and fix build

2 files changed, 45 insertions, 23 deletions

diff --git a/testing/ocfs2-tools/APKBUILD b/testing/ocfs2-tools/APKBUILD
index b27dce5db8..10de7abe3c 100644
--- a/testing/ocfs2-tools/APKBUILD
+++ b/testing/ocfs2-tools/APKBUILD
@@ -5,16 +5,16 @@
 # TODO: Fix init script (remove bashisms)
 pkgname=ocfs2-tools
 pkgver=1.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle Cluster File System 2 Core Tools"
 url="https://oss.oracle.com/projects/ocfs2-tools"
 arch="all"
 license="GPL-2.0-only"
 depends_dev="$pkgname=$pkgver-r$pkgrel glib-dev"
 makedepends="$depends_dev autoconf automake e2fsprogs-dev libaio-dev libtool
-	libtirpc-dev linux-headers ncurses-dev python2-dev py-gtk-dev readline-dev"
-subpackages="$pkgname-dev $pkgname-doc ocfs2-console:_console"
-source="$pkgname-$pkgver.tar.gz::https://github.com/markfasheh/$pkgname/archive/$pkgname-$pkgver.tar.gz
+	libtirpc-dev linux-headers ncurses-dev readline-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="ocfs2-tools-$pkgver.tar.gz::https://github.com/markfasheh/ocfs2-tools/archive/ocfs2-tools-$pkgver.tar.gz
 	o2cb.initd
 	o2cb.confd
 	cluster.conf
@@ -26,12 +26,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/markfasheh/$pkgname/archive/
 	fix-o2monitor-undeclared-PATH_MAX.patch
 	ocfs2console-explicitly-specified-link-libraries.patch
 	tunefs-remove-op_query.patch
+	fix-sysmacros.patch
 	"
 builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
 prepare() {
-	cd "$builddir"
-
 	update_config_guess
 	update_config_sub
 	default_prepare
@@ -40,8 +39,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	# _GNU_SOURCE is needed for loff_t from fcntl.h; it's already defined
 	# in many ocfs2-tools' sources, but after fcntl.h is included.
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE $(pkgconf --cflags libtirpc)"
@@ -54,32 +51,19 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--disable-glibtest \
-		--enable-ocfs2console=yes
+		--disable-static
 	make -j1
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
-	find "$pkgdir"/usr/lib/python*/site-packages -name '*.so' -exec chmod +x {} +
-
 	# FIXME: remove bashisms
 	#install -m 755 -D "$srcdir"/o2cb.initd "$pkgdir"/etc/init.d/o2cb
 	#install -m 644 -D "$srcdir"/o2cb.confd "$pkgdir"/etc/conf.d/o2cb
 	install -m 644 -D "$srcdir"/cluster.conf "$pkgdir"/etc/ocfs2/cluster.conf
 }
 
-_console() {
-	pkgdesc="GUI frontend for OCFS2 management"
-	depends="$pkgname=$pkgver-r$pkgrel"
-
-	cd "$pkgdir"
-	_mv usr/sbin/ocfs2console "$subpkgdir"/usr/sbin/
-	_mv usr/lib/python* "$subpkgdir"/usr/lib/
-}
-
 _mv() {
 	local dest; for dest; do true; done  # get last argument
 	mkdir -p "$dest"
@@ -97,4 +81,5 @@ b471c21f30f7ebba05ed8e4c63ff00b4ddad7e6095d256929472d61368dcb7566296201ad0af382a
 41b5e0d2eae738a8e05b6377e6dd4fc79592c6fc7b62dbc1ea6d7bd1fdb80122bc2f915748e64e30c9e964a1ebc73a65d81b5409fd499a959b3015d8c0683ead  fix-operations-include-ioctl.patch
 35d5872e6a3651583442b3a333a2e866bf241b4fc19bdbabf4bb46cdbdb6b2806d81092b1fa80a9841a49e95a40d2bc09d12ad33e8cfbf3c267698eb9120b307  fix-o2monitor-undeclared-PATH_MAX.patch
 3f1bf02eaa0f26f800cd18445cab32c72a93b7b6bc60ed5940fcd9b36d9e0d4458c73133fa1de55d81b49367ce228c829cbf9eaef7590189b67c3fa11d1e45df  ocfs2console-explicitly-specified-link-libraries.patch
-c614235c98426a60d484203b47c44643833496de9864f2f6b1bedec206de33231878799d0b16ad2462c7ed2920cd0d8f9fd41fd7b1fff5b644e8be4b31ed815d  tunefs-remove-op_query.patch"
+c614235c98426a60d484203b47c44643833496de9864f2f6b1bedec206de33231878799d0b16ad2462c7ed2920cd0d8f9fd41fd7b1fff5b644e8be4b31ed815d  tunefs-remove-op_query.patch
+a4b202ea3518f766e1b43b0acb1acc961d5c4d9d6792eaa77d64a07f97050be090e0233509b34fe9553328ec0e85c4735984a7009f6dc8b8325350e3525158d7  fix-sysmacros.patch"
diff --git a/testing/ocfs2-tools/fix-sysmacros.patch b/testing/ocfs2-tools/fix-sysmacros.patch
new file mode 100644
index 0000000000..42e2dcfa47
--- /dev/null
+++ b/testing/ocfs2-tools/fix-sysmacros.patch
@@ -0,0 +1,37 @@
+diff --git a/mounted.ocfs2/mounted.c b/mounted.ocfs2/mounted.c
+index a1b8172..c0fc09e 100644
+--- a/mounted.ocfs2/mounted.c
++++ b/mounted.ocfs2/mounted.c
+@@ -36,6 +36,7 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <ctype.h>
++#include <sys/sysmacros.h>
+ 
+ #include <uuid/uuid.h>
+ 
+diff --git a/ocfs2console/blkid/devname.c b/ocfs2console/blkid/devname.c
+index 87d5cbe..ce1d847 100644
+--- a/ocfs2console/blkid/devname.c
++++ b/ocfs2console/blkid/devname.c
+@@ -13,6 +13,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+diff --git a/ocfs2console/blkid/devno.c b/ocfs2console/blkid/devno.c
+index e665e38..370b169 100644
+--- a/ocfs2console/blkid/devno.c
++++ b/ocfs2console/blkid/devno.c
+@@ -12,6 +12,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+