Morten Linderud pushed to branch main at Arch Linux / Packaging / Packages /
mdadm
Commits:
e7ef1aee by Morten Linderud at 2024-03-03T18:01:05+01:00
Remove mkinitcpio hooks and conflict with old mkinitcpio
Signed-off-by: Morten Linderud <foxbo...@archlinux.org>
- - - - -
0067a021 by Morten Linderud at 2024-03-03T18:02:42+01:00
upgpkg: 4.3-2: remove mkinitcpio hooks and conflicts with previous mkinitcpio
versions
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − mdadm_udev_install
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = mdadm
pkgdesc = A tool for managing/monitoring Linux md device arrays, also
known as Software RAID
pkgver = 4.3
- pkgrel = 1
+ pkgrel = 2
url = https://git.kernel.org/pub/scm/utils/mdadm
arch = x86_64
license = GPL-2.0-or-later
@@ -9,15 +9,14 @@ pkgbase = mdadm
depends = glibc
depends = systemd
optdepends = bash: mdcheck
+ conflicts = mkinitcpio<38
replaces = raidtools
backup = etc/mdadm.conf
source =
git+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git#tag=mdadm-4.3?signed
source = mdadm.conf
- source = mdadm_udev_install
validpgpkeys = 6A86B80E1D22F21D0B26BA75397D82E0531A9C91
validpgpkeys = EED84966493AEEAF4B466F696F9E3E9D4EDEBB11
sha256sums = SKIP
sha256sums =
4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5
- sha256sums =
b6782029bdae2d7f87ea0e332bb90f72a7792e933580e37602e81e2f1bb82a9c
pkgname = mdadm
=====================================
PKGBUILD
=====================================
@@ -3,13 +3,14 @@
pkgname=mdadm
pkgver=4.3
-pkgrel=1
+pkgrel=2
pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as
Software RAID'
arch=('x86_64')
license=('GPL-2.0-or-later')
url='https://git.kernel.org/pub/scm/utils/mdadm'
makedepends=('git')
depends=('glibc' 'systemd')
+conflicts=('mkinitcpio<38')
optdepends=('bash: mdcheck')
replaces=('raidtools')
backup=('etc/mdadm.conf')
@@ -17,11 +18,10 @@ validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91' #
Jes Sorensen
'EED84966493AEEAF4B466F696F9E3E9D4EDEBB11' # Mariusz Tkaczyk
)
source=("git+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git#tag=${pkgname}-${pkgver}?signed";
- 'mdadm.conf'
- 'mdadm_udev_install')
+ 'mdadm.conf')
sha256sums=('SKIP'
- '4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5'
- 'b6782029bdae2d7f87ea0e332bb90f72a7792e933580e37602e81e2f1bb82a9c')
+ '4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5')
+
build() {
cd mdadm
@@ -34,7 +34,5 @@ package() {
make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir"
UDEVDIR=/usr/lib/udev install
make SYSTEMD_DIR="$pkgdir"/usr/lib/systemd/system install-systemd
install -D -m644 ../mdadm.conf "$pkgdir"/etc/mdadm.conf
- install -D -m644 ../mdadm_udev_install
"$pkgdir"/usr/lib/initcpio/install/mdadm_udev
install -D -m755 misc/mdcheck "$pkgdir"/usr/share/mdadm/mdcheck
- ln -s mdadm_udev "$pkgdir"/usr/lib/initcpio/install/mdadm
}
=====================================
mdadm_udev_install deleted
=====================================
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-build() {
- add_checked_modules -f 'dm-' 'drivers/md/*'
-
- # check if a custom mdadm.conf exists
- if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then
- echo "Custom /etc/mdadm.conf file will be used in initramfs for
assembling arrays."
- add_file "/etc/mdadm.conf"
- fi
-
- map add_udev_rule \
- '63-md-raid-arrays.rules' \
- '64-md-raid-assembly.rules'
-}
-
-help() {
- cat <<HELPEOF
-This hook loads the necessary modules for a RAID array and uses incremental
-assembly via udev at runtime to create the devices. This hook will NOT work
-without the udev hook included on the image.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mdadm/-/compare/e2d3458d813fb6d3eab157224aa62f931c93e9dc...0067a021bc6867109617dd9439b1c8d388330185
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mdadm/-/compare/e2d3458d813fb6d3eab157224aa62f931c93e9dc...0067a021bc6867109617dd9439b1c8d388330185
You're receiving this email because of your account on gitlab.archlinux.org.
