build fix: override fuse library

we used to build against fuse2, and since lxcfs hot-reloads,
we cannot switch to fuse3 right now

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/patches/extra/0003-build-with-fuse2.patch b/debian/patches/extra/0003-build-with-fuse2.patch
new file mode 100644 (file)
index 0000000..a39f58e
--- /dev/null
+++ b/debian/patches/extra/0003-build-with-fuse2.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Thu, 2 Dec 2021 13:47:24 +0100
+Subject: [PATCH lxcfs] build with fuse2
+
+this stuff is a PITA
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+---
+ configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ccea4ec..9260137 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,13 +61,7 @@ AC_CONFIG_FILES([
+ 
+ AC_CHECK_LIB(pthread, main)
+ 
+-PKG_CHECK_MODULES(FUSE, fuse3, [have_fuse3=yes], [have_fuse3=no])
+-if test "x$have_fuse3" = "xyes"; then
+-      AC_DEFINE([HAVE_FUSE3], [1], [Use fuse3])
+-      AC_DEFINE_UNQUOTED([FUSE_USE_VERSION], [30], [Use fuse version 30])
+-else
+       PKG_CHECK_MODULES(FUSE, fuse, [AC_DEFINE_UNQUOTED([FUSE_USE_VERSION], [26], [Use fuse])])
+-fi
+ 
+ AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
+ AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HELP2MAN" != "xfalse // No help2man //" ])

diff --git a/debian/patches/series b/debian/patches/series
index 7edca531a23ddbae6c810fd269dbf586636158f3..3e7f4c4ce12503e6bf7f9d92f1c9d5f93bf3b9e9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 do-not-start-without-lxcfs.patch
 extra/0001-make-meminfo-and-swaps-cgroupv2-aware.patch
 extra/0002-cgv2-assume-swap-is-supported.patch
+extra/0003-build-with-fuse2.patch

diff --git a/debian/rules b/debian/rules
index 709d46b034c13bd4c4523952b8c907ea53f64422..9b6dc587f595721109e466545334805acf051599 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,9 @@ override_dh_install:
            "$(CURDIR)/debian/lxcfs/usr/lib/x86_64-linux-gnu/lxcfs/liblxcfs.la"
 
 override_dh_auto_configure:
-       dh_auto_configure -- --with-init-script=systemd
+       dh_auto_configure -- --with-init-script=systemd \
+               FUSE_CFLAGS="$(shell pkg-config --cflags fuse)" \
+               FUSE_LIBS="$(shell pkg-config --libs fuse)"
 
 override_dh_auto_install:
        dh_auto_install --destdir=debian/lxcfs