From 3a1b242526831d0279061e749df75f977dd7eb15 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 17 Jun 2024 17:49:20 +0900 Subject: [PATCH 1/3] tests: Drop the test case for https://github.com/containers/fuse-overlayfs/issues/86 The test case for https://github.com/containers/fuse-overlayfs/issues/86 does no longer work because it relies on CentOS Stream 8 repositories, which are unavailable. While we can update it to use CentOS Stream 9, the issue says it is limited to CentOS 6, and it is unclear if the test case will reproduce the intended scenario with CentOS Stream 8 or 9 so drop it. Signed-off-by: Akihiko Odaki --- tests/fedora-installs.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/fedora-installs.sh b/tests/fedora-installs.sh index c59d9b3..2e01a54 100755 --- a/tests/fedora-installs.sh +++ b/tests/fedora-installs.sh @@ -45,13 +45,6 @@ umount merged rm -rf workdir lower upper mkdir upper workdir lower -fuse-overlayfs -o sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged - -# https://github.com/containers/fuse-overlayfs/issues/86 -docker run --rm -v $(pwd)/merged:/merged quay.io/centos/centos:stream8 yum --installroot /merged -y --releasever 8 install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - -umount merged - # fast_ino_check fuse-overlayfs -o fast_ino_check=1,sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged From da0f9cb03b9d31793965633895f6d5601caafc54 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 17 Jun 2024 17:36:49 +0900 Subject: [PATCH 2/3] tests: Use Fedora to test fast_ino_check The test of fast_ino_check used CentOS Stream 8, which is no longer supported and whose repositories are no longer available. While we can update it to use CentOS Stream 9, use Fedora instead for consistency with the other test cases. Signed-off-by: Akihiko Odaki --- tests/fedora-installs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fedora-installs.sh b/tests/fedora-installs.sh index 2e01a54..8a30fdf 100755 --- a/tests/fedora-installs.sh +++ b/tests/fedora-installs.sh @@ -48,7 +48,7 @@ mkdir upper workdir lower # fast_ino_check fuse-overlayfs -o fast_ino_check=1,sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged -docker run --rm -v $(pwd)/merged:/merged quay.io/centos/centos:stream8 yum --installroot /merged -y --releasever 8 install nano +docker run --rm -v $(pwd)/merged:/merged fedora dnf --installroot /merged --releasever 30 install -y glibc-common gedit mkdir merged/a-directory From d34257cd3a1dcac5fe6f3229f079744cdb86e9f6 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 17 Jun 2024 18:01:37 +0900 Subject: [PATCH 3/3] build: Fix libfuse version Building the current master branch fails with: #8 4.712 ninja: job failed: cc -Ilib/libfuse3.a.p -Ilib -I../lib -Iinclude -I../include -I. -I.. -fdiagnostics-color=always -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_REENTRANT -DHAVE_LIBFUSE_PRIVATE_CONFIG_H -Wno-sign-compare -D_FILE_OFFSET_BITS=64 -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings -fno-strict-aliasing -Wno-unused-result -DHAVE_SYMVER_ATTRIBUTE -fPIC -pthread -DFUSE_USE_VERSION=317 '-DFUSERMOUNT_DIR="/usr/bin"' -MD -MQ lib/libfuse3.a.p/fuse_signals.c.o -MF lib/libfuse3.a.p/fuse_signals.c.o.d -o lib/libfuse3.a.p/fuse_signals.c.o -c ../lib/fuse_signals.c #8 4.713 ../lib/fuse_signals.c:19:10: fatal error: execinfo.h: No such file or directory #8 4.713 19 | #include #8 4.713 | ^~~~~~~~~~~~ #8 4.713 compilation terminated. #8 13.65 ninja: subcommand failed Use the latest stable version, which is 3.16.2 Signed-off-by: Akihiko Odaki --- Containerfile.alpine | 2 +- Containerfile.static.fedora | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.alpine b/Containerfile.alpine index eeb2d94..6a727f3 100644 --- a/Containerfile.alpine +++ b/Containerfile.alpine @@ -3,7 +3,7 @@ WORKDIR /build RUN apk add git make gcc libc-dev musl-dev glib-static gettext eudev-dev \ linux-headers automake autoconf cmake meson ninja clang go-md2man -RUN git clone https://github.com/libfuse/libfuse && \ +RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \ cd libfuse && \ mkdir build && \ cd build && \ diff --git a/Containerfile.static.fedora b/Containerfile.static.fedora index 51cde87..9f9dfc7 100644 --- a/Containerfile.static.fedora +++ b/Containerfile.static.fedora @@ -3,7 +3,7 @@ WORKDIR /build RUN dnf update -y && \ dnf install -y git make automake autoconf gcc glibc-static meson ninja-build clang -RUN git clone https://github.com/libfuse/libfuse && \ +RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \ cd libfuse && \ mkdir build && \ cd build && \