From e6c177f4152f93b3ea3d628f342b5a2e5e1b25f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Oct 2020 18:41:34 +0700 Subject: [PATCH 1/3] chroot-util-linux: build fallocate Required for testing btrfs-progs. --- srcpkgs/chroot-util-linux/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template index 066563e52a6..d8c3f6995ce 100644 --- a/srcpkgs/chroot-util-linux/template +++ b/srcpkgs/chroot-util-linux/template @@ -1,14 +1,14 @@ # Template file for 'chroot-util-linux' pkgname=chroot-util-linux version=2.32.1 -revision=2 +revision=3 wrksrc="${pkgname/chroot-/}-${version}" bootstrap=yes build_style=gnu-configure configure_args="--without-ncurses --without-ncursesw --without-udev --without-systemd --disable-libuuid --disable-libblkid --disable-libmount --disable-mount --disable-losetup --disable-fsck --disable-partx --disable-uuidd - --disable-mountpoint --disable-fallocate --disable-unshare --disable-nls + --disable-mountpoint --enable-fallocate --disable-unshare --disable-nls --disable-wall --disable-chfn-chsh-password --disable-su --disable-sulogin --disable-login --disable-runuser --disable-setpriv --disable-libsmartcols scanf_cv_alloc_modifier=as" From c9ce104aace418c4cbe79c57136cf6b59f5a63af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Oct 2020 18:40:30 +0700 Subject: [PATCH 2/3] btrfs-progs: correct checkdepends Don't use util-linux in checkdepends, it will conflict with chroot-util-linux and remove files from masterdir. --- srcpkgs/btrfs-progs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 29a66fec6c5..c387958db4f 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -8,7 +8,7 @@ make_check_target=test configure_args="--disable-backtrace --disable-python" hostmakedepends="asciidoc pkg-config xmlto" makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel" -checkdepends="acl-progs e2fsprogs util-linux" +checkdepends="acl-progs e2fsprogs tar xz which eudev" short_desc="Btrfs filesystem utilities" maintainer="Enno Boland " license="GPL-2.0-only, LGPL-3.0-or-later" From a268b84549269e3e3304b44c870f184e9bffd379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Oct 2020 18:55:03 +0700 Subject: [PATCH 3/3] cryptsetup: stop breaking masterdir on check --- srcpkgs/cryptsetup/template | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index 5a1b41a0e7d..898e37a0c40 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -9,7 +9,7 @@ make_check_args="-C tests" hostmakedepends="pkg-config" makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel libargon2-devel $(vopt_if pwquality 'libpwquality-devel')" -checkdepends="util-linux procps-ng which jq tar xz xxd" +checkdepends="procps-ng which jq tar xz xxd" short_desc="Setup virtual encryption devices under Linux dm-crypt" maintainer="Daniel Eyßer " license="GPL-2.0-or-later" @@ -22,6 +22,15 @@ subpackages="libcryptsetup cryptsetup-devel" build_options="pwquality" desc_option_pwquality="Enable support for checking password quality via libpwquality" +post_patch() { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + # Require losetup from util-linux, also failing when present + # TODO: 2 tests require lsblk + rm -f tests/compat-test + ln -f /bin/true tests/compat-test + fi +} + case $XBPS_TARGET_MACHINE in *-musl) configure_args+=" --enable-static-cryptsetup"