diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | 0000-mdadm-no-build-on-install-test.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 31 |
3 files changed, 53 insertions, 17 deletions
@@ -1,31 +1,34 @@ pkgbase = mdadm-git - pkgdesc = create, manage, and monitor Linux mdraid block device RAID arrays - pkgver = 4.1.r106.ga64f126 + pkgdesc = A tool for managing/monitoring Linux md device arrays, also known as Software RAID + pkgver = 4.2.r61.g8b668d4a pkgrel = 1 - url = http://neil.brown.name/blog/mdadm + url = https://git.kernel.org/pub/scm/utils/mdadm install = mdadm.install arch = i686 arch = x86_64 license = GPL makedepends = git depends = glibc - provides = mdadm=4.1 - conflicts = mkinitcpio<0.7 + depends = systemd + optdepends = bash: mdcheck + provides = mdadm=4.2 conflicts = mdadm replaces = raidtools backup = etc/mdadm.conf source = mdadm_gitkr::git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git + source = 0000-mdadm-no-build-on-install-test.patch source = mdadm.conf::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/mdadm.conf?h=packages/mdadm source = mdadm_udev_install::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/mdadm_udev_install?h=packages/mdadm source = mdadm_udev_hook md5sums = SKIP + md5sums = 074f72ac0367088920379c7e6b7e2a32 md5sums = 5a37c112aa07dccdde62f9fa5b888607 md5sums = b6b0bfd6487c99264578630616dfe5eb md5sums = 910398cd21e16c1da33f2d7449497245 sha256sums = SKIP + sha256sums = 18f4ab16e9f4aed84d40456f6125fbb54447d0d0679d9b290355ff3acf8319a8 sha256sums = 4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5 sha256sums = 170b0e5d548416c0adb9df4e6941bea6bc33d843419c997e45ecaf9e36a58f38 sha256sums = d395184617f45849cbbaf5b4ee3665ca6895a1d642e0470e9de703ce944279ca pkgname = mdadm-git - diff --git a/0000-mdadm-no-build-on-install-test.patch b/0000-mdadm-no-build-on-install-test.patch new file mode 100644 index 000000000000..ea497f5243aa --- /dev/null +++ b/0000-mdadm-no-build-on-install-test.patch @@ -0,0 +1,24 @@ +diff -pNaru5 a/Makefile b/Makefile +--- a/Makefile 2022-12-16 14:36:34.039686769 -0500 ++++ b/Makefile 2022-12-16 14:37:49.050230775 -0500 +@@ -303,18 +303,18 @@ install-systemd: systemd/mdmon@.service + $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ + rm -f .install.tmp.3; \ + done + if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi + +-install-bin: mdadm mdmon ++install-bin: + $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm + $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon + + uninstall: + rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm + +-test: mdadm mdmon test_stripe swap_super raid6check ++test: test_stripe swap_super raid6check + @echo "Please run './test' as root" + + clean : + rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \ + mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \ @@ -7,21 +7,25 @@ set -u _pkgname='mdadm' pkgname="${_pkgname}-git" -pkgver=4.1.r106.ga64f126 +pkgver=4.2.r61.g8b668d4a pkgrel=1 -pkgdesc='create, manage, and monitor Linux mdraid block device RAID arrays' +pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as Software RAID' arch=('i686' 'x86_64') #url='https://github.com/neilbrown/mdadm' -url='http://neil.brown.name/blog/mdadm' +#url='http://neil.brown.name/blog/mdadm' license=('GPL') -depends=('glibc') +url='https://git.kernel.org/pub/scm/utils/mdadm' makedepends=('git') -#optdepends=('lvm2' 'dm-crypt' 'bcache') +depends=('glibc' 'systemd') +#depends+=('mkinitcpio>=0.7') +optdepends=('bash: mdcheck') +#optdepends+=('lvm2' 'dm-crypt' 'bcache') provides=("${_pkgname}=${pkgver%.r*}") -conflicts=('mkinitcpio<0.7' "${_pkgname}") +conflicts=("${_pkgname}") replaces=('raidtools') backup=("etc/${_pkgname}.conf") install="${_pkgname}.install" +#validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen _verwatch=('https://mirrors.edge.kernel.org/pub/linux/utils/raid/mdadm/' 'mdadm-\(.*\)\.tar\.xz' 't') _archlink="@@@::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/@@@?h=packages/${_pkgname}" source=( @@ -29,6 +33,7 @@ source=( #"mdadm_gitnb::git://neil.brown.name/${_pkgname}" #"mdadm_github::git+https://github.com/neilbrown/${_pkgname}.git" "mdadm_gitkr::git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git" + '0000-mdadm-no-build-on-install-test.patch' "${_archlink//@@@/${_pkgname}.conf}" #"${_archlink//@@@/${_pkgname}_hook}" #"${_archlink//@@@/${_pkgname}_install}" @@ -36,10 +41,12 @@ source=( "${_pkgname}_udev_hook" ) md5sums=('SKIP' + '074f72ac0367088920379c7e6b7e2a32' '5a37c112aa07dccdde62f9fa5b888607' 'b6b0bfd6487c99264578630616dfe5eb' '910398cd21e16c1da33f2d7449497245') sha256sums=('SKIP' + '18f4ab16e9f4aed84d40456f6125fbb54447d0d0679d9b290355ff3acf8319a8' '4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5' '170b0e5d548416c0adb9df4e6941bea6bc33d843419c997e45ecaf9e36a58f38' 'd395184617f45849cbbaf5b4ee3665ca6895a1d642e0470e9de703ce944279ca') @@ -56,18 +63,20 @@ prepare() { cd mdadm_git*/ # NB and the mdadm team strive for warning free code. Disable the warning only when necessary. sed -e 's: -Werror : :g' -i 'Makefile' # disable-werror.patch - sed -e 's:/usr/sbin/:/usr/bin:g' -e 's:/sbin:/usr/bin:g' -i 'Makefile' 'test' 'mkinitramfs' 'mdadm.conf.5' + sed -e 's:/usr/sbin/:/usr/bin:g' -e 's:/sbin:/usr/bin:g' -i $(grep -lrce '/sbin/' .) + + # make install test must not compile anything + #f="${PWD##*/}"; cd ..; ln -sr "${f}" 'b'; cp -pr "${f}" a/; false + #diff -pNaru5 'a' 'b' > '0000-mdadm-no-build-on-install-test.patch' + patch -Nup1 -i "${srcdir}/0000-mdadm-no-build-on-install-test.patch" - # make install must not compile anything - sed -e '/^install\s*:/ s:\bmdadm mdmon\b::g' -i 'Makefile' set +u } build() { set -u cd mdadm_git*/ - local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc)) - nice make -s -j "${_nproc}" CXFLAGS="${CFLAGS}" BINDIR='/usr/bin' UDEVDIR='/usr/lib/udev' + nice make -s CXFLAGS="${CFLAGS}" BINDIR='/usr/bin' UDEVDIR='/usr/lib/udev' set +u } |