summaryrefslogtreecommitdiff
path: root/0066-2313-use-lxc-5.X-in-CI-testcase.patch
blob: a730c39d8f7b596f39558177abe4014c87f8b966 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
From 1c28f9259463433a7aac10733be09f8d47ec17a5 Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Thu, 21 Dec 2023 12:36:52 +0000
Subject: [PATCH 66/71] !2313 use lxc 5.X in CI testcase * use lxc 5.X in CI
 testcase

---
 CI/install_depends.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/CI/install_depends.sh b/CI/install_depends.sh
index 5a4d71fa..ebeb79db 100755
--- a/CI/install_depends.sh
+++ b/CI/install_depends.sh
@@ -105,18 +105,12 @@ cd ~
 git clone https://gitee.com/src-openeuler/lxc.git
 git config --global --add safe.directory ~/lxc/lxc-5.0.2
 cd lxc
-git checkout origin/openEuler-22.03-LTS-SP1
-tar xf lxc-4.0.3.tar.gz
-cd lxc-4.0.3
-mv ../*.patch .
-for var in $(ls 0*.patch | sort -n)
-do
-    patch -p1 < ${var}
-done
+./apply-patches
+cd lxc-5.0.2
+mkdir -p build
 sed -i 's/fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO/fd == 0 || fd == 1 || fd == 2 || fd >= 1000/g' ./src/lxc/start.c
-./autogen.sh
-./configure --prefix=${builddir} enable_werror=no
-make -j $(nproc)
+meson setup -Disulad=true -Dprefix=${builddir} build
+meson compile -C build
 make install
 ldconfig
 
-- 
2.25.1