diff --git a/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch b/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch index ac487170a4c82f34ec23d5e0f3a1ef194e4beb67..8f4895e70a11a1a3df2c72d9bbbf3493f9f17a75 100644 --- a/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch +++ b/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch @@ -1,25 +1,25 @@ -From ba38ee0ef8e375ae7e1b19d6e99626b1152ddef8 Mon Sep 17 00:00:00 2001 -From: vegbir -Date: Mon, 4 Jul 2022 17:15:19 +0800 +From ed5823bf5b0d8bd425417d9b3590ece248fe1655 Mon Sep 17 00:00:00 2001 +From: yangjiaqi +Date: Sat, 26 Nov 2022 11:48:14 +0800 Subject: [PATCH] enable cfs option to show correct proc cpuinfo view --- - config/init/systemd/lxcfs.service | 2 +- + config/init/systemd/lxcfs.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/config/init/systemd/lxcfs.service b/config/init/systemd/lxcfs.service -index dbb029f..f24e11b 100644 ---- a/config/init/systemd/lxcfs.service -+++ b/config/init/systemd/lxcfs.service -@@ -5,7 +5,7 @@ Before=lxc.service - Documentation=man:lxcfs(1) +diff --git a/config/init/systemd/lxcfs.service.in b/config/init/systemd/lxcfs.service.in +index bdaa2fa..3ee006b 100644 +--- a/config/init/systemd/lxcfs.service.in ++++ b/config/init/systemd/lxcfs.service.in +@@ -6,7 +6,7 @@ Documentation=man:lxcfs(1) [Service] --ExecStart=/usr/bin/lxcfs /usr/local/var/lib/lxcfs -+ExecStart=/usr/bin/lxcfs --enable-cfs /usr/local/var/lib/lxcfs + ExecStartPre=-/usr/local/bin/lxcfs-tools prestart +-ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ ++ExecStart=/usr/bin/lxcfs --enable-cfs /var/lib/lxc/lxcfs/ + ExecStartPost=-/usr/local/bin/lxcfs-tools remount -a KillMode=process - Restart=on-failure - ExecStopPost=-/bin/fusermount -u /usr/local/var/lib/lxcfs + ExecStop=-/usr/local/bin/lxcfs-tools umount -a -- -2.32.1 (Apple Git-133) +2.30.0 diff --git a/0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch b/0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch new file mode 100644 index 0000000000000000000000000000000000000000..ebfa7e0823c39984c2c40863c8ce6031eb7aa73b --- /dev/null +++ b/0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch @@ -0,0 +1,37 @@ +From e3ca16cd280bea10a63e959623fd6625f7b868ce Mon Sep 17 00:00:00 2001 +From: yangjiaqi +Date: Thu, 24 Nov 2022 15:53:53 +0800 +Subject: [PATCH] fix pidfd_open&pidfd_send_signal function compilation bug in + glibc2.36+ + +--- + src/utils.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/utils.h b/src/utils.h +index 18d85a7..ab2da0f 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -46,6 +46,9 @@ static inline int pidfd_open(pid_t pid, unsigned int flags) + { + return syscall(__NR_pidfd_open, pid, flags); + } ++#else ++#include ++extern int pidfd_open(pid_t pid, unsigned int flags); + #endif + + #if !HAVE_PIDFD_SEND_SIGNAL +@@ -54,6 +57,9 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + { + return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags); + } ++#else ++#include ++extern int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,unsigned int flags); + #endif + + extern FILE *fopen_cached(const char *path, const char *mode, +-- +2.30.0 + diff --git a/lxcfs.spec b/lxcfs.spec index 08484ce4f9473db79a56adda1386a02f67c8965c..6f5346053f80fd7b1b4efc26feffd129867165f0 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -4,7 +4,7 @@ #Basic Information Name: lxcfs Version: 4.0.11 -Release: 5 +Release: 6 Summary: FUSE filesystem for LXC License: LGPL 2.1+ URL: http://linuxcontainers.org @@ -31,6 +31,7 @@ Patch9018: 0018-fix-deadlock-problem-when-subprocess-exit.patch Patch9019: 0019-fix-dev-read-memory-leak-in-container.patch Patch9020: 0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch Patch9021: lxcfs-4.0.11-sw.patch +Patch9022: 0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch #Dependency BuildRequires: autoconf automake libtool help2man @@ -92,6 +93,9 @@ fi %{_unitdir}/* %changelog +* Thu Dec 15 2022 yangjiaqi - 4.0.11-6 +- fix pidfd_open&pidfd_send_signal function compilation bug in glibc2.36+ + * Mon Oct 24 2022 wuzx - 4.0.11-5 - add sw64 patch diff --git a/lxcfs.yaml b/lxcfs.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5c68c0f3571c649fa54205b8271ccfb8a898628b --- /dev/null +++ b/lxcfs.yaml @@ -0,0 +1,5 @@ +--- +version_control: linuxcontainers +src_repo: lxcfs +tag_prefix: "lxcfs" +separator: "."