update to lxcfs-5.0.3

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

diff --git a/debian/patches/extra/0002-build-with-fuse2.patch b/debian/patches/extra/0002-build-with-fuse2.patch
deleted file mode 100644 (file)
index bb046e5..0000000
--- a/debian/patches/extra/0002-build-with-fuse2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 07ac0c9..925dac4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,13 +62,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 a5299ef4fa16ad18b2c82811a5d41b7d97168874..5f590214ded9162e799f652add87bfb2edcf7161 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 do-not-start-without-lxcfs.patch
 extra/0001-cgv2-assume-swap-is-supported.patch
-extra/0002-build-with-fuse2.patch

diff --git a/debian/rules b/debian/rules
index 9b6dc587f595721109e466545334805acf051599..8ca3dc000eeae55f8d64ff0ed912741a8f282ad0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,20 +4,22 @@
 #export DH_VERBOSE=1
 
 %:
-       dh $@  --with autoreconf,quilt
+       dh $@ --with quilt
 
-override_dh_install:
-       find $(CURDIR)/debian/lxcfs/lib/ -type d -empty -delete
-       sed -i "/dependency_libs/ s/'.*'/''/" \
-           "$(CURDIR)/debian/lxcfs/usr/lib/x86_64-linux-gnu/lxcfs/liblxcfs.la"
+override_dh_auto_clean:
+       rm -fr build
 
 override_dh_auto_configure:
-       dh_auto_configure -- --with-init-script=systemd \
-               FUSE_CFLAGS="$(shell pkg-config --cflags fuse)" \
-               FUSE_LIBS="$(shell pkg-config --libs fuse)"
+       mkdir -p build
+       cd build && meson .. --prefix=/usr \
+               -Dinit-script=systemd \
+               -Dfuse-version=2
 
 override_dh_auto_install:
        dh_auto_install --destdir=debian/lxcfs
 
 override_dh_installsystemd:
+       install -dm755 $(CURDIR)/debian/lxcfs/lib
+       mv $(CURDIR)/debian/lxcfs/usr/lib/systemd \
+          $(CURDIR)/debian/lxcfs/lib/systemd
        dh_installsystemd -p lxcfs --no-stop-on-upgrade lxcfs.service

diff --git a/lxcfs b/lxcfs
index 310cdb706cf1bc2856cfcad84df9ce82a833082b..01c2e3b813f824d6ba21d4732a8247a04e35adaa 160000 (submodule)
--- a/lxcfs
+++ b/lxcfs
@@ -1 +1 @@
-Subproject commit 310cdb706cf1bc2856cfcad84df9ce82a833082b
+Subproject commit 01c2e3b813f824d6ba21d4732a8247a04e35adaa