mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-01-07 01:32:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

testing/ocfs2-tools: rewrite aport and upgrade to 1.8.5

Browse Source 
Note: We use the same ("unofficial"?) upstream as Fedora.
This commit is contained in:
Jakub Jirutka 2018-05-23 21:56:11 +02:00
parent ada13b6998
commit 4f24ccb86c
13 changed files with 363 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
testing/ocfs2-tools/APKBUILD
View File

@ -1,86 +1,98 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
#
# TODO: Fix init script (remove bashisms)
pkgname=ocfs2-tools
pkgver=1.6.4
pkgrel=2
pkgdesc="Oracle Cluster File System 2 utilities"
url="http://oss.oracle.com/projects/ocfs2-tools"
arch=""
license="GPL-2.0"
depends=
depends_dev="e2fsprogs-dev glib-dev ncurses-dev readline-dev"
makedepends="$depends_dev"
install=
subpackages="$pkgname-dev $pkgname-doc"
source="http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
build.patch
$pkgname.initd
$pkgname.confd
$pkgname.cluster-conf
ocfs2-tools-1.6-operations-missing-include.patch
ocfs2-tools-1.6.4-umode_t.patch"
_builddir="$srcdir"/$pkgname-$pkgver
pkgver=1.8.5
pkgrel=0
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 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
o2cb.initd
o2cb.confd
cluster.conf
musl-libocfs2-__bswap_constant_32.patch
musl-o2info-atimensec.patch
musl-sys-raw.h.patch
fix-unknown-type-errcode_t.patch
fix-operations-include-ioctl.patch
ocfs2console-explicitly-specified-link-libraries.patch
tunefs-remove-op_query.patch
"
builddir="$srcdir/$pkgname-$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
local i
for i in ../*.patch
do
msg "Applying patch $i"
patch -p1 -i $i || return 1
done
cd "$builddir"
sed -i 's%sys/raw.h%linux/raw.h%' fswreck/include/main.h || return 1
sed -i 's%sys/raw.h%linux/raw.h%' debugfs.ocfs2/include/main.h || return 1
sed -i 's%sys/raw.h%linux/raw.h%' o2info/operations.c || return 1
update_config_guess
update_config_sub
default_prepare
./autogen.sh
}
build() {
cd "$_builddir"
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)"
export LDFLAGS="$LDFLAGS $(pkgconf --cflags libtirpc)"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--enable-ocfs2console=yes \
--enable-dynamic-fsck=yes \
--enable-dynamic-ctl=yes \
--disable-glibtest \
|| return 1
make -j1 || return 1
--enable-ocfs2console=yes
make -j1
}
package() {
cd "$_builddir"
cd "$builddir"
make DESTDIR="$pkgdir" install
# remove the 2 lines below (and this) if there is no init.d script
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/o2cb
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/o2cb
install -m644 -D "$srcdir"/$pkgname.cluster-conf "$pkgdir"/etc/ocfs2/cluster.conf
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
}
md5sums="2e94423507b63fcc08f93c094e789be8 ocfs2-tools-1.6.4.tar.gz
c938040f0e77a4bb23e952c8f99b6cc5 build.patch
bf827283ab0c5de69df2eacbcb598b79 ocfs2-tools.initd
d81b6ab068ec92a137b58c9ad56c4637 ocfs2-tools.confd
189e433cf001465f1565faae2e6e10ac ocfs2-tools.cluster-conf
f1d6bd7f02e69b31b8a103d18c7209f6 ocfs2-tools-1.6-operations-missing-include.patch
cd4710efdb07660459fda1b514cfa8a6 ocfs2-tools-1.6.4-umode_t.patch"
sha256sums="dda9db208312e3e5f4f55ee77e66e7b35b9cc10421bc02065a6c168e42b24755 ocfs2-tools-1.6.4.tar.gz
8e6a51ff12f1f08945102af0008c83e843aa20b25649adc157be92f27c2a3a42 build.patch
c8852f8434c27d34996891fe404c495eaacc06b6e1df0f07fbf2b1675bda1b26 ocfs2-tools.initd
9e090d955f51cdb32f9dd7eb20fec326b793daa90fd7df02a6e437fa00d269b7 ocfs2-tools.confd
5e79d4eaac95fd81f833ca9e08f19f741e88f6c86ebf1b5c91465974b6a8b11f ocfs2-tools.cluster-conf
f82b6d5f5a97b9ae139ca041a60c3553a07dcf1f3821a12ae1d8c17492eff1f9 ocfs2-tools-1.6-operations-missing-include.patch
a4ba2f4aaa16018a08da9cea689c1f7d9d890691a53b74ceb3eddd6a8bebbc41 ocfs2-tools-1.6.4-umode_t.patch"
sha512sums="3b5b834e23467736b2fc522449f3d86b9a4b4764a66ec6812e4ecf497f8d43c2fb1aba1955c6030336d88463e720a5ace0b7cde48853cf3b482c6727ed86a649 ocfs2-tools-1.6.4.tar.gz
6a6b872fe0bb9ef8f3866881619145551ac4b77811082b24be08ecf351d22cd9dd6b239a2c6c962606a0282c5cb16e96ff5aac30a18c04fdf1bc0d1945841018 build.patch
e6fd44358ba5a38446a8bea60c493f4ef9b7a2d7c0076116e91f0edabb66da1fd90be884a46052592f69e338887d4df5c7b7c0b01fadf837fdbc7906a96de52a ocfs2-tools.initd
e510f08a9adc2d7c07e7b8a4d2c503c5a130a156ab1bf1cf45d8480dd94490968f718e966d0bae090a883ff36768e17971415f9905bd5dcf8632f16f7c0b931e ocfs2-tools.confd
f844e5389e0b42d6f91a1335bd2ef4d2666e5b883c999d05acd3bc63ad901bc5838aa4da35bb1d069463d7cc7dcfa277dbaa938b5953e8d420a37cfbb30f24f3 ocfs2-tools.cluster-conf
41b5e0d2eae738a8e05b6377e6dd4fc79592c6fc7b62dbc1ea6d7bd1fdb80122bc2f915748e64e30c9e964a1ebc73a65d81b5409fd499a959b3015d8c0683ead ocfs2-tools-1.6-operations-missing-include.patch
7ec59c84a64d4e4cae0318a77e652d0172155fe4693c9dece0058ee1f92794bd3ed9c0ede230e98c3d635bd735b9bd83bd63a657db25575f1a6de7a50c407a4f ocfs2-tools-1.6.4-umode_t.patch"
_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"
mv $@
}
sha512sums="94153af0570dafd60c4f6eb31d53ad222ec1e001acb1b29333cef3eafd0a134921566b8dcbd148b4b4af8067dd7419d5bd8d8cd3fef87ab0efcc6c8fb304d22d ocfs2-tools-1.8.5.tar.gz
e6fd44358ba5a38446a8bea60c493f4ef9b7a2d7c0076116e91f0edabb66da1fd90be884a46052592f69e338887d4df5c7b7c0b01fadf837fdbc7906a96de52a o2cb.initd
e510f08a9adc2d7c07e7b8a4d2c503c5a130a156ab1bf1cf45d8480dd94490968f718e966d0bae090a883ff36768e17971415f9905bd5dcf8632f16f7c0b931e o2cb.confd
f844e5389e0b42d6f91a1335bd2ef4d2666e5b883c999d05acd3bc63ad901bc5838aa4da35bb1d069463d7cc7dcfa277dbaa938b5953e8d420a37cfbb30f24f3 cluster.conf
87ea579ddb4a6ae34c5b815fe9015dc0168cb267312f9ef3dccfd16cd65a1f13ef1275dda72308d952ca844e42a486c891340210c4757866f2caacd0d6d3a916 musl-libocfs2-__bswap_constant_32.patch
d1eb24086f71f22e0333f4c246389ce82c9b4540bb0a2d091f6deee7f563c7e5457a838937cd07f1b90359e9c215639aebcbc54c551fb0e9e3617f29c03d49a1 musl-o2info-atimensec.patch
b471c21f30f7ebba05ed8e4c63ff00b4ddad7e6095d256929472d61368dcb7566296201ad0af382a21f0a16c47f23cfa256ad91e6629f17595034e4807c96f3b musl-sys-raw.h.patch
5c30855802132ab4aa3495d0e81de1f2ecfece457f008ed7c9570edd7fc8b33b741cfd891d7bdb2c825199a4468a522db9538a84106470e93ac8dd6280a6912c fix-unknown-type-errcode_t.patch
41b5e0d2eae738a8e05b6377e6dd4fc79592c6fc7b62dbc1ea6d7bd1fdb80122bc2f915748e64e30c9e964a1ebc73a65d81b5409fd499a959b3015d8c0683ead fix-operations-include-ioctl.patch
3f1bf02eaa0f26f800cd18445cab32c72a93b7b6bc60ed5940fcd9b36d9e0d4458c73133fa1de55d81b49367ce228c829cbf9eaef7590189b67c3fa11d1e45df ocfs2console-explicitly-specified-link-libraries.patch
c614235c98426a60d484203b47c44643833496de9864f2f6b1bedec206de33231878799d0b16ad2462c7ed2920cd0d8f9fd41fd7b1fff5b644e8be4b31ed815d tunefs-remove-op_query.patch"

32
testing/ocfs2-tools/build.patch
View File

@ -1,32 +0,0 @@
diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_controld/Makefile
--- ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile 2009-04-14 00:10:40.000000000 +0200
+++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile 2009-09-30 08:22:04.000000000 +0200
@@ -17,7 +17,7 @@
PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS)
endif
-INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
+INCLUDES = -I/usr/include/libxml2 -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c
--- ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c 2009-05-06 03:36:57.000000000 +0200
+++ ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c 2009-09-30 08:22:22.000000000 +0200
@@ -22,6 +22,7 @@
#include <bzlib.h>
+#include <corosync/corodefs.h>
#include <pacemaker/crm_config.h>
/* heartbeat support is irrelevant here */
#undef SUPPORT_HEARTBEAT
@@ -155,7 +156,7 @@
crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
- log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);
+ log_error("Connection to our AIS plugin (%d) failed", PCMK_SERVICE);
return -1;
}

0
testing/ocfs2-tools/ocfs2-tools.cluster-conf → testing/ocfs2-tools/cluster.conf
View File

0
testing/ocfs2-tools/ocfs2-tools-1.6-operations-missing-include.patch → testing/ocfs2-tools/fix-operations-include-ioctl.patch
View File

82
testing/ocfs2-tools/fix-unknown-type-errcode_t.patch Normal file
View File

@ -0,0 +1,82 @@
From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001
From: Gang He <ghe@suse.com>
Date: Mon, 4 Sep 2017 14:08:59 +0800
Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade
When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2,
the compile error messages like,
In file included from /usr/include/string.h:431:0,
from ../include/ocfs2/ocfs2.h:41,
from pass4.c:32:
include/strings.h:37:1: error: unknown type name ‘errcode_t’; did you mean ‘mode_t’?
errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
^~~~~~~~~
mode_t
Patch-Source: https://github.com/markfasheh/ocfs2-tools/commit/0ffd58b223e24779420130522ea8ee359505f493
---
fsck.ocfs2/Makefile | 2 +-
fsck.ocfs2/include/{strings.h => o2fsck_strings.h} | 0
fsck.ocfs2/pass2.c | 2 +-
fsck.ocfs2/pass5.c | 2 +-
fsck.ocfs2/strings.c | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename fsck.ocfs2/include/{strings.h => o2fsck_strings.h} (100%)
diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
index 051ed742..baf1994d 100644
--- a/fsck.ocfs2/Makefile
+++ b/fsck.ocfs2/Makefile
@@ -64,7 +64,7 @@ HFILES = include/fsck.h \
include/problem.h \
include/refcount.h \
include/slot_recovery.h \
- include/strings.h \
+ include/o2fsck_strings.h \
include/util.h
diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/o2fsck_strings.h
similarity index 100%
rename from fsck.ocfs2/include/strings.h
rename to fsck.ocfs2/include/o2fsck_strings.h
diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c
index 181febb9..a48a50b5 100644
--- a/fsck.ocfs2/pass2.c
+++ b/fsck.ocfs2/pass2.c
@@ -43,7 +43,7 @@
#include "fsck.h"
#include "pass2.h"
#include "problem.h"
-#include "strings.h"
+#include "o2fsck_strings.h"
#include "util.h"
static const char *whoami = "pass2";
diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c
index 5c2d899f..bfad1b72 100644
--- a/fsck.ocfs2/pass5.c
+++ b/fsck.ocfs2/pass5.c
@@ -40,7 +40,7 @@
#include "fsck.h"
#include "pass5.h"
#include "problem.h"
-#include "strings.h"
+#include "o2fsck_strings.h"
#include "util.h"
static const char *whoami = "pass5";
diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c
index 4ad37822..8a7a8d9d 100644
--- a/fsck.ocfs2/strings.c
+++ b/fsck.ocfs2/strings.c
@@ -31,7 +31,7 @@
#include "ocfs2/ocfs2.h"
#include "fsck.h"
-#include "strings.h"
+#include "o2fsck_strings.h"
#include "util.h"
struct string_entry {

29
testing/ocfs2-tools/musl-libocfs2-__bswap_constant_32.patch Normal file
View File

@ -0,0 +1,29 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 23 May 2018 19:56:00 +0200
Subject: [PATCH] Ensure compatibility with other libcs
The musl libc does not provide __bswap_constant_32.
--- a/libocfs2/crc32table.h
+++ b/libocfs2/crc32table.h
@@ -6,11 +6,18 @@
*/
#include <inttypes.h>
#include <byteswap.h>
+
+#ifndef __bswap_constant_32
+#define __bswap_constant_32(x) \
+ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) \
+ | (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24))
+#endif
+
#if __BYTE_ORDER == __LITTLE_ENDIAN
# define tole(x) ((uint32_t)(x))
-# define tobe(x) ((uint32_t)__bswap_constant_32(x))
+# define tobe(x) ((uint32_t)__builtin_bswap32(x))
#elif __BYTE_ORDER == __BIG_ENDIAN
-# define tole(x) ((uint32_t)__bswap_constant_32(x))
+# define tole(x) ((uint32_t)__builtin_bswap32(x))
# define tobe(x) ((uint32_t)(x))
#else
# error Invalid byte order __BYTE_ORDER

35
testing/ocfs2-tools/musl-o2info-atimensec.patch Normal file
View File

@ -0,0 +1,35 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 23 May 2018 21:01:00 +0200
Subject: [PATCH] Ensure compatibility with musl
The musl libc does not define macros st_{atim,mtim,ctim}ensec.
--- a/o2info/utils.c
+++ b/o2info/utils.c
@@ -334,7 +334,7 @@
#else
struct timespec t;
t.tv_sec = st->st_atime;
- t.tv_nsec = st->st_atimensec;
+ t.tv_nsec = st->st_atim.tv_nsec;
return t;
#endif
}
@@ -346,7 +346,7 @@
#else
struct timespec t;
t.tv_sec = st->st_mtime;
- t.tv_nsec = st->st_mtimensec;
+ t.tv_nsec = st->st_mtim.tv_nsec;
return t;
#endif
}
@@ -358,7 +358,7 @@
#else
struct timespec t;
t.tv_sec = st->st_ctime;
- t.tv_nsec = st->st_ctimensec;
+ t.tv_nsec = st->st_ctim.tv_nsec;
return t;
#endif
}

37
testing/ocfs2-tools/musl-sys-raw.h.patch Normal file
View File

@ -0,0 +1,37 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 23 May 2018 21:18:00 +0200
Subject: [PATCH] Replace include sys/raw.h with linux/raw.h
--- a/debugfs.ocfs2/include/main.h
+++ b/debugfs.ocfs2/include/main.h
@@ -45,7 +45,7 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include <signal.h>
-#include <sys/raw.h>
+#include <linux/raw.h>
#include <linux/kdev_t.h>
#include <inttypes.h>
#include <utime.h>
--- a/fswreck/include/main.h
+++ b/fswreck/include/main.h
@@ -43,7 +43,7 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include <signal.h>
-#include <sys/raw.h>
+#include <linux/raw.h>
#include <linux/kdev_t.h>
#include <inttypes.h>
--- a/o2info/operations.c
+++ b/o2info/operations.c
@@ -22,7 +22,7 @@
#define _GNU_SOURCE /* Because libc really doesn't want us using O_DIRECT? */
#include <errno.h>
-#include <sys/raw.h>
+#include <linux/raw.h>
#include <inttypes.h>
#include "ocfs2/ocfs2.h"

0
testing/ocfs2-tools/ocfs2-tools.confd → testing/ocfs2-tools/o2cb.confd
View File

0
testing/ocfs2-tools/ocfs2-tools.initd → testing/ocfs2-tools/o2cb.initd
View File

12
testing/ocfs2-tools/ocfs2-tools-1.6.4-umode_t.patch
View File

@ -1,12 +0,0 @@
--- ocfs2-tools-1.6.4/include/ocfs2-kernel/ocfs2_fs.h 2010-12-29 07:30:55.000000000 +0100
+++ ocfs2-tools-1.6.4.n/include/ocfs2-kernel/ocfs2_fs.h 2012-04-23 19:13:46.402253336 +0200
@@ -1638,7 +1638,7 @@
}
static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de,
- umode_t mode)
+ unsigned short mode)
{
de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
}

48
testing/ocfs2-tools/ocfs2console-explicitly-specified-link-libraries.patch Normal file
View File

@ -0,0 +1,48 @@
From e686b8013a14b9b28e77bf08457d426f45689e9d Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Mon, 29 Jan 2018 15:01:32 +0800
Subject: [PATCH] ocfs2console: explicitly specified link libraries
Patch-Source: https://src.fedoraproject.org/rpms/ocfs2-tools/blob/f28/f/0001-ocfs2console-explicitly-specified-link-libraries.patch
---
ocfs2console/ocfs2interface/Makefile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile
index 54094559..7c7c9b1c 100644
--- a/ocfs2console/ocfs2interface/Makefile
+++ b/ocfs2console/ocfs2interface/Makefile
@@ -19,6 +19,9 @@ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt
else
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
endif
+ifneq ($(BUILD_CMAP_SUPPORT),)
+LIBO2CB_LIBS += -lcmap
+endif
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
ifdef HAVE_BLKID
@@ -94,16 +97,16 @@ INSTALL_RULES = install-pylib
DIST_FILES = $(PLIST_CFILES) $(PLIST_HFILES) $(GIDLE_CFILES) $(OCFS2_CFILES) $(O2CB_CFILES) $(PYSRC) $(addsuffix .in,$(BUILT_PYSRC))
plistmodule.so: $(PLIST_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) $(BLKID_DEPS)
- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS)
+ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS) $(shell python-config --libs)
gidlemodule.so: $(GIDLE_OBJS)
- $(LINK) -shared $(GLIB_LIBS)
+ $(LINK) -shared $(GLIB_LIBS) $(shell python-config --libs)
ocfs2module.so: $(OCFS2_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS)
+ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) $(shell python-config --libs)
o2cbmodule.so: $(O2CB_OBJS) $(LIBO2CB_DEPS)
- $(LINK) -shared $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
+ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(shell python-config --libs)
install-pylib:
$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2interface
--
2.13.6

55
testing/ocfs2-tools/tunefs-remove-op_query.patch Normal file
View File

@ -0,0 +1,55 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 23 May 2018 21:14:00 +0200
Subject: [PATCH] Remove query operation from tunefs
tunefs.ocfs2/op_query.c uses glibc's printf extensions that are not
available in the musl libc. I didn't find any standalone implementation
and it's not trivial to implement them, so we must remove this feature
for now.
--- a/tunefs.ocfs2/Makefile
+++ b/tunefs.ocfs2/Makefile
@@ -42,7 +42,6 @@
op_cloned_volume \
op_features \
op_list_sparse_files \
- op_query \
op_reset_uuid \
op_resize_volume \
op_set_label \
--- a/tunefs.ocfs2/ocfs2ne.c
+++ b/tunefs.ocfs2/ocfs2ne.c
@@ -89,7 +89,6 @@
extern struct tunefs_operation list_sparse_op;
-extern struct tunefs_operation query_op;
extern struct tunefs_operation reset_uuid_op;
extern struct tunefs_operation features_op;
extern struct tunefs_operation resize_volume_op;
@@ -498,17 +497,6 @@
.opt_handle = handle_answer,
};
-static struct tunefs_option query_option = {
- .opt_option = {
- .name = "query",
- .val = 'Q',
- .has_arg = 1,
- },
- .opt_help = "-Q|--query <query-format>",
- .opt_handle = &generic_handle_arg,
- .opt_op = &query_op,
-};
-
static struct tunefs_option list_sparse_option = {
.opt_option = {
.name = "list-sparse",
@@ -652,7 +640,6 @@
&resize_volume_option,
&reset_uuid_option,
&journal_option,
- &query_option,
&list_sparse_option,
&mount_type_option,
&backup_super_option,