update to meson build system for lxc-5

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

diff --git a/debian/control b/debian/control
index 4a2ba5b2a6cc91abc93493098c3b0f09355a8050..f192fdc1e79e65cdc7b50340603818f4239f7b4d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,9 @@ Build-Depends: bash-completion,
                libapparmor-dev,
                libcap-dev,
                libgnutls28-dev,
-               linux-libc-dev,
                libseccomp-dev (>= 2.4~),
+               linux-libc-dev,
+               meson (>= 0.61),
                pkg-config,
                quilt,
 Standards-Version: 4.5.1

diff --git a/debian/docs b/debian/docs
index 310840d1b92254b867440e4c94a4ebc9e41adeed..4855afe21083317ebd017df0227d3711b928af9b 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
 debian/SOURCE

diff --git a/debian/rules b/debian/rules
index 5c58a37cdfe42382c43001c9f1e18221f92bc9b6..8eab6ad6dec5acc1857c794c6739d8a867eea8e9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,31 +8,34 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
 %:
-       dh $@ --with autoreconf,quilt
+       dh $@
+
+override_dh_auto_clean:
+       rm -fr build
 
 override_dh_auto_configure:
-       dh_auto_configure -- \
-       --with-distro=debian \
-       --with-init-script=systemd \
-       --enable-apparmor \
-       --enable-doc \
-       --enable-api-docs \
-       --disable-rpath \
-       --disable-selinux \
-       --enable-bash \
-       --disable-cgmanager \
-       --disable-python \
-       --disable-lua \
-       --disable-examples \
-       --enable-seccomp \
-       --disable-static \
-       --with-cgroup-pattern='lxc/%n' \
+       mkdir -p build
+       cd build && meson .. --prefix=/usr \
+               -Dinit-script=systemd \
+               -Dapparmor=true \
+               -Dseccomp=true \
+               -Dselinux=false \
+               -Dman=true \
+               -Dexamples=false \
+               -Dcgroup-pattern='lxc/%n'
+
+# override_dh_auto_build:
+#      cd build && ninja -v
+# 
+# override_dh_auto_test:
+#      cd build && ninja test
 
 override_dh_fixperms:
        dh_fixperms -Xusr/lib/$(DEB_HOST_MULTIARCH)/lxc/lxc-user-nic
 
 override_dh_install:
        rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+       rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liblxc_static.a
        dh_apparmor -p lxc-pve --profile-name=usr.bin.lxc-start
        dh_apparmor -p lxc-pve --profile-name=lxc-containers
        dh_install