From f29d569cd33a73da5ad675f43a34ad53c5cc9bc6 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Thu, 2 Feb 2023 14:10:02 +0000
Subject: Work

---
 repo/lxc/lxc.xibuild      | 35 ++++++++++++++++++++---------------
 repo/lxc/sysconfdir.patch | 17 +++++++++++++++++
 2 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 repo/lxc/sysconfdir.patch

(limited to 'repo/lxc')

diff --git a/repo/lxc/lxc.xibuild b/repo/lxc/lxc.xibuild
index d931c7c..c5595a4 100644
--- a/repo/lxc/lxc.xibuild
+++ b/repo/lxc/lxc.xibuild
@@ -3,7 +3,7 @@
 NAME="lxc"
 DESC="Userspace interface for the Linux kernel containment features"
 
-MAKEDEPS="libcap libseccomp pam linux-headers musl-legacy-compat docbook2x automake autoconf libtool perl-xml-namespacesupport"
+MAKEDEPS="libcap libseccomp pam linux-headers musl-legacy-compat docbook2x automake autoconf libtool perl-xml-namespacesupport perl-xml-sax perl-xml-sax-base libcap"
 
 PKG_VER=5.0.1
 SOURCE="https://linuxcontainers.org/downloads/lxc/lxc-$PKG_VER.tar.gz"
@@ -11,27 +11,32 @@ SOURCE="https://linuxcontainers.org/downloads/lxc/lxc-$PKG_VER.tar.gz"
 ADDITIONAL="
 lxc.confd
 lxc.initd
+sysconfdir.patch
 "
 
-build() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-apparmor \
-		--enable-pam \
-		--with-distro=xi \
-		--disable-werror \
-		--enable-doc
-	make
+prepare () {
+    apply_patches
+    for line in 319 942; do
+        sed -i "${line}s/check: true/check: false/g" meson.build
+    done
+    sed -i "140d" src/lxc/process_utils.h
 }
 
-check() {
-	make check
+build() {
+    mkdir build &&
+    cd build    &&
+    meson --prefix=/usr \
+            -Db_lto=false \
+            -Dpam-cgroup=true \
+            -Dtests=true \
+            -Dinit-script="[]" \
+            -Dcapabilities=false \
+            .. &&
+    ninja
 }
 
 package() {
-	make DESTDIR="$PKG_DEST" install
+    DESTDIR=$PKG_DEST ninja install
 
 	install -Dm755 "$BUILD_ROOT"/lxc.initd "$PKG_DEST"/etc/init.d/lxc
 	install -Dm644 "$BUILD_ROOT"/lxc.confd "$PKG_DEST"/etc/conf.d/lxc
diff --git a/repo/lxc/sysconfdir.patch b/repo/lxc/sysconfdir.patch
new file mode 100644
index 0000000..503f0b2
--- /dev/null
+++ b/repo/lxc/sysconfdir.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 5d1bb36..fbbf271 100644
+--- a/meson.build
++++ b/meson.build
+@@ -117,10 +117,10 @@ conf.set('SYSCONFDIR', sysconfdir)
+ 
+ # Set sysconfdir
+ fs = import('fs')
+-if fs.is_dir('/etc/sysconfig')
++if false
+     distrosysconfdir = join_paths(sysconfdir, 'sysconfig')
+     conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+-elif fs.is_dir('/etc/default')
++elif true
+     distrosysconfdir = join_paths(sysconfdir, 'default')
+     conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir)
+ else
-- 
cgit v1.2.1