From ad21bd56aba304baa41a256a2069f5f2cfb5d329 Mon Sep 17 00:00:00 2001 From: YukariChiba Date: Wed, 16 Feb 2022 15:08:46 +0000 Subject: [PATCH] Update lxc.spec and add patch. --- 0036-add-riscv-support.patch | 119 +++++++++++++++++++++++++++++++++++ lxc.spec | 14 ++++- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 0036-add-riscv-support.patch diff --git a/0036-add-riscv-support.patch b/0036-add-riscv-support.patch new file mode 100644 index 0000000..fcd5f24 --- /dev/null +++ b/0036-add-riscv-support.patch @@ -0,0 +1,119 @@ +--- lxc-4.0.3/src/lxc/syscall_numbers.h ++++ lxc-4.0.3-new/src/lxc/syscall_numbers.h +@@ -35,6 +35,8 @@ + #define __NR_keyctl 280 + #elif defined __powerpc__ + #define __NR_keyctl 271 ++ #elif defined __riscv ++ #define __NR_keyctl 219 + #elif defined __sparc__ + #define __NR_keyctl 283 + #elif defined __ia64__ +@@ -68,6 +70,8 @@ + #define __NR_memfd_create 350 + #elif defined __powerpc__ + #define __NR_memfd_create 360 ++ #elif defined __riscv ++ #define __NR_memfd_create 279 + #elif defined __sparc__ + #define __NR_memfd_create 348 + #elif defined __blackfin__ +@@ -103,6 +107,8 @@ + #define __NR_pivot_root 217 + #elif defined __powerpc__ + #define __NR_pivot_root 203 ++ #elif defined __riscv ++ #define __NR_pivot_root 41 + #elif defined __sparc__ + #define __NR_pivot_root 146 + #elif defined __ia64__ +@@ -136,6 +142,8 @@ + #define __NR_setns 339 + #elif defined __powerpc__ + #define __NR_setns 350 ++ #elif defined __riscv ++ #define __NR_setns 268 + #elif defined __sparc__ + #define __NR_setns 337 + #elif defined __ia64__ +@@ -169,6 +177,8 @@ + #define __NR_sethostname 74 + #elif defined __powerpc__ + #define __NR_sethostname 74 ++ #elif defined __riscv ++ #define __NR_sethostname 161 + #elif defined __sparc__ + #define __NR_sethostname 88 + #elif defined __ia64__ +@@ -202,6 +212,8 @@ + #define __NR_signalfd 316 + #elif defined __powerpc__ + #define __NR_signalfd 305 ++ #elif defined __riscv ++ #define __NR_signalfd4 74 + #elif defined __sparc__ + #define __NR_signalfd 311 + #elif defined __ia64__ +@@ -235,6 +247,8 @@ + #define __NR_signalfd4 322 + #elif defined __powerpc__ + #define __NR_signalfd4 313 ++ #elif defined __riscv ++ #define __NR_signalfd4 74 + #elif defined __sparc__ + #define __NR_signalfd4 317 + #elif defined __ia64__ +@@ -268,6 +282,8 @@ + #define __NR_unshare 303 + #elif defined __powerpc__ + #define __NR_unshare 282 ++ #elif defined __riscv ++ #define __NR_unshare 97 + #elif defined __sparc__ + #define __NR_unshare 299 + #elif defined __ia64__ +@@ -301,6 +317,8 @@ + #define __NR_bpf 351 + #elif defined __powerpc__ + #define __NR_bpf 361 ++ #elif defined __riscv ++ #define __NR_bpf 280 + #elif defined __sparc__ + #define __NR_bpf 349 + #elif defined __ia64__ +@@ -334,6 +352,8 @@ + #define __NR_faccessat 300 + #elif defined __powerpc__ + #define __NR_faccessat 298 ++ #elif defined __riscv ++ #define __NR_faccessat 48 + #elif defined __sparc__ + #define __NR_faccessat 296 + #elif defined __ia64__ +@@ -385,6 +405,8 @@ + #define __NR_seccomp 348 + #elif defined __powerpc__ + #define __NR_seccomp 358 ++ #elif defined __riscv ++ #define __NR_seccomp 277 + #elif defined __sparc__ + #define __NR_seccomp 346 + #elif defined __ia64__ +@@ -418,6 +440,8 @@ + #define __NR_gettid 236 + #elif defined __powerpc__ + #define __NR_gettid 207 ++ #elif defined __riscv ++ #define __NR_gettid 178 + #elif defined __sparc__ + #define __NR_gettid 143 + #elif defined __ia64__ +@@ -455,6 +479,8 @@ + #define __NR_execveat 354 + #elif defined __powerpc__ + #define __NR_execveat 362 ++ #elif defined __riscv ++ #define __NR_execveat 281 + #elif defined __sparc__ + #define __NR_execveat 350 + #elif defined __ia64__ diff --git a/lxc.spec b/lxc.spec index 37a3012..2de1223 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2021122701 +%global _release 2022021602 Name: lxc Version: 4.0.3 @@ -43,11 +43,17 @@ Patch0032: 0032-disable-lxc_keep-with-oci-image.patch Patch0033: 0033-conf-ensure-that-the-idmap-pointer-itself-is-freed.patch Patch0034: 0034-cgfsng-fix-cgroup-attach-cgroup-creation.patch Patch0035: 0035-adapt-upstream-compiler-settings.patch +%ifarch riscv64 +Patch0036: 0036-add-riscv-support.patch +%endif BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) BuildRequires: libcap libcap-devel libselinux-devel yajl yajl-devel BuildRequires: pkgconfig(bash-completion) +%ifarch riscv64 +BuildRequires: libatomic_ops +%endif Requires: lxc-libs = 4.0.3-%{release} @@ -100,6 +106,9 @@ This package contains documentation for lxc for creating containers. %autosetup -n lxc-4.0.3 -Sgit -p1 %build +%ifarch riscv64 +export LDFLAGS="-pthread" +%endif %configure --enable-doc --enable-api-docs \ --disable-silent-rules --docdir=%{_pkgdocdir} --disable-rpath \ --disable-static --disable-apparmor --enable-selinux \ @@ -214,6 +223,9 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Wed Feb 16 2022 YukariChiba - 4.0.3-2022021602 +- Fix RISC-V build errors. + * Mon Dec 27 2021 haozi007 - 4.0.3-2021122701 - Type:improve - ID:NA -- Gitee