From eb28d20ba39984da18a35032b19f9882f13fdfde Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Wed, 25 Sep 2019 14:38:01 -0300
Subject: [PATCH] testing/ocfs2-tools: upgrade to 1.8.6
---
testing/ocfs2-tools/APKBUILD | 17 +---
.../fix-unknown-type-errcode_t.patch | 82 -------------------
...-explicitly-specified-link-libraries.patch | 48 -----------
3 files changed, 4 insertions(+), 143 deletions(-)
delete mode 100644 testing/ocfs2-tools/fix-unknown-type-errcode_t.patch
delete mode 100644 testing/ocfs2-tools/ocfs2console-explicitly-specified-link-libraries.patch
diff --git a/testing/ocfs2-tools/APKBUILD b/testing/ocfs2-tools/APKBUILD
index 10de7abe3ccc..7d1b29d1d9bb 100644
--- a/testing/ocfs2-tools/APKBUILD
+++ b/testing/ocfs2-tools/APKBUILD
@@ -4,8 +4,8 @@
#
# TODO: Fix init script (remove bashisms)
pkgname=ocfs2-tools
-pkgver=1.8.5
-pkgrel=2
+pkgver=1.8.6
+pkgrel=0
pkgdesc="Oracle Cluster File System 2 Core Tools"
url="https://oss.oracle.com/projects/ocfs2-tools"
arch="all"
@@ -21,10 +21,8 @@ source="ocfs2-tools-$pkgver.tar.gz::https://github.com/markfasheh/ocfs2-tools/ar
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
fix-o2monitor-undeclared-PATH_MAX.patch
- ocfs2console-explicitly-specified-link-libraries.patch
tunefs-remove-op_query.patch
fix-sysmacros.patch
"
@@ -57,6 +55,7 @@ build() {
package() {
make DESTDIR="$pkgdir" install
+ rm -f "$pkgdir"/usr/lib/*.a
# FIXME: remove bashisms
#install -m 755 -D "$srcdir"/o2cb.initd "$pkgdir"/etc/init.d/o2cb
@@ -64,22 +63,14 @@ package() {
install -m 644 -D "$srcdir"/cluster.conf "$pkgdir"/etc/ocfs2/cluster.conf
}
-_mv() {
- local dest; for dest; do true; done # get last argument
- mkdir -p "$dest"
- mv $@
-}
-
-sha512sums="94153af0570dafd60c4f6eb31d53ad222ec1e001acb1b29333cef3eafd0a134921566b8dcbd148b4b4af8067dd7419d5bd8d8cd3fef87ab0efcc6c8fb304d22d ocfs2-tools-1.8.5.tar.gz
+sha512sums="71abe46152b065b9ba7db192b9f14ed28a1fbf0fa68822d4e8188c6f1654dfaaa29ae72ea4219bd68e7fade7791a08d36cbd5af5a16a2ee96e194ecb6f0d950b ocfs2-tools-1.8.6.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
35d5872e6a3651583442b3a333a2e866bf241b4fc19bdbabf4bb46cdbdb6b2806d81092b1fa80a9841a49e95a40d2bc09d12ad33e8cfbf3c267698eb9120b307 fix-o2monitor-undeclared-PATH_MAX.patch
-3f1bf02eaa0f26f800cd18445cab32c72a93b7b6bc60ed5940fcd9b36d9e0d4458c73133fa1de55d81b49367ce228c829cbf9eaef7590189b67c3fa11d1e45df ocfs2console-explicitly-specified-link-libraries.patch
c614235c98426a60d484203b47c44643833496de9864f2f6b1bedec206de33231878799d0b16ad2462c7ed2920cd0d8f9fd41fd7b1fff5b644e8be4b31ed815d tunefs-remove-op_query.patch
a4b202ea3518f766e1b43b0acb1acc961d5c4d9d6792eaa77d64a07f97050be090e0233509b34fe9553328ec0e85c4735984a7009f6dc8b8325350e3525158d7 fix-sysmacros.patch"
diff --git a/testing/ocfs2-tools/fix-unknown-type-errcode_t.patch b/testing/ocfs2-tools/fix-unknown-type-errcode_t.patch
deleted file mode 100644
index 7ad9d94e69ba..000000000000
--- a/testing/ocfs2-tools/fix-unknown-type-errcode_t.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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 {
diff --git a/testing/ocfs2-tools/ocfs2console-explicitly-specified-link-libraries.patch b/testing/ocfs2-tools/ocfs2console-explicitly-specified-link-libraries.patch
deleted file mode 100644
index 4441d0bf99ab..000000000000
--- a/testing/ocfs2-tools/ocfs2console-explicitly-specified-link-libraries.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-
--
GitLab