From 3ecc3e587aa7b01e3fe352f5abbddb87d136881c 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/2] 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 f8630f57f3b59f47521707c0595c072b7a511b23 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/2] 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"