* [PR PATCH] btrfs-progs: fix check
@ 2020-10-25 11:43 sgn
2020-10-25 12:26 ` [PR PATCH] [Updated] " sgn
2020-10-25 12:47 ` [PR PATCH] [Closed]: [RFC] btrfs-progs+cryptsetup: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2020-10-25 11:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages btrfs-progs-fix-check
https://github.com/void-linux/void-packages/pull/25870
btrfs-progs: fix check
A patch file from https://github.com/void-linux/void-packages/pull/25870.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-progs-fix-check-25870.patch --]
[-- Type: text/x-diff, Size: 2442 bytes --]
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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 <gottox@voidlinux.org>"
license="GPL-2.0-only, LGPL-3.0-or-later"
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PR PATCH] [Updated] btrfs-progs: fix check
2020-10-25 11:43 [PR PATCH] btrfs-progs: fix check sgn
@ 2020-10-25 12:26 ` sgn
2020-10-25 12:47 ` [PR PATCH] [Closed]: [RFC] btrfs-progs+cryptsetup: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-10-25 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages btrfs-progs-fix-check
https://github.com/void-linux/void-packages/pull/25870
btrfs-progs: fix check
A patch file from https://github.com/void-linux/void-packages/pull/25870.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-progs-fix-check-25870.patch --]
[-- Type: text/x-diff, Size: 3945 bytes --]
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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 <gottox@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <daniel.eysser@gmail.com>"
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"
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PR PATCH] [Closed]: [RFC] btrfs-progs+cryptsetup: fix check
2020-10-25 11:43 [PR PATCH] btrfs-progs: fix check sgn
2020-10-25 12:26 ` [PR PATCH] [Updated] " sgn
@ 2020-10-25 12:47 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-10-25 12:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
There's a closed pull request on the void-packages repository
[RFC] btrfs-progs+cryptsetup: fix check
https://github.com/void-linux/void-packages/pull/25870
Description:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-25 12:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-25 11:43 [PR PATCH] btrfs-progs: fix check sgn
2020-10-25 12:26 ` [PR PATCH] [Updated] " sgn
2020-10-25 12:47 ` [PR PATCH] [Closed]: [RFC] btrfs-progs+cryptsetup: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).