[arch-commits] Commit in lvm2/repos/staging-x86_64 (7 files)
Christian Hesse
eworm at archlinux.org
Thu Feb 4 10:48:36 UTC 2021
Date: Thursday, February 4, 2021 @ 10:48:35
Author: eworm
Revision: 407225
archrelease: copy trunk to staging-x86_64
Added:
lvm2/repos/staging-x86_64/11-dm-initramfs.rules
(from rev 407224, lvm2/trunk/11-dm-initramfs.rules)
lvm2/repos/staging-x86_64/PKGBUILD
(from rev 407224, lvm2/trunk/PKGBUILD)
lvm2/repos/staging-x86_64/lvm2_install
(from rev 407224, lvm2/trunk/lvm2_install)
Deleted:
lvm2/repos/staging-x86_64/11-dm-initramfs.rules
lvm2/repos/staging-x86_64/PKGBUILD
lvm2/repos/staging-x86_64/lvm2_install
lvm2/repos/staging-x86_64/sd-lvm2_install
-----------------------+
11-dm-initramfs.rules | 6 -
PKGBUILD | 268 +++++++++++++++++++++++-------------------------
lvm2_install | 90 ++++++++--------
sd-lvm2_install | 44 -------
4 files changed, 186 insertions(+), 222 deletions(-)
Deleted: 11-dm-initramfs.rules
===================================================================
--- 11-dm-initramfs.rules 2021-02-04 10:48:32 UTC (rev 407224)
+++ 11-dm-initramfs.rules 2021-02-04 10:48:35 UTC (rev 407225)
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Copied: lvm2/repos/staging-x86_64/11-dm-initramfs.rules (from rev 407224, lvm2/trunk/11-dm-initramfs.rules)
===================================================================
--- 11-dm-initramfs.rules (rev 0)
+++ 11-dm-initramfs.rules 2021-02-04 10:48:35 UTC (rev 407225)
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-04 10:48:32 UTC (rev 407224)
+++ PKGBUILD 2021-02-04 10:48:35 UTC (rev 407225)
@@ -1,135 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.03.11
-pkgrel=1
-arch=('x86_64')
-url='https://sourceware.org/lvm2/'
-license=('GPL2' 'LGPL2.1')
-makedepends=('git' 'systemd' 'thin-provisioning-tools')
-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"
- 'lvm2_install'
- 'sd-lvm2_install'
- '11-dm-initramfs.rules')
-sha256sums=('SKIP'
- 'af5ea3dac7466eda16da2482714d82f2b12a20b673ba973fa34663542ee34fb5'
- '88cc3a47e9a46de76341ea588fc642d45a716c38b6ab0a3346e482adb6b40aa3'
- 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
-
-_backports=(
-)
-
-prepare() {
- cd lvm2/
-
- local _c
- for _c in "${_backports[@]}"; do
- git log --oneline -1 "${_c}"
- git show "${_c}" -- ':(exclude)WHATS_NEW' | git apply
- done
-
- # 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_lvmpolld_systemd_red_hat.socket.in \
- scripts/lvm2_monitoring_systemd_red_hat.service.in
-}
-
-build() {
- local _CONFIGUREOPTS=(
- CONFIG_SHELL=/bin/bash
- --prefix=/usr
- --sbindir=/usr/bin
- --sysconfdir=/etc
- --localstatedir=/var
- --enable-cmdlib
- --enable-dmeventd
- --enable-lvmpolld
- --enable-pkgconfig
- --enable-readline
- --enable-udev_rules
- --enable-udev_sync
- --with-cache=internal
- --with-default-dm-run-dir=/run
- --with-default-locking-dir=/run/lock/lvm
- --with-default-pid-dir=/run
- --with-default-run-dir=/run/lvm
- --with-systemdsystemunitdir=/usr/lib/systemd/system
- --with-thin=internal
- --with-udev-prefix=/usr
- )
-
- # build system requires bash:
- # https://www.redhat.com/archives/linux-lvm/2020-January/msg00004.html
- # https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Defining-Variables.html
- export CONFIG_SHELL=/bin/bash
-
- cp -a lvm2/ lvm2-initramfs/
-
- cd lvm2/
-
- ./configure \
- "${_CONFIGUREOPTS[@]}" \
- --enable-udev-systemd-background-jobs
- make
-
- # Build legacy udev rule for initramfs
- cd ../lvm2-initramfs
- ./configure \
- "${_CONFIGUREOPTS[@]}" \
- --enable-udev-systemd-background-jobs=no
- cd udev
- make 69-dm-lvm-metad.rules
-}
-
-package_device-mapper() {
- pkgdesc="Device mapper userspace library and tools"
- url="http://sourceware.org/dm/"
- depends=('glibc' 'systemd-libs' 'libudev.so')
- provides=('libdevmapper.so'
- 'libdevmapper-event.so')
-
- cd lvm2/
-
- make DESTDIR="${pkgdir}" install_device-mapper
- # extra udev rule for device-mapper in initramfs
- install -D -m0644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
- # Install dmeventd socket and service
- make DESTDIR="${pkgdir}" install_systemd_units
- rm -f "${pkgdir}/usr/lib/systemd/system/"{blk-availability.service,lvm2-*}
- install -d -m0755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
- ln -sf ../dm-event.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dm-event.socket"
-}
-
-package_lvm2() {
- pkgdesc="Logical Volume Manager 2 utilities"
- 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')
- backup=('etc/lvm/lvm.conf'
- 'etc/lvm/lvmlocal.conf')
- options=('!makeflags')
-
- cd 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"
- install -D -m0644 "${srcdir}/sd-lvm2_install" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
- # 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-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
-}
Copied: lvm2/repos/staging-x86_64/PKGBUILD (from rev 407224, lvm2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-04 10:48:35 UTC (rev 407225)
@@ -0,0 +1,133 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.03.11
+pkgrel=2
+arch=('x86_64')
+url='https://sourceware.org/lvm2/'
+license=('GPL2' 'LGPL2.1')
+makedepends=('git' 'systemd' 'thin-provisioning-tools')
+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"
+ 'lvm2_install'
+ '11-dm-initramfs.rules')
+sha256sums=('SKIP'
+ '7fae2e70b2bf3d81e5ab8710bf1c76a81e26ec10063978f21bafbdddd3790185'
+ 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
+
+_backports=(
+)
+
+prepare() {
+ cd lvm2/
+
+ local _c
+ for _c in "${_backports[@]}"; do
+ git log --oneline -1 "${_c}"
+ git show "${_c}" -- ':(exclude)WHATS_NEW' | git apply
+ done
+
+ # 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_lvmpolld_systemd_red_hat.socket.in \
+ scripts/lvm2_monitoring_systemd_red_hat.service.in
+}
+
+build() {
+ local _CONFIGUREOPTS=(
+ CONFIG_SHELL=/bin/bash
+ --prefix=/usr
+ --sbindir=/usr/bin
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --enable-cmdlib
+ --enable-dmeventd
+ --enable-lvmpolld
+ --enable-pkgconfig
+ --enable-readline
+ --enable-udev_rules
+ --enable-udev_sync
+ --with-cache=internal
+ --with-default-dm-run-dir=/run
+ --with-default-locking-dir=/run/lock/lvm
+ --with-default-pid-dir=/run
+ --with-default-run-dir=/run/lvm
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+ --with-thin=internal
+ --with-udev-prefix=/usr
+ )
+
+ # build system requires bash:
+ # https://www.redhat.com/archives/linux-lvm/2020-January/msg00004.html
+ # https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Defining-Variables.html
+ export CONFIG_SHELL=/bin/bash
+
+ cp -a lvm2/ lvm2-initramfs/
+
+ cd lvm2/
+
+ ./configure \
+ "${_CONFIGUREOPTS[@]}" \
+ --enable-udev-systemd-background-jobs
+ make
+
+ # Build legacy udev rule for initramfs
+ cd ../lvm2-initramfs
+ ./configure \
+ "${_CONFIGUREOPTS[@]}" \
+ --enable-udev-systemd-background-jobs=no
+ cd udev
+ make 69-dm-lvm-metad.rules
+}
+
+package_device-mapper() {
+ pkgdesc="Device mapper userspace library and tools"
+ url="http://sourceware.org/dm/"
+ depends=('glibc' 'systemd-libs' 'libudev.so')
+ provides=('libdevmapper.so'
+ 'libdevmapper-event.so')
+
+ cd lvm2/
+
+ make DESTDIR="${pkgdir}" install_device-mapper
+ # extra udev rule for device-mapper in initramfs
+ install -D -m0644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+ # Install dmeventd socket and service
+ make DESTDIR="${pkgdir}" install_systemd_units
+ rm -f "${pkgdir}/usr/lib/systemd/system/"{blk-availability.service,lvm2-*}
+ install -d -m0755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+ ln -sf ../dm-event.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dm-event.socket"
+}
+
+package_lvm2() {
+ pkgdesc="Logical Volume Manager 2 utilities"
+ 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')
+ backup=('etc/lvm/lvm.conf'
+ 'etc/lvm/lvmlocal.conf')
+ options=('!makeflags')
+
+ cd 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 "${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-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_install
===================================================================
--- lvm2_install 2021-02-04 10:48:32 UTC (rev 407224)
+++ lvm2_install 2021-02-04 10:48:35 UTC (rev 407225)
@@ -1,40 +0,0 @@
-#!/usr/bin/bash
-
-build() {
- local mod
- local symlink
-
- # device mapper modules
- for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
- add_module "$mod"
- done
-
- # binaries from lvm2
- add_binary "lvm"
-
- # beinaries from device-mapper
- add_binary "dmsetup"
-
- # 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
- add_file "/usr/lib/udev/rules.d/10-dm.rules"
- add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
- add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
- add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
- 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"
-}
-
-help() {
- cat <<HELPEOF
-This hook enables LVM2 volumes in initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: lvm2/repos/staging-x86_64/lvm2_install (from rev 407224, lvm2/trunk/lvm2_install)
===================================================================
--- lvm2_install (rev 0)
+++ lvm2_install 2021-02-04 10:48:35 UTC (rev 407225)
@@ -0,0 +1,50 @@
+#!/usr/bin/bash
+
+build() {
+ local mod
+ local symlink
+
+ # device mapper modules
+ for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
+ add_module "$mod"
+ done
+
+ if command -v add_systemd_unit >/dev/null; then
+ # device mapper and lvm2 systemd units
+ # binaries and libraries are pull automatically, except ...
+ add_systemd_unit "lvm2-pvscan at .service"
+ fi
+
+ # binaries from lvm2
+ add_binary "lvm"
+
+ # beinaries from device-mapper
+ add_binary "dmsetup"
+
+ # 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
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+ add_file "/etc/lvm/lvm.conf"
+
+ # this udev rule is specific for systemd and non-systemd systems
+ if command -v add_systemd_unit >/dev/null; then
+ add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
+ else
+ add_file "/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
+ fi
+}
+
+help() {
+ cat <<HELPEOF
+This hook enables LVM2 volumes in initramfs.
+HELPEOF
+}
Deleted: sd-lvm2_install
===================================================================
--- sd-lvm2_install 2021-02-04 10:48:32 UTC (rev 407224)
+++ sd-lvm2_install 2021-02-04 10:48:35 UTC (rev 407225)
@@ -1,44 +0,0 @@
-#!/usr/bin/bash
-
-build() {
- local mod
- local symlink
-
- # device mapper modules
- for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
- add_module "$mod"
- done
-
- # device mapper and lvm2 systemd units
- # binaries and libraries are pull automatically, except ...
- add_systemd_unit "lvm2-pvscan at .service"
-
- # binaries from lvm2
- add_binary "lvm"
-
- # beinaries from device-mapper
- add_binary "dmsetup"
-
- # 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
- add_file "/usr/lib/udev/rules.d/10-dm.rules"
- add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
- add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
- add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
- add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
- add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
- add_file "/etc/lvm/lvm.conf"
-}
-
-help() {
- cat <<HELPEOF
-This hook enables LVM2 volumes in systemd-based initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
More information about the arch-commits
mailing list