From 2e2624f9292ee49611c7bb375c50b33288552ad1 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Sat, 2 May 2026 21:31:57 +0200 Subject: [PATCH] testing/lizardfs: remove --- testing/lizardfs/APKBUILD | 160 ------------------ testing/lizardfs/gcc13.patch | 12 -- testing/lizardfs/lizardfs-cgiserv.confd | 10 -- testing/lizardfs/lizardfs-cgiserv.initd | 22 --- testing/lizardfs/lizardfs-chunkserver.initd | 9 - testing/lizardfs/lizardfs-cstdio-header.patch | 32 ---- testing/lizardfs/lizardfs-iostat-header.patch | 13 -- testing/lizardfs/lizardfs-master.initd | 8 - testing/lizardfs/lizardfs-metalogger.initd | 8 - testing/lizardfs/lizardfs-uraft.patch | 94 ---------- testing/lizardfs/lizardfs.pre-install | 7 - 11 files changed, 375 deletions(-) delete mode 100644 testing/lizardfs/APKBUILD delete mode 100644 testing/lizardfs/gcc13.patch delete mode 100644 testing/lizardfs/lizardfs-cgiserv.confd delete mode 100644 testing/lizardfs/lizardfs-cgiserv.initd delete mode 100644 testing/lizardfs/lizardfs-chunkserver.initd delete mode 100644 testing/lizardfs/lizardfs-cstdio-header.patch delete mode 100644 testing/lizardfs/lizardfs-iostat-header.patch delete mode 100644 testing/lizardfs/lizardfs-master.initd delete mode 100644 testing/lizardfs/lizardfs-metalogger.initd delete mode 100644 testing/lizardfs/lizardfs-uraft.patch delete mode 100644 testing/lizardfs/lizardfs.pre-install diff --git a/testing/lizardfs/APKBUILD b/testing/lizardfs/APKBUILD deleted file mode 100644 index d791f701eb6..00000000000 --- a/testing/lizardfs/APKBUILD +++ /dev/null @@ -1,160 +0,0 @@ -# Contributor: Michael Pirogov -# Maintainer: Michael Pirogov -pkgname=lizardfs -pkgver=3.13.0 -pkgrel=17 -pkgdesc="Highly reliable, scalable and efficient distributed file system" -url="https://github.com/lizardfs/lizardfs/" -arch="all" -license="GPL-3.0-only" -makedepends=" - asciidoc - boost-dev - cmake - db-dev - fuse-dev - fuse3-dev - isa-l-dev - judy-dev - libpcap-dev - libtool - linux-pam-dev - python3-dev - samurai - spdlog-dev - thrift-dev - zlib-dev - " -checkdepends="gtest-dev" -pkgusers="mfs" -pkggroups="mfs" -options="!check" # need to setup a virtual machine -install="$pkgname.pre-install" -subpackages=" - $pkgname-doc - $pkgname-client - $pkgname-master - $pkgname-chunkserver - $pkgname-metalogger - $pkgname-cgi::noarch - $pkgname-cgiserv::noarch - $pkgname-metalogger-openrc:metalogger_openrc - $pkgname-master-openrc:master_openrc - $pkgname-chunkserver-openrc:chunkserver_openrc - $pkgname-cgiserv-openrc:cgiserv_openrc - $pkgname-bash-completion - " -source="$pkgname-$pkgver.tar.gz::https://github.com/lizardfs/lizardfs/archive/refs/tags/$pkgver-rc3.tar.gz - gcc13.patch - $pkgname-uraft.patch - $pkgname-cgiserv.initd - $pkgname-chunkserver.initd - $pkgname-cgiserv.confd - $pkgname-master.initd - $pkgname-metalogger.initd - $pkgname-iostat-header.patch - $pkgname-cstdio-header.patch - " -builddir="$srcdir/$pkgname-$pkgver-rc3" - -build() { - if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" - fi - cmake3.5 -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DENABLE_TESTS="$(want_check && echo ON || echo OFF)" \ - -DENABLE_DOCS=NO \ - -DENABLE_JEMALLOC=YES \ - -DCMAKE_INSTALL_PREFIX=/ \ - -DENABLE_POLONAISE=OFF \ - -DTHROW_INSTEAD_OF_ABORT=YES \ - -Wno-dev \ - $CMAKE_CROSSOPTS - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build - chown -R mfs:mfs "$pkgdir"/var/lib/lizardfs - - mkdir -p "$pkgdir"/usr/share/bash-completion - mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions -} - -master() { - pkgdesc="LizardFS master server" - depends="lizardfs=$pkgver-r$pkgrel" - amove \ - usr/sbin/mfsmaster \ - usr/sbin/mfsrestoremaster \ - usr/sbin/mfsmetadump \ - usr/sbin/mfsmetarestore \ - var/lib/lizardfs/metadata.mfs.empty - chown -R $pkgusers:$pkggroups "$subpkgdir"/var/lib/lizardfs -} - -master_openrc() { - default_openrc - install -Dm755 "$srcdir"/$pkgname-master.initd "$subpkgdir"/etc/init.d/$pkgname-master -} - -metalogger() { - pkgdesc="LizardFS metadata replication server" - depends="lizardfs=$pkgver-r$pkgrel" - amove usr/sbin/mfsmetalogger -} - -metalogger_openrc() { - default_openrc - install -Dm755 "$srcdir"/$pkgname-metalogger.initd "$subpkgdir"/etc/init.d/$pkgname-metalogger -} - -chunkserver() { - pkgdesc="LizardFS data server" - depends="lizardfs=$pkgver-r$pkgrel" - amove usr/sbin/mfschunkserver -} - -chunkserver_openrc() { - default_openrc - install -Dm755 "$srcdir"/$pkgname-chunkserver.initd "$subpkgdir"/etc/init.d/$pkgname-chunkserver -} - -client() { - pkgdesc="LizardFS client" - depends="fuse fuse3" - amove usr/bin/* - -} - -cgi() { - pkgdesc="LizardFS CGI Monitor" - depends="python3" - amove usr/share/mfscgi -} - -cgiserv() { - pkgdesc="Simple CGI-capable HTTP server to run LizardFS CGI Monitor" - depends="$pkgname-cgi=$pkgver-r$pkgrel" - amove usr/sbin/mfscgiserv -} - -cgiserv_openrc() { - default_openrc - install -Dm755 "$srcdir"/$pkgname-cgiserv.initd "$subpkgdir"/etc/init.d/$pkgname-cgiserv - install -Dm755 "$srcdir"/$pkgname-cgiserv.confd "$subpkgdir"/etc/conf.d/$pkgname-cgiserv -} - -sha512sums=" -5e57c0704d30d1e4f7fd7c2ac6ed889d0075d86ad20536fc927f4fe0d228b907c4ac2697d3c17d0313853f27506fdf6441bf9559d3ed79ae95f51595ec3363d9 lizardfs-3.13.0.tar.gz -b0c13076aeef2489897ab73138101fbbd239ae4c7375bb45dc280b42dd5d7a761a46a97b64f3b5274c99a4318758024db593cb91a0d9a82e58b71ef45b20bf4c gcc13.patch -ec38f06048c2719bba1a8e751411468270e9bc82c955c897dde21cd1e428be686e2b3ae680a57813370ec89e264f66132acd27f84f2ade6f5a63c0b8e2ece256 lizardfs-uraft.patch -c698aff4de9aeb76202a809e44ac8d0ec9c6348a806b1c813c2a40858339b1c139a480a9c5aff40bf2c9821883c6c0dfeabb010f3faa5746673235f0fb3c5a76 lizardfs-cgiserv.initd -56a714f3d29030ca12dc1859a1121b2a89606a2ccccec65481e2eb0b846757dea71dfe5f5a6d648b32e731d14b7d7725f79703851365b0862d7eb415a5f49dfb lizardfs-chunkserver.initd -b5c625f0004df33889de60ddad37e41f3acf081b37247606a1544e5f63354e121fe4cce511a6e60f4f2c0305155faf0614b8a4bce7267929fe68a1a4b546b582 lizardfs-cgiserv.confd -a041fa324d37bda098ad65e9d6507f281ed388471956ca79aa33b8b0d1c4a9d528662a2410c47f3856183d6378ac7fb417c3d7ec314f624e7e5dac7c5e4247f0 lizardfs-master.initd -8e73a7715e7a010d435efb9058ed67aad1caa95c840d3f1fae6bafd2a700cedbb0244d29363929d8e8d9a2036a2e0b173c0c2f7b52529ba4088e1296479fc0f5 lizardfs-metalogger.initd -fed14323975cd2d916bcc78d15ec105176106024faa6587a5b6dc3f2c7c5cf3632491babf2865459ac614ba885ee79e301aac4f19c27c4f04780a4a9d94e9312 lizardfs-iostat-header.patch -b91f07af8a1d82ac9530e0ddc5984ee1f3cba9af7d6e9bf2093d04fbd0862d98860a2db2bd13fe6e0eea0cd7bfd2254a8973a5a398402c1682c51b54267b82cf lizardfs-cstdio-header.patch -" diff --git a/testing/lizardfs/gcc13.patch b/testing/lizardfs/gcc13.patch deleted file mode 100644 index 40438422b35..00000000000 --- a/testing/lizardfs/gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/common/io_limits_config_loader.h b/src/common/io_limits_config_loader.h -index 411f986..7554792 100644 ---- a/src/common/io_limits_config_loader.h -+++ b/src/common/io_limits_config_loader.h -@@ -19,6 +19,7 @@ - #pragma once - #include "common/platform.h" - -+#include - #include - #include - #include diff --git a/testing/lizardfs/lizardfs-cgiserv.confd b/testing/lizardfs/lizardfs-cgiserv.confd deleted file mode 100644 index b50a6aa77bc..00000000000 --- a/testing/lizardfs/lizardfs-cgiserv.confd +++ /dev/null @@ -1,10 +0,0 @@ -# MooseFS HTTP/CGI server configuration. - -# BIND_HOST: local address to listen on -# default: any -BIND_HOST="0.0.0.0" - -# BIND_PORT: port to listen on -# default: 9425 -BIND_PORT=9425 - diff --git a/testing/lizardfs/lizardfs-cgiserv.initd b/testing/lizardfs/lizardfs-cgiserv.initd deleted file mode 100644 index fdd01c0257a..00000000000 --- a/testing/lizardfs/lizardfs-cgiserv.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run - -PIDFILE=/var/run/mfscgiserv.pid - -depend() { - need net -} - -start() { - ebegin "Starting mfs CGI server" - start-stop-daemon --start --quiet --exec /usr/sbin/mfscgiserv \ - --pidfile "${PIDFILE}" --make-pidfile --background \ - -- -H ${BIND_HOST} -P ${BIND_PORT} -f - eend $? -} - -stop() { - ebegin "Stopping mfs CGI server" - start-stop-daemon --stop -q --pidfile "${PIDFILE}" - eend $? -} - diff --git a/testing/lizardfs/lizardfs-chunkserver.initd b/testing/lizardfs/lizardfs-chunkserver.initd deleted file mode 100644 index b564270254b..00000000000 --- a/testing/lizardfs/lizardfs-chunkserver.initd +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/openrc-run - -command=/usr/sbin/mfschunkserver - -depend() { - need syslog - after net -} - diff --git a/testing/lizardfs/lizardfs-cstdio-header.patch b/testing/lizardfs/lizardfs-cstdio-header.patch deleted file mode 100644 index af55d6dbdda..00000000000 --- a/testing/lizardfs/lizardfs-cstdio-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e418677e7d09b6a44805cbca177a446016eea23f Mon Sep 17 00:00:00 2001 -From: Patryk -Date: Sun, 23 Aug 2020 09:52:26 +0200 -Subject: [PATCH] build: Fix compilation for gcc-10 - -There was a lacking include for cstdio in daemonize.cc. -This header is no longer included implicitly since gcc-10, -hence the compilation error. -See: https://github.com/CopernicaMarketingSoftware/PHP-CPP/pull/440 - -Change-Id: I5b22d4759e100e270aa0732d32407b0edc16f500 ---- - src/mount/fuse/daemonize.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/mount/fuse/daemonize.cc b/src/mount/fuse/daemonize.cc -index 8d0ccf1c4..7ba3eeadc 100644 ---- a/src/mount/fuse/daemonize.cc -+++ b/src/mount/fuse/daemonize.cc -@@ -19,9 +19,10 @@ - #include "common/platform.h" - #include "daemonize.h" - --#include -+#include -+#include -+#include - #include --#include - #include - #include - #include diff --git a/testing/lizardfs/lizardfs-iostat-header.patch b/testing/lizardfs/lizardfs-iostat-header.patch deleted file mode 100644 index 2ce24025600..00000000000 --- a/testing/lizardfs/lizardfs-iostat-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/chunkserver/iostat.h b/src/chunkserver/iostat.h -index e1a50e97..09a04c67 100644 ---- a/src/chunkserver/iostat.h -+++ b/src/chunkserver/iostat.h -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include - diff --git a/testing/lizardfs/lizardfs-master.initd b/testing/lizardfs/lizardfs-master.initd deleted file mode 100644 index e8c9217b4f9..00000000000 --- a/testing/lizardfs/lizardfs-master.initd +++ /dev/null @@ -1,8 +0,0 @@ -#!/sbin/openrc-run - -command=/usr/sbin/mfsmaster - -depend() { - need syslog - after net -} diff --git a/testing/lizardfs/lizardfs-metalogger.initd b/testing/lizardfs/lizardfs-metalogger.initd deleted file mode 100644 index 72e9c58d4ba..00000000000 --- a/testing/lizardfs/lizardfs-metalogger.initd +++ /dev/null @@ -1,8 +0,0 @@ -#!/sbin/openrc-run - -command=/usr/sbin/mfsmetalogger - -depend() { - need syslog - after net -} diff --git a/testing/lizardfs/lizardfs-uraft.patch b/testing/lizardfs/lizardfs-uraft.patch deleted file mode 100644 index 8f2ba81f48a..00000000000 --- a/testing/lizardfs/lizardfs-uraft.patch +++ /dev/null @@ -1,94 +0,0 @@ -From be9ae3a1943e7164ac093fe46612b94fa9fbd69f Mon Sep 17 00:00:00 2001 -From: Marcin Konarski -Date: Thu, 27 May 2021 14:27:17 +0200 -Subject: [PATCH] all: Fix (release) build warnings from GCC 11.1.1 - -Change-Id: I164403e5fd866828b2970a23e928a495630405a7 ---- - src/common/small_vector_unittest.cc | 3 +++ - src/master/matoclserv.cc | 2 +- - src/tools/file_info.cc | 3 +++ - src/uraft/main.cc | 1 + - src/uraft/uraft.cc | 1 + - src/uraft/uraftcontroller.cc | 1 + - 6 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/common/small_vector_unittest.cc b/src/common/small_vector_unittest.cc -index 488a940e6..2da7d6640 100644 ---- a/src/common/small_vector_unittest.cc -+++ b/src/common/small_vector_unittest.cc -@@ -83,7 +83,10 @@ TEST(SmallVectorTest, EraseTest) { - small_vector vec_A; - std::vector vec_B; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wstringop-overflow" - vec_A.insert(vec_A.begin(), range.begin(), range.end()); -+#pragma GCC diagnostic pop - vec_B.insert(vec_B.begin(), range.begin(), range.end()); - - vec_A.erase(vec_A.begin() + 40); -diff --git a/src/master/matoclserv.cc b/src/master/matoclserv.cc -index 324633076..1645fc244 100644 ---- a/src/master/matoclserv.cc -+++ b/src/master/matoclserv.cc -@@ -2891,7 +2891,7 @@ void matoclserv_fuse_read_chunk(matoclserventry *eptr, PacketHeader header, cons - } - - void matoclserv_chunks_info(matoclserventry *eptr, const uint8_t *data, uint32_t length) { -- uint32_t message_id, inode, chunk_index, chunk_count, uid, gid; -+ uint32_t message_id{0}, inode, chunk_index, chunk_count, uid, gid; - PacketVersion version; - uint8_t status; - std::vector chunks; -diff --git a/src/tools/file_info.cc b/src/tools/file_info.cc -index fa03f591e..50a381229 100644 ---- a/src/tools/file_info.cc -+++ b/src/tools/file_info.cc -@@ -120,7 +120,10 @@ static int chunks_info(const char *file_name, int fd, uint32_t inode, bool long_ - chunk_index, chunk.chunk_id, chunk.chunk_version, chunk.chunk_id, chunk.chunk_version); - ChunkCopiesCalculator chunk_calculator; - for(const auto &part : chunk.chunk_parts) { -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wfree-nonheap-object" - chunk_calculator.addPart(part.chunkType, MediaLabel::kWildcard); -+#pragma GCC diagnostic pop - } - chunk_calculator.evalRedundancyLevel(); - if (chunk.chunk_parts.size() > 0) { -diff --git a/src/uraft/main.cc b/src/uraft/main.cc -index 6e1be1214..7a05fdb99 100644 ---- a/src/uraft/main.cc -+++ b/src/uraft/main.cc -@@ -11,6 +11,7 @@ - #include - #include - -+#define BOOST_BIND_GLOBAL_PLACEHOLDERS - #include - #include - #include -diff --git a/src/uraft/uraft.cc b/src/uraft/uraft.cc -index f6439b82f..05d88d122 100644 ---- a/src/uraft/uraft.cc -+++ b/src/uraft/uraft.cc -@@ -6,6 +6,7 @@ - #include - #endif - -+#define BOOST_BIND_GLOBAL_PLACEHOLDERS - #include - #include - -diff --git a/src/uraft/uraftcontroller.cc b/src/uraft/uraftcontroller.cc -index f46178fd1..53af6e1a8 100644 ---- a/src/uraft/uraftcontroller.cc -+++ b/src/uraft/uraftcontroller.cc -@@ -10,6 +10,7 @@ - #include - #include - -+#define BOOST_BIND_GLOBAL_PLACEHOLDERS - #include - #include - #include diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install deleted file mode 100644 index 83ce5445756..00000000000 --- a/testing/lizardfs/lizardfs.pre-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -addgroup -S mfs 2>/dev/null -adduser -S -D -H -h /var/lib/mfs -s /sbin/nologin -G mfs -g mfs mfs \ - 2>/dev/null - -exit 0