systemd/multipath-tools: remove
not needed anymore. eudev is provided by systemd. Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7497>
This commit is contained in:
Achill Gilgenast
The Friendly Merge Bot
parent
e8e61a4f9f
commit
ad7f71fb30
8 changed files with 0 additions and 288 deletions
|
|
@ -1,25 +0,0 @@
|
|||
From 91e9ec2982ec57cf847d9aab6aeeec903797588f Mon Sep 17 00:00:00 2001
|
||||
From: Leonardo Arena <rnalrd@alpinelinux.org>
|
||||
Date: Thu, 29 Aug 2024 08:25:09 +0000
|
||||
Subject: [PATCH] disable O2
|
||||
|
||||
---
|
||||
Makefile.inc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.inc b/Makefile.inc
|
||||
index 729618b..978de09 100644
|
||||
--- a/Makefile.inc
|
||||
+++ b/Makefile.inc
|
||||
@@ -99,7 +99,7 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
|
||||
MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
|
||||
echo "modprobe@dm_multipath.service")
|
||||
|
||||
-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
|
||||
+OPTFLAGS := -Os -g $(STACKPROT) --param=ssp-buffer-size=4
|
||||
|
||||
# Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
|
||||
WARN_ONLY :=
|
||||
--
|
||||
2.46.0
|
||||
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
# Forked from Alpine to remove eudev dependency
|
||||
|
||||
pkgname=multipath-tools
|
||||
_pkgver=0.13.0
|
||||
pkgver="9999$_pkgver"
|
||||
pkgrel=0
|
||||
pkgdesc="Device Mapper Multipathing Driver"
|
||||
url="http://christophe.varoqui.free.fr/"
|
||||
# armhf: pmb#2618
|
||||
arch="all !s390x !ppc64le !armhf" # temp disable build due to failure
|
||||
license="LGPL-2.0-only"
|
||||
makedepends="
|
||||
json-c-dev
|
||||
libaio-dev
|
||||
lvm2-dev
|
||||
ncurses-dev
|
||||
perl
|
||||
readline-dev
|
||||
systemd-dev
|
||||
userspace-rcu-dev
|
||||
util-linux-dev
|
||||
"
|
||||
checkdepends="cmocka-dev"
|
||||
subpackages="$pkgname-doc $pkgname-openrc kpartx $pkgname-udev"
|
||||
source="$pkgname-$_pkgver.tar.gz::https://github.com/opensvc/multipath-tools/archive/refs/tags/$_pkgver.tar.gz
|
||||
multipath-tools.conf
|
||||
multipath.initd
|
||||
multipathd.initd
|
||||
multipathd.confd
|
||||
0001-Disable-O2.patch
|
||||
fix-basename.patch
|
||||
disable-devt-test.patch
|
||||
"
|
||||
builddir="$srcdir"/multipath-tools-"$_pkgver"
|
||||
|
||||
build() {
|
||||
make WARN_ONLY=1 prefix="/usr" \
|
||||
sysconfdir="/etc" \
|
||||
configdir="/etc/multipath/conf.d" \
|
||||
mandir="/usr/share/man" \
|
||||
infodir="/usr/share/info" \
|
||||
statedir="/etc/multipath" \
|
||||
etc_prefix=""
|
||||
}
|
||||
|
||||
check() {
|
||||
make test
|
||||
}
|
||||
|
||||
package() {
|
||||
make prefix="/usr" SYSTEMDPATH="/usr/lib" LIB=lib DESTDIR="$pkgdir" install
|
||||
|
||||
install -D -m644 "$srcdir"/$pkgname.conf \
|
||||
"$pkgdir"/etc/multipath.conf
|
||||
install -D -m755 "$srcdir"/multipathd.initd \
|
||||
"$pkgdir"/etc/init.d/multipathd
|
||||
install -D -m644 "$srcdir"/multipathd.confd \
|
||||
"$pkgdir"/etc/conf.d/multipathd
|
||||
install -D -m755 "$srcdir"/multipath.initd \
|
||||
"$pkgdir"/etc/init.d/multipath
|
||||
install -D -m644 README.md \
|
||||
"$pkgdir"/usr/share/doc/$pkgname/README.md
|
||||
}
|
||||
|
||||
kpartx() {
|
||||
pkgdesc="Create device maps from partition tables (from multipath-tools)"
|
||||
depends=""
|
||||
install_if="$pkgname=$pkgver-r$pkgrel"
|
||||
|
||||
amove usr/sbin/kpartx
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
75c84524ee27590b8b751ea500898a44e5ac3d58d55be6bcab919d0d423049db3a4466fcb9135705cf63ba074416973bb651255063269e9f682f11d21ba57e59 multipath-tools-0.13.0.tar.gz
|
||||
e81462b22c0cbc92ea935d7544b9f9a0c4ccbcf13f3bc03dadf6de96407c9cf49964c9bbf02f12a134e1255c66421c6fde39d54b15eef975e8df81bdc88b2213 multipath-tools.conf
|
||||
6176a4ed32711ff8e417a58ca0cad8279d46ba98ec40095dbdb1035c49c0f82b06b5affbe2b79c5f2020b215ebe31ebeb408509dc810f5d21eb757e88be8c99f multipath.initd
|
||||
17853ca127259e129bbd61f24a830777d5b6d69f6500313fa62a0e0773de73387ce2c3a58a93a6182ee3d4891d1ec5fc2322cb674e787b326ef9cd8dcff5cbab multipathd.initd
|
||||
2adc2b8322645fec8763a662614b5682294f81dc0f1b9cacace5e5ea62125aa80f4874c1b10f11619e79871087846a946f7a383c22953ca1fbaeb9ea021c5114 multipathd.confd
|
||||
12efc27a7fd492834dd1d86d67faa1a6884142779f5452ada5373d893cd441572e07f9f9ea441dd92d49274ccc21a53d70f2af8a49c63060ff7490b93e3cb58d 0001-Disable-O2.patch
|
||||
3f65a2006c03ba168eb3fcec537042ae9e0ddbcab48a051970fcc477bd88b2eeb16db79c9f06d4fc7b7e06411d46e159b7d13d2fe9613ba5be1ed68d9e66e54c fix-basename.patch
|
||||
b9d1647a9b025a6e1793cf2ccad4df48b9b46d73dd990fed7185c7e6d2736905650ef453b70d8ba603132df5247243d99f917de69c391aae72b01f2997c99f10 disable-devt-test.patch
|
||||
"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
depends on udev and being able to see into /sys
|
||||
which is not present in rootbld
|
||||
|
||||
diff --git a/tests/Makefile b/tests/Makefile
|
||||
index 28c00ad..1878ba2 100644
|
||||
--- a/tests/Makefile
|
||||
+++ b/tests/Makefile
|
||||
@@ -9,7 +9,7 @@ CFLAGS += $(BIN_CFLAGS) -Wno-unused-parameter $(W_MISSING_INITIALIZERS)
|
||||
LIBDEPS += -L. -L $(mpathutildir) -L$(mpathcmddir) -lmultipath -lmpathutil -lmpathcmd -lcmocka
|
||||
|
||||
TESTS := uevent parser util dmevents hwtable blacklist unaligned vpd pgpolicy \
|
||||
- alias directio valid devt mpathvalid strbuf sysfs features cli mapinfo
|
||||
+ alias directio valid mpathvalid strbuf sysfs features cli mapinfo
|
||||
HELPERS := test-lib.o test-log.o
|
||||
|
||||
.PRECIOUS: $(TESTS:%=%-test)
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/libmultipath/configure.c b/libmultipath/configure.c
|
||||
index d809490..62154fd 100644
|
||||
--- a/libmultipath/configure.c
|
||||
+++ b/libmultipath/configure.c
|
||||
@@ -43,6 +43,9 @@
|
||||
#include "sysfs.h"
|
||||
#include "io_err_stat.h"
|
||||
|
||||
+#define basename(dev) \
|
||||
+ (strrchr((dev),'/') ? strrchr((dev),'/')+1 : (dev))
|
||||
+
|
||||
/* group paths in pg by host adapter
|
||||
*/
|
||||
int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
##
|
||||
## This is a template multipath-tools configuration file
|
||||
## Uncomment the lines relevent to your environment
|
||||
##
|
||||
#defaults {
|
||||
# udev_dir /dev
|
||||
# polling_interval 10
|
||||
# selector "round-robin 0"
|
||||
# path_grouping_policy multibus
|
||||
# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
|
||||
# prio_callout /bin/true
|
||||
# path_checker directio
|
||||
# rr_min_io 100
|
||||
# rr_weight priorities
|
||||
# failback immediate
|
||||
# no_path_retry fail
|
||||
# user_friendly_names no
|
||||
#}
|
||||
#blacklist {
|
||||
# wwid 26353900f02796769
|
||||
# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
|
||||
# devnode "^hd[a-z][[0-9]*]"
|
||||
# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
|
||||
# device {
|
||||
# vendor DEC.*
|
||||
# product MSA[15]00
|
||||
# }
|
||||
#}
|
||||
#blacklist_exceptions {
|
||||
# devnode "^dasd[c-d]+[0-9]*"
|
||||
# wwid "IBM.75000000092461.4d00.34"
|
||||
#}
|
||||
#multipaths {
|
||||
# multipath {
|
||||
# wwid 3600508b4000156d700012000000b0000
|
||||
# alias yellow
|
||||
# path_grouping_policy multibus
|
||||
# path_checker directio
|
||||
# path_selector "round-robin 0"
|
||||
# failback manual
|
||||
# rr_weight priorities
|
||||
# no_path_retry 5
|
||||
# rr_min_io 100
|
||||
# }
|
||||
# multipath {
|
||||
# wwid 1DEC_____321816758474
|
||||
# alias red
|
||||
# }
|
||||
#}
|
||||
#devices {
|
||||
# device {
|
||||
# vendor "COMPAQ "
|
||||
# product "HSV110 (C)COMPAQ"
|
||||
# path_grouping_policy multibus
|
||||
# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
|
||||
# path_checker directio
|
||||
# path_selector "round-robin 0"
|
||||
# hardware_handler "0"
|
||||
# failback 15
|
||||
# rr_weight priorities
|
||||
# no_path_retry queue
|
||||
# rr_min_io 100
|
||||
# product_blacklist LUN_Z
|
||||
# }
|
||||
# device {
|
||||
# vendor "COMPAQ "
|
||||
# product "MSA1000 "
|
||||
# path_grouping_policy multibus
|
||||
# }
|
||||
#}
|
||||
|
||||
#defaults {
|
||||
# udev_dir /dev
|
||||
# user_friendly_names yes
|
||||
#}
|
||||
|
||||
#blacklist {
|
||||
# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
|
||||
# devnode "^hd[a-z]"
|
||||
# devnode "^sda"
|
||||
# devnode "^sdb"
|
||||
# devnode "^sdc"
|
||||
# devnode "^sdd"
|
||||
# devnode "^sda[0-9]"
|
||||
# devnode "^sdb[0-9]"
|
||||
# device {
|
||||
# vendor DELL
|
||||
# product "PERC|Universal"
|
||||
# }
|
||||
#}
|
||||
|
||||
#devices {
|
||||
# device {
|
||||
# vendor DELL
|
||||
# product MD3000i
|
||||
# hardware_handler "1 rdac"
|
||||
# path_checker rdac
|
||||
# path_grouping_policy group_by_prio
|
||||
# prio_callout "/sbin/mpath_prio_rdac /dev/%n"
|
||||
# failback immediate
|
||||
# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n"
|
||||
# }
|
||||
#}
|
||||
|
||||
#multipaths {
|
||||
# multipath {
|
||||
# device {
|
||||
# vendor DELL
|
||||
# product MD3000i
|
||||
# }
|
||||
# }
|
||||
#}
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
description="Initialize multipath"
|
||||
|
||||
depend() {
|
||||
before checkfs fsck multipathd iscsid lvm
|
||||
after modules device-mapper
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Loading multipath modules"
|
||||
modprobe -aq dm_mod dm-multipath
|
||||
eend $?
|
||||
|
||||
ebegin "Activating multipath devices"
|
||||
multipath -v0 >/dev/null
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Deactivating multipath devices"
|
||||
multipath -v0 -F >/dev/null
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
# Configuration for /etc/init.d/multipathd
|
||||
|
||||
# Comment out to run without process supervisor.
|
||||
supervisor="supervise-daemon"
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
description="Multipath monitoring daemon"
|
||||
|
||||
command="/usr/sbin/multipathd"
|
||||
command_args="-d $command_args"
|
||||
command_background="yes"
|
||||
pidfile="/run/$RC_SVCNAME.pid"
|
||||
output_log="/var/log/$RC_SVCNAME.log"
|
||||
error_log="/var/log/$RC_SVCNAME.log"
|
||||
Loading…
Add table
Add a link
Reference in a new issue