[arch-commits] Commit in lvm2/trunk (5 files)
Christian Hesse
eworm at archlinux.org
Tue Feb 2 17:32:50 UTC 2021
Date: Tuesday, February 2, 2021 @ 17:32:50
Author: eworm
Revision: 407075
upgpkg: lvm2 2.03.11-1: switch to 2.03.x branch
Modified:
lvm2/trunk/PKGBUILD
lvm2/trunk/lvm2_install
lvm2/trunk/sd-lvm2_install
Deleted:
lvm2/trunk/0001-fix-ordering-in-initramfs.patch
lvm2/trunk/lvm2_hook
--------------------------------------+
0001-fix-ordering-in-initramfs.patch | 21 ---------------------
PKGBUILD | 28 ++++++----------------------
lvm2_hook | 25 -------------------------
lvm2_install | 3 ---
sd-lvm2_install | 2 --
5 files changed, 6 insertions(+), 73 deletions(-)
Deleted: 0001-fix-ordering-in-initramfs.patch
===================================================================
--- 0001-fix-ordering-in-initramfs.patch 2021-02-02 16:46:14 UTC (rev 407074)
+++ 0001-fix-ordering-in-initramfs.patch 2021-02-02 17:32:50 UTC (rev 407075)
@@ -1,21 +0,0 @@
-From bc5886440e8573717a525bceb46ebe99dad9bce7 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Tue, 2 Jun 2020 09:30:30 +0200
-Subject: [PATCH] fix ordering in initramfs
----
- scripts/lvm2_lvmetad_systemd_red_hat.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.service.in b/scripts/lvm2_lvmetad_systemd_red_hat.service.in
-index 960f32dab..0b5ce1b79 100644
---- a/scripts/lvm2_lvmetad_systemd_red_hat.service.in
-+++ b/scripts/lvm2_lvmetad_systemd_red_hat.service.in
-@@ -3,7 +3,7 @@ Description=LVM2 metadata daemon
- Documentation=man:lvmetad(8)
- Requires=lvm2-lvmetad.socket
- Before=shutdown.target
--After=lvm2-lvmetad.socket
-+After=lvm2-lvmetad.socket systemd-udevd.service
- DefaultDependencies=no
- Conflicts=shutdown.target
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-02 16:46:14 UTC (rev 407074)
+++ PKGBUILD 2021-02-02 17:32:50 UTC (rev 407075)
@@ -3,8 +3,8 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.187
-pkgrel=3
+pkgver=2.03.11
+pkgrel=1
arch=('x86_64')
url='https://sourceware.org/lvm2/'
license=('GPL2' 'LGPL2.1')
@@ -12,21 +12,15 @@
validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17' # Alasdair G Kergon <agk at redhat.com>
'D501A478440AE2FD130A1BE8B9112431E509039F') # Marian Csontos <marian.csontos at gmail.com>
source=("git+https://sourceware.org/git/lvm2.git#tag=v${pkgver//./_}?signed"
- '0001-fix-ordering-in-initramfs.patch'
'lvm2_install'
- 'lvm2_hook'
'sd-lvm2_install'
'11-dm-initramfs.rules')
sha256sums=('SKIP'
- '7a34b263e51d5a71e0595bba163de478f4f14a26015b11e682406e4adf7ba656'
- 'cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6'
- '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
- 'b749c2da0e9307b0c2c3858d024a19c268e01e393e876a284fe1a302427f72f1'
+ 'af5ea3dac7466eda16da2482714d82f2b12a20b673ba973fa34663542ee34fb5'
+ '88cc3a47e9a46de76341ea588fc642d45a716c38b6ab0a3346e482adb6b40aa3'
'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
_backports=(
- # udev: remove unsupported OPTIONS+="event_timeout" rule
- '125f27ac37bc9b93cc96f64052b9681b3d479ee1'
)
prepare() {
@@ -38,12 +32,9 @@
git show "${_c}" -- ':(exclude)WHATS_NEW' | git apply
done
- patch -Np1 < ../0001-fix-ordering-in-initramfs.patch
-
# remove install section from systemd units that are enabled by default
sed -i -e '/^\[Install\]$/,$d' \
scripts/dm_event_systemd_red_hat.socket.in \
- scripts/lvm2_lvmetad_systemd_red_hat.socket.in \
scripts/lvm2_lvmpolld_systemd_red_hat.socket.in \
scripts/lvm2_monitoring_systemd_red_hat.service.in
}
@@ -55,16 +46,13 @@
--sbindir=/usr/bin
--sysconfdir=/etc
--localstatedir=/var
- --enable-applib
--enable-cmdlib
--enable-dmeventd
- --enable-lvmetad
--enable-lvmpolld
--enable-pkgconfig
--enable-readline
--enable-udev_rules
--enable-udev_sync
- --enable-use-lvmetad
--with-cache=internal
--with-default-dm-run-dir=/run
--with-default-locking-dir=/run/lock/lvm
@@ -119,7 +107,7 @@
package_lvm2() {
pkgdesc="Logical Volume Manager 2 utilities"
- depends=('bash' "device-mapper>=${pkgver}" 'libdevmapper.so' 'systemd-libs'
+ depends=('bash' "device-mapper>=${pkgver}" 'systemd-libs'
'libudev.so' 'util-linux-libs' 'libblkid.so' 'readline' 'libreadline.so'
'thin-provisioning-tools')
conflicts=('lvm' 'mkinitcpio<0.7')
@@ -130,21 +118,17 @@
cd lvm2/
make DESTDIR="${pkgdir}" install_lvm2
- # install applib
- make -C liblvm DESTDIR="${pkgdir}" install
# /etc directories
install -d "${pkgdir}"/etc/lvm/{archive,backup}
# mkinitcpio hook
- install -D -m0644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
install -D -m0644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
install -D -m0644 "${srcdir}/sd-lvm2_install" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
- # extra udev rule for lvmetad in non-systemd initramfs
+ # extra udev rule for non-systemd initramfs
install -D -m0644 "${srcdir}/lvm2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules"
# systemd support
make DESTDIR="${pkgdir}" install_systemd_units
rm -f "${pkgdir}/usr/lib/systemd/system/"dm-*
install -d -m0755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants"
- ln -sf ../lvm2-lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
ln -sf ../lvm2-lvmpolld.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmpolld.socket"
ln -sf ../lvm2-monitor.service "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-monitor.service"
make DESTDIR="${pkgdir}" install_systemd_generators
Deleted: lvm2_hook
===================================================================
--- lvm2_hook 2021-02-02 16:46:14 UTC (rev 407074)
+++ lvm2_hook 2021-02-02 17:32:50 UTC (rev 407075)
@@ -1,25 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- mkdir /run/lvm
- lvmetad
-}
-
-# We are suffering a race condition in non-systemd initramfs: If lvmetad is
-# killed before pvscan processes finish we have stale processes and
-# uninitialized physical volumes. So wait for pvscan processes to finish.
-# Break after 10 seconds (50*0.2s) to avaid infinite loop.
-run_latehook() {
- local i=50
-
- while pgrep -f pvscan >/dev/null 2>/dev/null && [ $i -gt 0 ]; do
- sleep 0.2
- i=$((i - 1))
- done
-}
-
-run_cleanuphook() {
- kill $(cat /run/lvmetad.pid)
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Modified: lvm2_install
===================================================================
--- lvm2_install 2021-02-02 16:46:14 UTC (rev 407074)
+++ lvm2_install 2021-02-02 17:32:50 UTC (rev 407075)
@@ -11,7 +11,6 @@
# binaries from lvm2
add_binary "lvm"
- add_binary "lvmetad"
# beinaries from device-mapper
add_binary "dmsetup"
@@ -30,8 +29,6 @@
add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
add_file "/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
add_file "/etc/lvm/lvm.conf"
-
- add_runscript
}
help() {
Modified: sd-lvm2_install
===================================================================
--- sd-lvm2_install 2021-02-02 16:46:14 UTC (rev 407074)
+++ sd-lvm2_install 2021-02-02 17:32:50 UTC (rev 407075)
@@ -11,12 +11,10 @@
# device mapper and lvm2 systemd units
# binaries and libraries are pull automatically, except ...
- add_systemd_unit "lvm2-lvmetad.service"
add_systemd_unit "lvm2-pvscan at .service"
# binaries from lvm2
add_binary "lvm"
- add_binary "lvmetad"
# beinaries from device-mapper
add_binary "dmsetup"
More information about the arch-commits
mailing list