Morten Linderud pushed to branch main at Arch Linux / Packaging / Packages /
lvm2
Commits:
ea8f3564 by Morten Linderud at 2024-03-03T17:57:08+01:00
Remove mkinitcpio hooks and conflict with old mkinitcpio
Signed-off-by: Morten Linderud <foxbo...@archlinux.org>
- - - - -
18c05248 by Morten Linderud at 2024-03-03T17:58:43+01:00
upgpkg: 2.03.23-2: remove mkinitcpio hooks and conflicts with previous
mkinitcpio versions
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − lvm2_install
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = lvm2
pkgver = 2.03.23
- pkgrel = 1
+ pkgrel = 2
url = https://sourceware.org/lvm2/
arch = x86_64
license = GPL2
@@ -9,15 +9,14 @@ pkgbase = lvm2
makedepends = systemd
makedepends = libaio
makedepends = thin-provisioning-tools
+ conflicts = mkinitcpio<38-1
source =
git+https://sourceware.org/git/lvm2.git#commit=d786a8f820d54ce87a919e6af5426c333c173b11
source = 0001-udev-initcpio.patch
- source = lvm2_install
source = 11-dm-initramfs.rules
validpgpkeys = 88437EF5C077BD113D3B7224228191C1567E2C17
validpgpkeys = D501A478440AE2FD130A1BE8B9112431E509039F
sha256sums = SKIP
sha256sums =
2b3a16ec05e2bc6678e9ebd5ffa8319ebfde29aa260ce004f79f9b8df57d73c9
- sha256sums =
8870091ef70b5ea18b18bfcc770f8bda7dcd9d7cc2cc4fe5e4c3ac1f35bbb66a
sha256sums =
e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0
pkgname = lvm2
=====================================
PKGBUILD
=====================================
@@ -7,20 +7,19 @@ pkgname=('lvm2' 'device-mapper')
# latest release does not have a tag... :-\
_commit='d786a8f820d54ce87a919e6af5426c333c173b11'
pkgver=2.03.23
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://sourceware.org/lvm2/'
license=('GPL2' 'LGPL2.1')
makedepends=('git' 'systemd' 'libaio' 'thin-provisioning-tools')
+conflicts=('mkinitcpio<38-1')
validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17' # Alasdair G Kergon
<a...@redhat.com>
'D501A478440AE2FD130A1BE8B9112431E509039F') # Marian Csontos
<marian.cson...@gmail.com>
source=("git+https://sourceware.org/git/lvm2.git#commit=${_commit}";
'0001-udev-initcpio.patch'
- 'lvm2_install'
'11-dm-initramfs.rules')
sha256sums=('SKIP'
'2b3a16ec05e2bc6678e9ebd5ffa8319ebfde29aa260ce004f79f9b8df57d73c9'
- '8870091ef70b5ea18b18bfcc770f8bda7dcd9d7cc2cc4fe5e4c3ac1f35bbb66a'
'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
_backports=(
@@ -114,9 +113,6 @@ package_lvm2() {
make DESTDIR="${pkgdir}" install_lvm2
# /etc directories
install -d "${pkgdir}"/etc/lvm/{archive,backup}
- # mkinitcpio hook
- install -D -m0644 "${srcdir}/lvm2_install"
"${pkgdir}/usr/lib/initcpio/install/lvm2"
- ln -s lvm2 "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
# extra udev rule for non-systemd initramfs
install -D -m0644 udev/69-dm-lvm-initcpio.rules
"${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm.rules"
# systemd support
=====================================
lvm2_install deleted
=====================================
@@ -1,46 +0,0 @@
-#!/usr/bin/bash
-
-build() {
- local symlink
-
- # device mapper modules
- map add_module \
- 'dm-mod' \
- 'dm-snapshot' \
- 'dm-mirror' \
- 'dm-cache' \
- 'dm-cache-smq' \
- 'dm-thin-pool'
-
- # from thin-provisioning-tools
- add_binary 'pdata_tools'
- for symlink in cache_{check,dump,metadata_size,repair,restore}
thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
- add_symlink "/usr/bin/${symlink}" 'pdata_tools'
- done
-
- # udev rules and lvm configuration
- map add_udev_rule \
- '10-dm.rules' \
- '11-dm-lvm.rules' \
- '13-dm-disk.rules' \
- '95-dm-notify.rules' \
- '/usr/lib/initcpio/udev/11-dm-initramfs.rules'
-
- # this udev rule is specific for systemd and non-systemd systems
- if command -v add_systemd_unit >/dev/null; then
- add_udev_rule '69-dm-lvm.rules'
- else
- add_udev_rule '/usr/lib/initcpio/udev/69-dm-lvm.rules'
- fi
-
- # config file
- add_file '/etc/lvm/lvm.conf'
- sed -i -e 's/^[[:space:]#]*monitoring = [[:digit:]]\+\s*$/\tmonitoring =
0/' \
- -e '/^$/d' -e '/^[[:space:]]*#/d' "${BUILDROOT}/etc/lvm/lvm.conf"
-}
-
-help() {
- cat <<HELPEOF
-This hook enables LVM2 volumes in initramfs.
-HELPEOF
-}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lvm2/-/compare/33d442d1659596d15e18503499cf6b583ffe6e40...18c052488ae4a59aaf7e8339a5a27b041e2c4fe8
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lvm2/-/compare/33d442d1659596d15e18503499cf6b583ffe6e40...18c052488ae4a59aaf7e8339a5a27b041e2c4fe8
You're receiving this email because of your account on gitlab.archlinux.org.
