commit: f1d8b9e871854b3bb0f5c810a4883ab8d8f114eb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 08:56:54 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May 10 08:56:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d8b9e8
sys-fs/lvm2: clean up patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...apper.conf-1.02.22-r3 => device-mapper.conf-r4} | 0
...e-mapper.rc-2.02.105-r2 => device-mapper.rc-r3} | 0
...meventd.initd-2.02.184-r2 => dmeventd.initd-r3} | 0
...g.initd-2.02.105-r2 => lvm-monitoring.initd-r3} | 0
.../files/{lvm.confd-2.02.184-r3 => lvm.confd-r4} | 0
sys-fs/lvm2/files/{lvm.rc-2.02.187 => lvm.rc-r1} | 0
...nitrd.patch => lvm2-2.03.20-createinitrd.patch} | 0
... => lvm2-2.03.20-dm_lvm_rules_no_systemd.patch} | 0
...ch => lvm2-2.03.20-dmeventd-no-idle-exit.patch} | 0
...in.patch => lvm2-2.03.20-example.conf.in.patch} | 0
...-musl.patch => lvm2-2.03.20-freopen-musl.patch} | 0
...e-muck.patch => lvm2-2.03.20-locale-muck.patch} | 0
....patch => lvm2-2.03.20-lvm2create_initrd.patch} | 0
...vmlockd.initd-2.02.166-r1 => lvmlockd.initd-r2} | 0
.../{lvmpolld.initd-2.02.183 => lvmpolld.initd-r1} | 0
sys-fs/lvm2/lvm2-2.03.20.ebuild | 30 +++++++++++-----------
sys-fs/lvm2/lvm2-2.03.21.ebuild | 30 +++++++++++-----------
17 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3
b/sys-fs/lvm2/files/device-mapper.conf-r4
similarity index 100%
rename from sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3
rename to sys-fs/lvm2/files/device-mapper.conf-r4
diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
b/sys-fs/lvm2/files/device-mapper.rc-r3
similarity index 100%
rename from sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
rename to sys-fs/lvm2/files/device-mapper.rc-r3
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2
b/sys-fs/lvm2/files/dmeventd.initd-r3
similarity index 100%
rename from sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2
rename to sys-fs/lvm2/files/dmeventd.initd-r3
diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
b/sys-fs/lvm2/files/lvm-monitoring.initd-r3
similarity index 100%
rename from sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
rename to sys-fs/lvm2/files/lvm-monitoring.initd-r3
diff --git a/sys-fs/lvm2/files/lvm.confd-2.02.184-r3
b/sys-fs/lvm2/files/lvm.confd-r4
similarity index 100%
rename from sys-fs/lvm2/files/lvm.confd-2.02.184-r3
rename to sys-fs/lvm2/files/lvm.confd-r4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-r1
similarity index 100%
rename from sys-fs/lvm2/files/lvm.rc-2.02.187
rename to sys-fs/lvm2/files/lvm.rc-r1
diff --git a/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-createinitrd.patch
diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.03.19-dm_lvm_rules_no_systemd.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-dm_lvm_rules_no_systemd.patch
diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.03.19-dmeventd-no-idle-exit.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-dmeventd-no-idle-exit.patch
diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.03.17-example.conf.in.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-example.conf.in.patch
diff --git a/sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.03.19-freopen-musl.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-freopen-musl.patch
diff --git a/sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.03.17-locale-muck.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch
diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch
b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch
similarity index 100%
rename from sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch
rename to sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch
diff --git a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
b/sys-fs/lvm2/files/lvmlockd.initd-r2
similarity index 100%
rename from sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
rename to sys-fs/lvm2/files/lvmlockd.initd-r2
diff --git a/sys-fs/lvm2/files/lvmpolld.initd-2.02.183
b/sys-fs/lvm2/files/lvmpolld.initd-r1
similarity index 100%
rename from sys-fs/lvm2/files/lvmpolld.initd-2.02.183
rename to sys-fs/lvm2/files/lvmpolld.initd-r1
diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild
index 84c67872e4f6..4ea94fc558fe 100644
--- a/sys-fs/lvm2/lvm2-2.03.20.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.20.ebuild
@@ -56,14 +56,14 @@ BDEPEND="
PATCHES=(
# Gentoo specific modification(s):
- "${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch
+ "${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
# For upstream -- review and forward:
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
- "${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373
- "${FILESDIR}"/${PN}-2.03.19-dmeventd-no-idle-exit.patch
- "${FILESDIR}"/${PN}-2.03.19-freopen-musl.patch
+ "${FILESDIR}"/${PN}-2.03.20-lvm2create_initrd.patch
+ "${FILESDIR}"/${PN}-2.03.20-createinitrd.patch #301331
+ "${FILESDIR}"/${PN}-2.03.20-locale-muck.patch #330373
+ "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
+ "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
)
pkg_setup() {
@@ -95,7 +95,7 @@ src_prepare() {
# Users without systemd get no auto-activation of any logical volume
if ! use systemd ; then
- eapply "${FILESDIR}"/${PN}-2.03.19-dm_lvm_rules_no_systemd.patch
+ eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch
fi
eautoreconf
@@ -200,13 +200,13 @@ src_install() {
)
emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+ newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper
+ newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper
if use lvm ; then
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
+ newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd
+ newinitd "${FILESDIR}"/lvm.rc-r1 lvm
+ newconfd "${FILESDIR}"/lvm.confd-r4 lvm
if ! use udev ; then
# We keep the variable but remove udev from it.
sed -r -i \
@@ -214,8 +214,8 @@ src_install() {
"${ED}"/etc/conf.d/lvm || die "Could not drop
udev from rc_need"
fi
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2
lvm-monitoring
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+ newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring
+ newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld
if use lvm2create-initrd; then
dosbin scripts/lvm2create_initrd/lvm2create_initrd
@@ -224,7 +224,7 @@ src_install() {
fi
if use sanlock; then
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1
lvmlockd
+ newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
fi
fi
diff --git a/sys-fs/lvm2/lvm2-2.03.21.ebuild b/sys-fs/lvm2/lvm2-2.03.21.ebuild
index 5d9eb0ac9398..12b85fc8045c 100644
--- a/sys-fs/lvm2/lvm2-2.03.21.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.21.ebuild
@@ -56,14 +56,14 @@ BDEPEND="
PATCHES=(
# Gentoo specific modification(s):
- "${FILESDIR}"/${PN}-2.03.17-example.conf.in.patch
+ "${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
# For upstream -- review and forward:
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
- "${FILESDIR}"/${PN}-2.03.17-locale-muck.patch #330373
- "${FILESDIR}"/${PN}-2.03.19-dmeventd-no-idle-exit.patch
- "${FILESDIR}"/${PN}-2.03.19-freopen-musl.patch
+ "${FILESDIR}"/${PN}-2.03.20-lvm2create_initrd.patch
+ "${FILESDIR}"/${PN}-2.03.20-createinitrd.patch #301331
+ "${FILESDIR}"/${PN}-2.03.20-locale-muck.patch #330373
+ "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
+ "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
)
pkg_setup() {
@@ -95,7 +95,7 @@ src_prepare() {
# Users without systemd get no auto-activation of any logical volume
if ! use systemd ; then
- eapply "${FILESDIR}"/${PN}-2.03.19-dm_lvm_rules_no_systemd.patch
+ eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch
fi
eautoreconf
@@ -201,13 +201,13 @@ src_install() {
)
emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+ newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper
+ newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper
if use lvm ; then
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
+ newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd
+ newinitd "${FILESDIR}"/lvm.rc-r1 lvm
+ newconfd "${FILESDIR}"/lvm.confd-r4 lvm
if ! use udev ; then
# We keep the variable but remove udev from it.
sed -r -i \
@@ -215,8 +215,8 @@ src_install() {
"${ED}"/etc/conf.d/lvm || die "Could not drop
udev from rc_need"
fi
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2
lvm-monitoring
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+ newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring
+ newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld
if use lvm2create-initrd; then
dosbin scripts/lvm2create_initrd/lvm2create_initrd
@@ -225,7 +225,7 @@ src_install() {
fi
if use sanlock; then
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1
lvmlockd
+ newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
fi
fi
