From 98ff452a0b410ad604f5472b9100ce8421b69eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Wed, 4 Apr 2018 21:01:37 +0000 Subject: [PATCH 01/37] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..bd6fab5 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# lxcfs + +The lxcfs package \ No newline at end of file From ea667b55824c6d1e301581c2a340f2d481123f25 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 5 Apr 2018 00:23:18 +0200 Subject: [PATCH 02/37] New package. --- .gitignore | 1 + lxcfs.spec | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 92 insertions(+) create mode 100644 .gitignore create mode 100644 lxcfs.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0ebcadb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/lxcfs-*.tar.gz diff --git a/lxcfs.spec b/lxcfs.spec new file mode 100644 index 0000000..f809958 --- /dev/null +++ b/lxcfs.spec @@ -0,0 +1,90 @@ +Name: lxcfs +Version: 3.0.0 +Release: 1%{?dist} +Summary: FUSE based filesystem for LXC +License: ASL 2.0 +URL: https://linuxcontainers.org/lxcfs +Source0: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz +BuildRequires: gcc +BuildRequires: gawk +BuildRequires: make +BuildRequires: fuse-devel +BuildRequires: help2man +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +# for /usr/share/lxc/config/common.conf.d: +Requires: lxc-templates + + +%description +LXCFS is a simple userspace filesystem designed to work around some +current limitations of the Linux kernel. + +Specifically, it's providing two main things + +- A set of files which can be bind-mounted over their /proc originals + to provide CGroup-aware values. + +- A cgroupfs-like tree which is container aware. + +The code is pretty simple, written in C using libfuse. + +The main driver for this work was the need to run systemd based +containers as a regular unprivileged user while still allowing systemd +inside the container to interact with cgroups. + +Now with the introduction of the cgroup namespace in the Linux kernel, +that part is no longer necessary on recent kernels and focus is now on +making containers feel more like a real independent system through the +proc masking feature. + + +%prep +%autosetup + + +%build +%configure +make %{?_smp_mflags} + + +%install +%make_install SYSTEMD_UNIT_DIR=%{_unitdir} +mkdir -p %{buildroot}%{_sharedstatedir}/%{name} + + +%post +%systemd_post %{name}.service + + +%preun +%systemd_preun %{name}.service + + +%postun +%systemd_postun %{name}.service + + +%files +%doc AUTHORS +# empty: +#doc ChangeLog NEWS README +%license COPYING +%{_bindir}/lxcfs +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/lib%{name}.so +%exclude %{_libdir}/%{name}/lib%{name}.la +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/lxc.mount.hook +%{_datadir}/%{name}/lxc.reboot.hook +%{_mandir}/man1/%{name}.1* +%{_unitdir}/%{name}.service +%{_datadir}/lxc/config/common.conf.d/00-lxcfs.conf +%dir %{_sharedstatedir}/%{name} + + +%changelog +* Wed Apr 4 2018 Thomas Moschny - 3.0.0-1 +- New package. diff --git a/sources b/sources new file mode 100644 index 0000000..c5c816b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lxcfs-3.0.0.tar.gz) = e71b2d38e3893b2768721f65522680d007ae66171de42f56eddedd887bb7616c0243160cbefb1e410393ec4359b83cb738ca9ff57714006bb0c385ad478f09cf From b20f6642d05fe0bb7345473db314b0e8888b91ac Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 2 Jun 2018 16:40:58 +0200 Subject: [PATCH 03/37] Update to 3.0.1. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index f809958..45a90c6 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -86,5 +86,8 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat Jun 2 2018 Thomas Moschny - 3.0.1-1 +- Update to 3.0.1. + * Wed Apr 4 2018 Thomas Moschny - 3.0.0-1 - New package. diff --git a/sources b/sources index c5c816b..c9a7ca6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-3.0.0.tar.gz) = e71b2d38e3893b2768721f65522680d007ae66171de42f56eddedd887bb7616c0243160cbefb1e410393ec4359b83cb738ca9ff57714006bb0c385ad478f09cf +SHA512 (lxcfs-3.0.1.tar.gz) = b3533fb3b7909973a79ac8eddda0faefdec19dd7209fce8e0ea8fb90981c3c5a0d0154eadb9686abf688cddd6ed294e52f64e71c509d00c4f228cc21b00645e2 From ab6e3ff2d11d8597882e83b9c1520965550c6c37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:34:31 +0000 Subject: [PATCH 04/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 45a90c6..777f761 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Jun 2 2018 Thomas Moschny - 3.0.1-1 - Update to 3.0.1. From 74c77732a562a123461eee846ccfbe1c1eaac1cf Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 17 Aug 2018 18:25:43 +0200 Subject: [PATCH 05/37] Update to 3.0.2. --- lxcfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 777f761..db119dd 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 3.0.1 -Release: 2%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Aug 17 2018 Thomas Moschny - 3.0.2-1 +- Update to 3.0.2. + * Fri Jul 13 2018 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index c9a7ca6..dfb1599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-3.0.1.tar.gz) = b3533fb3b7909973a79ac8eddda0faefdec19dd7209fce8e0ea8fb90981c3c5a0d0154eadb9686abf688cddd6ed294e52f64e71c509d00c4f228cc21b00645e2 +SHA512 (lxcfs-3.0.2.tar.gz) = 4652217b6dbe042a0f97c37af7883f332c287e4dfdb0c6e8c980bede8e5ab0b6bca382ac8e5e46adafeb9d1b4a97fbbb1331cd2af91a99182e647850d6a5c431 From 6fab9b0f9321e75720b143c39ab830b3c34e4ff9 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 23 Nov 2018 16:01:20 +0100 Subject: [PATCH 06/37] Update to 3.0.3. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index db119dd..c12b0d9 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Nov 23 2018 Thomas Moschny - 3.0.3-1 +- Update to 3.0.3. + * Fri Aug 17 2018 Thomas Moschny - 3.0.2-1 - Update to 3.0.2. diff --git a/sources b/sources index dfb1599..ccf8a47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-3.0.2.tar.gz) = 4652217b6dbe042a0f97c37af7883f332c287e4dfdb0c6e8c980bede8e5ab0b6bca382ac8e5e46adafeb9d1b4a97fbbb1331cd2af91a99182e647850d6a5c431 +SHA512 (lxcfs-3.0.3.tar.gz) = 93d9a3baca87571c1a6bd24e815a0824d6a04693831352927d2af6ffb50a849f2f7a62653e2c7ca80f1efce9dd42801f97fca2fd6d2a8ff64277f2bd3ab83169 From d3af55698513c6307255f85f219d01d6cd86a497 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 23 Nov 2018 17:10:59 +0100 Subject: [PATCH 07/37] Explicitly set the init system in the configure step. --- lxcfs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index c12b0d9..51f362a 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -46,7 +46,7 @@ proc masking feature. %build -%configure +%configure --with-init-script=systemd make %{?_smp_mflags} @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Nov 23 2018 Thomas Moschny - 3.0.3-2 +- Explicitly set the init system in the configure step. + * Fri Nov 23 2018 Thomas Moschny - 3.0.3-1 - Update to 3.0.3. From 74aca6d4fc2e054edb6bf9393ad4ade5d875699c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 09:20:08 +0000 Subject: [PATCH 08/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 51f362a..8d4054b 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 3.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 3.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Nov 23 2018 Thomas Moschny - 3.0.3-2 - Explicitly set the init system in the configure step. From 48f7d67d13e5ac323e6b8ac2e40159d7db4887ea Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 7 Jul 2019 19:07:03 +0200 Subject: [PATCH 09/37] Update to 3.0.4. --- lxcfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 8d4054b..09ddf1a 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 3.0.3 -Release: 3%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sun Jul 7 2019 Thomas Moschny - 3.0.4-1 +- Update to 3.0.4. + * Fri Feb 01 2019 Fedora Release Engineering - 3.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index ccf8a47..96fc6a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-3.0.3.tar.gz) = 93d9a3baca87571c1a6bd24e815a0824d6a04693831352927d2af6ffb50a849f2f7a62653e2c7ca80f1efce9dd42801f97fca2fd6d2a8ff64277f2bd3ab83169 +SHA512 (lxcfs-3.0.4.tar.gz) = 4cae6f9824174118b34ab32359a30ea7cc62a5b36a8991533a1c387037b457ecfc0c9e8c3cbab66f74bb5b31a79e9492b690a1688c496e95d107798d482f787d From 94467544ad20cdcebe00e5893d8677e044aff8eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:33:06 +0000 Subject: [PATCH 10/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 09ddf1a..497f7cf 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 3.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jul 7 2019 Thomas Moschny - 3.0.4-1 - Update to 3.0.4. From f64d933ebaf4284c4465fe6010147155b18ab8bd Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 15 Dec 2019 12:48:18 +0100 Subject: [PATCH 11/37] Update to 3.1.2. --- lxcfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 497f7cf..09f75ed 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 3.0.4 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sun Dec 15 2019 Thomas Moschny - 3.1.2-1 +- Update to 3.1.2. + * Thu Jul 25 2019 Fedora Release Engineering - 3.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 96fc6a8..8d5f651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-3.0.4.tar.gz) = 4cae6f9824174118b34ab32359a30ea7cc62a5b36a8991533a1c387037b457ecfc0c9e8c3cbab66f74bb5b31a79e9492b690a1688c496e95d107798d482f787d +SHA512 (lxcfs-3.1.2.tar.gz) = 51659700368f8e91841592910ad7f42b6b0e960873c10beb4f6f2c0dfa9971f6e7e02a4b1cb667246f4c50844c0fe5393d7c4b6d527df1b827b47197514a8720 From 348c6aa7cff12a0093263a4f7f7ca1095cedbdfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:40:54 +0000 Subject: [PATCH 12/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 09f75ed..85e07ee 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -86,6 +86,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 3.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Dec 15 2019 Thomas Moschny - 3.1.2-1 - Update to 3.1.2. From 4e73bdf8083271c1184c2d2e6fc3fff5fa4b3cc4 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 7 Mar 2020 19:13:44 +0100 Subject: [PATCH 13/37] Update to 4.0.0. --- lxcfs.spec | 33 ++++++++++++--------------------- sources | 2 +- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 85e07ee..1ad0667 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 3.1.2 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -19,26 +19,14 @@ Requires: lxc-templates %description -LXCFS is a simple userspace filesystem designed to work around some -current limitations of the Linux kernel. +LXCFS is a small FUSE filesystem written with the intention of making +Linux containers feel more like a virtual machine. It started as a +side-project of LXC but is usable by any runtime. -Specifically, it's providing two main things - -- A set of files which can be bind-mounted over their /proc originals - to provide CGroup-aware values. - -- A cgroupfs-like tree which is container aware. - -The code is pretty simple, written in C using libfuse. - -The main driver for this work was the need to run systemd based -containers as a regular unprivileged user while still allowing systemd -inside the container to interact with cgroups. - -Now with the introduction of the cgroup namespace in the Linux kernel, -that part is no longer necessary on recent kernels and focus is now on -making containers feel more like a real independent system through the -proc masking feature. +LXCFS will take care that the information provided by crucial files in +procfs are container aware such that the values displayed (e.g. in +/proc/uptime) really reflect how long the container is running and not +how long the host is running. %prep @@ -86,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat Mar 7 2020 Thomas Moschny - 4.0.0-1 +- Update to 4.0.0. + * Wed Jan 29 2020 Fedora Release Engineering - 3.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8d5f651..f41dc76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-3.1.2.tar.gz) = 51659700368f8e91841592910ad7f42b6b0e960873c10beb4f6f2c0dfa9971f6e7e02a4b1cb667246f4c50844c0fe5393d7c4b6d527df1b827b47197514a8720 +SHA512 (lxcfs-4.0.0.tar.gz) = 998dd0358481bf5799504b5b6589ca9029cbad96d6344954c3c7c722b24e535f572809a5ebb110ed865c40eed385079f106f8a349140ca03bdde42bba386baf6 From 9e946c0332ffd20d936e136018f8a75be1ff1cfa Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 21 Mar 2020 15:42:14 +0100 Subject: [PATCH 14/37] Update to 4.0.1. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 1ad0667..4447ef3 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.0 +Version: 4.0.1 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat Mar 21 2020 Thomas Moschny - 4.0.1-1 +- Update to 4.0.1. + * Sat Mar 7 2020 Thomas Moschny - 4.0.0-1 - Update to 4.0.0. diff --git a/sources b/sources index f41dc76..19fdcfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.0.tar.gz) = 998dd0358481bf5799504b5b6589ca9029cbad96d6344954c3c7c722b24e535f572809a5ebb110ed865c40eed385079f106f8a349140ca03bdde42bba386baf6 +SHA512 (lxcfs-4.0.1.tar.gz) = 4b1031dc0c50457b9081ae231a31f1079d06fdc8c6a1c256210fad802bd475c44d7fa3b0e21c26b232e4846780913b546f954b34571212a6820d69ea759f1260 From 7c4290d76e1e6940e293c2cd894a2933affe0b64 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 10 Apr 2020 17:06:50 +0200 Subject: [PATCH 15/37] Update to 4.0.2. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 4447ef3..a99ab7f 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.1 +Version: 4.0.2 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Apr 10 2020 Thomas Moschny - 4.0.2-1 +- Update to 4.0.2. + * Sat Mar 21 2020 Thomas Moschny - 4.0.1-1 - Update to 4.0.1. diff --git a/sources b/sources index 19fdcfd..274b0a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.1.tar.gz) = 4b1031dc0c50457b9081ae231a31f1079d06fdc8c6a1c256210fad802bd475c44d7fa3b0e21c26b232e4846780913b546f954b34571212a6820d69ea759f1260 +SHA512 (lxcfs-4.0.2.tar.gz) = 8fe4e4e063bf0948c2fb9a340b6612e4e62771c04687391ee9fe7e990a5a92d880ef30ce9d9b322f480a6062b1ba93a668b58e1cec9509ace8205d90cc6e12d0 From f12b9f77a4eb94c2f8b4bdee8b176a0fe18cc670 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 24 Apr 2020 21:25:34 +0200 Subject: [PATCH 16/37] Update to 4.0.3. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index a99ab7f..58f7399 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.2 +Version: 4.0.3 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Apr 24 2020 Thomas Moschny - 4.0.3-1 +- Update to 4.0.3. + * Fri Apr 10 2020 Thomas Moschny - 4.0.2-1 - Update to 4.0.2. diff --git a/sources b/sources index 274b0a8..86ea6cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.2.tar.gz) = 8fe4e4e063bf0948c2fb9a340b6612e4e62771c04687391ee9fe7e990a5a92d880ef30ce9d9b322f480a6062b1ba93a668b58e1cec9509ace8205d90cc6e12d0 +SHA512 (lxcfs-4.0.3.tar.gz) = fabbccdb6d65c5cf8a0eab26be9f75d26d11691f7043bacf3998081e21c6a49b073c6c1e45e5c7b24f83ecdac5cf133ad3ff598cfc5f890d80333015e4ee1ec7 From 5a629a14f0df3ebc3f4f3e2f4a522291d21970d4 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 20 Jun 2020 11:57:27 +0200 Subject: [PATCH 17/37] Update to 4.0.4. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 58f7399..3746ae4 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat Jun 20 2020 Thomas Moschny - 4.0.4-1 +- Update to 4.0.4. + * Fri Apr 24 2020 Thomas Moschny - 4.0.3-1 - Update to 4.0.3. diff --git a/sources b/sources index 86ea6cf..785a4c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.3.tar.gz) = fabbccdb6d65c5cf8a0eab26be9f75d26d11691f7043bacf3998081e21c6a49b073c6c1e45e5c7b24f83ecdac5cf133ad3ff598cfc5f890d80333015e4ee1ec7 +SHA512 (lxcfs-4.0.4.tar.gz) = 87922eedd96bf6550ab2d7e6fbac5123dc8fa7e5aaa164c7ec974bcafc5724de91729be2a4bedc1478c38ed0849fe7fe7769271682c709f67ebe8ef2fb14d68f From b2f2cb2545a7e6f800b2d825f85fc03220e1e42e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:36:08 +0000 Subject: [PATCH 18/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 3746ae4..c5f73bc 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 4.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 4.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jun 20 2020 Thomas Moschny - 4.0.4-1 - Update to 4.0.4. From ad6bbb98fd20aca67bdee22a3d335c9bf84b2349 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 5 Aug 2020 19:08:12 +0200 Subject: [PATCH 19/37] Update to 4.0.5. --- lxcfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index c5f73bc..ec3a788 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 4.0.4 -Release: 2%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Wed Aug 5 2020 Thomas Moschny - 4.0.5-1 +- Update to 4.0.5. + * Tue Jul 28 2020 Fedora Release Engineering - 4.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 785a4c1..2cd4b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.4.tar.gz) = 87922eedd96bf6550ab2d7e6fbac5123dc8fa7e5aaa164c7ec974bcafc5724de91729be2a4bedc1478c38ed0849fe7fe7769271682c709f67ebe8ef2fb14d68f +SHA512 (lxcfs-4.0.5.tar.gz) = 6961d7cb08a7562a17e513b53b1a3a75993824b1e1a4de12d080e73ba86f9883abb43b039ce82e938d3f2e9fffa7eea6bb1a12b07b9b281e393946146a9e3a86 From 78b9699c85379a21b6ffad10cb65dc1b2a297dd5 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 25 Oct 2020 22:20:48 +0100 Subject: [PATCH 20/37] Update to 4.0.6. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index ec3a788..4ac30e4 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.5 +Version: 4.0.6 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sun Oct 25 2020 Thomas Moschny - 4.0.6-1 +- Update to 4.0.6. + * Wed Aug 5 2020 Thomas Moschny - 4.0.5-1 - Update to 4.0.5. diff --git a/sources b/sources index 2cd4b13..329cc93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.5.tar.gz) = 6961d7cb08a7562a17e513b53b1a3a75993824b1e1a4de12d080e73ba86f9883abb43b039ce82e938d3f2e9fffa7eea6bb1a12b07b9b281e393946146a9e3a86 +SHA512 (lxcfs-4.0.6.tar.gz) = 843ca196304efc963549c0e081bea4d58182887611da36232e875de4898d738111a967d89b4b49a9df51f25daf119ad2d488b8298cdef82926be03a7fa99a8a2 From ba2d44c4d82e9d81ab7cc1e10c72a61751a88dde Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 13 Jan 2021 13:32:13 +0100 Subject: [PATCH 21/37] Update to 4.0.7. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 4ac30e4..21b3f3d 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.6 +Version: 4.0.7 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Wed Jan 13 2021 Thomas Moschny - 4.0.7-1 +- Update to 4.0.7. + * Sun Oct 25 2020 Thomas Moschny - 4.0.6-1 - Update to 4.0.6. diff --git a/sources b/sources index 329cc93..662e7cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.6.tar.gz) = 843ca196304efc963549c0e081bea4d58182887611da36232e875de4898d738111a967d89b4b49a9df51f25daf119ad2d488b8298cdef82926be03a7fa99a8a2 +SHA512 (lxcfs-4.0.7.tar.gz) = ab66d4278f8a5e0bb0e7495badcd587ef5fa48fb6271d8682cdca8b0f7c5c4b5f889ca43a86520e6aa28d6824be20f050707169bbed5921e3e4f7eaa0be7a1d5 From dcc9c548d9fca2a91bcb4b71a60d310ed3b50a54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:59:11 +0000 Subject: [PATCH 22/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 21b3f3d..63b2005 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 4.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 2021 Thomas Moschny - 4.0.7-1 - Update to 4.0.7. From 81ca0d90c9675c7190f91bea433f8ab2e3f81d5b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 1 May 2021 11:44:04 +0200 Subject: [PATCH 23/37] Update to 4.0.8. --- lxcfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 63b2005..ef79ddc 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 4.0.7 -Release: 2%{?dist} +Version: 4.0.8 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat May 1 2021 Thomas Moschny - 4.0.8-1 +- Update to 4.0.8. + * Tue Jan 26 2021 Fedora Release Engineering - 4.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 662e7cb..75ef724 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.7.tar.gz) = ab66d4278f8a5e0bb0e7495badcd587ef5fa48fb6271d8682cdca8b0f7c5c4b5f889ca43a86520e6aa28d6824be20f050707169bbed5921e3e4f7eaa0be7a1d5 +SHA512 (lxcfs-4.0.8.tar.gz) = 830a4a25583a645b59c75327701af24c239323bfe822180c2cb7cb7cc284f50e8bb7c38e771ea869b4449370af1ab1a4fed9611c6495883d193f5a0f6f71380e From 2a4cc1289cc5b0d627c465b4c628f878d133315e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 21 Jul 2021 18:45:17 +0200 Subject: [PATCH 24/37] Update to 4.0.9. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index ef79ddc..486175e 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.8 +Version: 4.0.9 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Wed Jul 21 2021 Thomas Moschny - 4.0.9-1 +- Update to 4.0.9. + * Sat May 1 2021 Thomas Moschny - 4.0.8-1 - Update to 4.0.8. diff --git a/sources b/sources index 75ef724..59eec05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.8.tar.gz) = 830a4a25583a645b59c75327701af24c239323bfe822180c2cb7cb7cc284f50e8bb7c38e771ea869b4449370af1ab1a4fed9611c6495883d193f5a0f6f71380e +SHA512 (lxcfs-4.0.9.tar.gz) = c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe From 58e62905627becf1845ebf9b6134c50f695ffac3 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 23 Oct 2021 09:36:33 +0200 Subject: [PATCH 25/37] Update to 4.0.11. --- lxcfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 486175e..3946b09 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,5 +1,5 @@ Name: lxcfs -Version: 4.0.9 +Version: 4.0.11 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat Oct 23 2021 Thomas Moschny - 4.0.11-1 +- Update to 4.0.11. + * Wed Jul 21 2021 Thomas Moschny - 4.0.9-1 - Update to 4.0.9. diff --git a/sources b/sources index 59eec05..d12d855 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.9.tar.gz) = c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe +SHA512 (lxcfs-4.0.11.tar.gz) = 60a76b8d3ab8a164ead8424cf2a20cdb616919318881348016299d2b5bff9d221c12b9208b46e6f72a84695632a762292313e0b51579d590ce505cf5b6fec6de From f511aa86514585aa13253ee175da7ba9ccd3a92a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:24:29 +0000 Subject: [PATCH 26/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 3946b09..e57ac1a 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 4.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Oct 23 2021 Thomas Moschny - 4.0.11-1 - Update to 4.0.11. From b2ce02949dfad76c8a6b0937701218d2143f124d Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 5 Mar 2022 13:15:30 +0100 Subject: [PATCH 27/37] Update to 4.0.12. --- lxcfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index e57ac1a..a1a7a1b 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs -Version: 4.0.11 -Release: 2%{?dist} +Version: 4.0.12 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -74,6 +74,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Sat Mar 5 2022 Thomas Moschny - 4.0.12-1 +- Update to 4.0.12. + * Thu Jan 20 2022 Fedora Release Engineering - 4.0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index d12d855..15b9bae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.11.tar.gz) = 60a76b8d3ab8a164ead8424cf2a20cdb616919318881348016299d2b5bff9d221c12b9208b46e6f72a84695632a762292313e0b51579d590ce505cf5b6fec6de +SHA512 (lxcfs-4.0.12.tar.gz) = da8415599bb08e4e15a7e4044edbcad217e4034d96366d508e06cceb2a75d459e24aeb7efd5716e2f41449ec653ecd9916f0d934f738e1df8e9576738cc1ac18 From 27d3cf5490ab951de43ede0ff719b015bfba0dec Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 25 May 2022 09:25:06 +0200 Subject: [PATCH 28/37] Update to 5.0.0. --- lxcfs-5.0.0-man.patch | 85 +++++++++++++++++++++++++++++++++++++++ lxcfs-5.0.0-unitdir.patch | 22 ++++++++++ lxcfs.spec | 18 ++++++--- sources | 2 +- 4 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 lxcfs-5.0.0-man.patch create mode 100644 lxcfs-5.0.0-unitdir.patch diff --git a/lxcfs-5.0.0-man.patch b/lxcfs-5.0.0-man.patch new file mode 100644 index 0000000..d21c8b4 --- /dev/null +++ b/lxcfs-5.0.0-man.patch @@ -0,0 +1,85 @@ +commit 112f0b9ca720b8f0da4d4a39153c16f55e3294e1 +Author: Morten Linderud +Date: Sat Mar 12 15:53:51 2022 + + meson: Include documentation + + Documentation was removed from the build system with the migration to + meson. This implements the help2man generation which existed in the + autoconf setup. + + Signed-off-by: Morten Linderud + +diff --git a/meson.build b/meson.build +index 517dbf6..72c5a73 100644 +--- a/meson.build ++++ b/meson.build +@@ -52,6 +52,7 @@ datadir = join_paths(prefixdir, get_option('datadir')) + + lxcfssharedir = join_paths(datadir, 'lxcfs') + lxcconfdir = join_paths(datadir, 'lxc/config/common.conf.d') ++lxcmandir = join_paths(datadir, 'man') + + conf.set_quoted('BINDIR', bindir) + conf.set_quoted('LIBDIR', libdir) +@@ -68,6 +69,7 @@ conf.set_quoted('LXCFSTARGETDIR', join_paths(localstatedir, 'lib/lxcfs')) + # Custom configuration. + init_script = get_option('init-script') + want_tests = get_option('tests') ++want_docs= get_option('docs') + + + # Build flags. +@@ -167,8 +169,7 @@ add_project_arguments('-include', 'config.h', language: 'c') + + # Binary. + lxcfs_sources = files('src/lxcfs.c') +-public_programs = [] +-public_programs += executable( ++lxcfs = executable( + 'lxcfs', + lxcfs_sources, + dependencies: [ +@@ -251,6 +252,24 @@ lxcfs_spec = custom_target( + '@OUTPUT@', + ]) + ++# Man pages ++if want_docs == true ++ help2man = find_program('help2man') ++ help2man_opts = [ ++ '--name="System virtualization filesystem for containers"', ++ '--no-discard-stderr', ++ '--section=1', ++ '--opt-include=docs/lxcfs.man.add', ++ '--no-info', ++ ] ++ custom_target('lxcfs.1', ++ output: 'lxcfs.1', ++ command: [help2man, help2man_opts, '--output=@OUTPUT@', lxcfs], ++ install: true, ++ install_dir: join_paths(lxcmandir, 'man1')) ++endif ++ ++ + # Include sub-directories. + subdir('config/init') + subdir('share') +@@ -275,5 +294,6 @@ status = [ + 'lxcfs source root directory: @0@'.format(project_source_root), + 'init system: @0@'.format(init_script), + 'tests: @0@'.format(want_tests), ++ 'documentation: @0@'.format(want_docs), + ] + message('\n '.join(status)) +diff --git a/meson_options.txt b/meson_options.txt +index 8529aef..6718c45 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -12,3 +12,6 @@ option('with-init-script', type : 'string', value : 'systemd', + option('init-script', type : 'combo', + choices : ['systemd', 'sysvinit', 'openrc', 'upstart'], value : 'systemd', + description : 'init script') ++ ++option('docs', type : 'boolean', value: 'true', ++ description : 'build documentation') diff --git a/lxcfs-5.0.0-unitdir.patch b/lxcfs-5.0.0-unitdir.patch new file mode 100644 index 0000000..67a1901 --- /dev/null +++ b/lxcfs-5.0.0-unitdir.patch @@ -0,0 +1,22 @@ +diff --git a/config/init/meson.build b/config/init/meson.build +index 5061973..e39c2ab 100644 +--- a/config/init/meson.build ++++ b/config/init/meson.build +@@ -1,6 +1,8 @@ + # SPDX-License-Identifier: LGPL-2.1-or-later + + if init_script == 'systemd' ++ systemd = dependency('systemd') ++ systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir') + systemd_service = custom_target( + 'lxcfs.service', + input: 'systemd/lxcfs.service.in', +@@ -12,7 +14,7 @@ if init_script == 'systemd' + '@OUTPUT@', + ], + install: true, +- install_dir: '/lib/systemd/system') ++ install_dir: systemd_system_unit_dir) + + elif init_script == 'upstart' + install_data('upstart/lxcfs.conf', install_dir: join_paths(sysconfdir, 'init')) diff --git a/lxcfs.spec b/lxcfs.spec index a1a7a1b..01c74e8 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,11 +1,15 @@ Name: lxcfs -Version: 4.0.12 +Version: 5.0.0 Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs Source0: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz +Patch0: lxcfs-5.0.0-unitdir.patch +Patch1: lxcfs-5.0.0-man.patch +BuildRequires: meson BuildRequires: gcc + BuildRequires: gawk BuildRequires: make BuildRequires: fuse-devel @@ -30,16 +34,16 @@ how long the host is running. %prep -%autosetup +%autosetup -p1 %build -%configure --with-init-script=systemd -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install SYSTEMD_UNIT_DIR=%{_unitdir} +%meson_install mkdir -p %{buildroot}%{_sharedstatedir}/%{name} @@ -63,7 +67,6 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %{_bindir}/lxcfs %dir %{_libdir}/%{name} %{_libdir}/%{name}/lib%{name}.so -%exclude %{_libdir}/%{name}/lib%{name}.la %dir %{_datadir}/%{name} %{_datadir}/%{name}/lxc.mount.hook %{_datadir}/%{name}/lxc.reboot.hook @@ -74,6 +77,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Wed May 25 2022 Thomas Moschny - 5.0.0-1 +- Update to 5.0.0. + * Sat Mar 5 2022 Thomas Moschny - 4.0.12-1 - Update to 4.0.12. diff --git a/sources b/sources index 15b9bae..3594d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-4.0.12.tar.gz) = da8415599bb08e4e15a7e4044edbcad217e4034d96366d508e06cceb2a75d459e24aeb7efd5716e2f41449ec653ecd9916f0d934f738e1df8e9576738cc1ac18 +SHA512 (lxcfs-5.0.0.tar.gz) = f6ab0feea862812dde08dd828cb7843820a27f56ec88ef1bf264e3fe585037b9327849e4a31c629f2712c861cdc80d59ea15c190d875d48b2d446fe15d9e57b8 From b4e2e650164dcc7f4719d8507d0b7581728c4fa9 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 25 May 2022 09:39:59 +0200 Subject: [PATCH 29/37] Add missing BR. --- lxcfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 01c74e8..2d71a53 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -9,7 +9,7 @@ Patch0: lxcfs-5.0.0-unitdir.patch Patch1: lxcfs-5.0.0-man.patch BuildRequires: meson BuildRequires: gcc - +BuildRequires: python3-jinja2 BuildRequires: gawk BuildRequires: make BuildRequires: fuse-devel From bdb62144935638b9a9e880e7843c8a618e229a5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:12:42 +0000 Subject: [PATCH 30/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 2d71a53..59a2ce2 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -77,6 +77,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 25 2022 Thomas Moschny - 5.0.0-1 - Update to 5.0.0. From 884ac10acdef053d81728a07de804d909fbeeb27 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Sep 2022 11:49:29 +0200 Subject: [PATCH 31/37] Update to 5.0.2. --- lxcfs-5.0.0-man.patch | 85 --------------------------------------- lxcfs-5.0.0-unitdir.patch | 22 ---------- lxcfs.spec | 9 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 lxcfs-5.0.0-man.patch delete mode 100644 lxcfs-5.0.0-unitdir.patch diff --git a/lxcfs-5.0.0-man.patch b/lxcfs-5.0.0-man.patch deleted file mode 100644 index d21c8b4..0000000 --- a/lxcfs-5.0.0-man.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit 112f0b9ca720b8f0da4d4a39153c16f55e3294e1 -Author: Morten Linderud -Date: Sat Mar 12 15:53:51 2022 - - meson: Include documentation - - Documentation was removed from the build system with the migration to - meson. This implements the help2man generation which existed in the - autoconf setup. - - Signed-off-by: Morten Linderud - -diff --git a/meson.build b/meson.build -index 517dbf6..72c5a73 100644 ---- a/meson.build -+++ b/meson.build -@@ -52,6 +52,7 @@ datadir = join_paths(prefixdir, get_option('datadir')) - - lxcfssharedir = join_paths(datadir, 'lxcfs') - lxcconfdir = join_paths(datadir, 'lxc/config/common.conf.d') -+lxcmandir = join_paths(datadir, 'man') - - conf.set_quoted('BINDIR', bindir) - conf.set_quoted('LIBDIR', libdir) -@@ -68,6 +69,7 @@ conf.set_quoted('LXCFSTARGETDIR', join_paths(localstatedir, 'lib/lxcfs')) - # Custom configuration. - init_script = get_option('init-script') - want_tests = get_option('tests') -+want_docs= get_option('docs') - - - # Build flags. -@@ -167,8 +169,7 @@ add_project_arguments('-include', 'config.h', language: 'c') - - # Binary. - lxcfs_sources = files('src/lxcfs.c') --public_programs = [] --public_programs += executable( -+lxcfs = executable( - 'lxcfs', - lxcfs_sources, - dependencies: [ -@@ -251,6 +252,24 @@ lxcfs_spec = custom_target( - '@OUTPUT@', - ]) - -+# Man pages -+if want_docs == true -+ help2man = find_program('help2man') -+ help2man_opts = [ -+ '--name="System virtualization filesystem for containers"', -+ '--no-discard-stderr', -+ '--section=1', -+ '--opt-include=docs/lxcfs.man.add', -+ '--no-info', -+ ] -+ custom_target('lxcfs.1', -+ output: 'lxcfs.1', -+ command: [help2man, help2man_opts, '--output=@OUTPUT@', lxcfs], -+ install: true, -+ install_dir: join_paths(lxcmandir, 'man1')) -+endif -+ -+ - # Include sub-directories. - subdir('config/init') - subdir('share') -@@ -275,5 +294,6 @@ status = [ - 'lxcfs source root directory: @0@'.format(project_source_root), - 'init system: @0@'.format(init_script), - 'tests: @0@'.format(want_tests), -+ 'documentation: @0@'.format(want_docs), - ] - message('\n '.join(status)) -diff --git a/meson_options.txt b/meson_options.txt -index 8529aef..6718c45 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -12,3 +12,6 @@ option('with-init-script', type : 'string', value : 'systemd', - option('init-script', type : 'combo', - choices : ['systemd', 'sysvinit', 'openrc', 'upstart'], value : 'systemd', - description : 'init script') -+ -+option('docs', type : 'boolean', value: 'true', -+ description : 'build documentation') diff --git a/lxcfs-5.0.0-unitdir.patch b/lxcfs-5.0.0-unitdir.patch deleted file mode 100644 index 67a1901..0000000 --- a/lxcfs-5.0.0-unitdir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/config/init/meson.build b/config/init/meson.build -index 5061973..e39c2ab 100644 ---- a/config/init/meson.build -+++ b/config/init/meson.build -@@ -1,6 +1,8 @@ - # SPDX-License-Identifier: LGPL-2.1-or-later - - if init_script == 'systemd' -+ systemd = dependency('systemd') -+ systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir') - systemd_service = custom_target( - 'lxcfs.service', - input: 'systemd/lxcfs.service.in', -@@ -12,7 +14,7 @@ if init_script == 'systemd' - '@OUTPUT@', - ], - install: true, -- install_dir: '/lib/systemd/system') -+ install_dir: systemd_system_unit_dir) - - elif init_script == 'upstart' - install_data('upstart/lxcfs.conf', install_dir: join_paths(sysconfdir, 'init')) diff --git a/lxcfs.spec b/lxcfs.spec index 59a2ce2..edd6bf6 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,12 +1,10 @@ Name: lxcfs -Version: 5.0.0 -Release: 2%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs Source0: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz -Patch0: lxcfs-5.0.0-unitdir.patch -Patch1: lxcfs-5.0.0-man.patch BuildRequires: meson BuildRequires: gcc BuildRequires: python3-jinja2 @@ -77,6 +75,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Sep 2 2022 Thomas Moschny - 5.0.2-1 +- Update to 5.0.2. + * Thu Jul 21 2022 Fedora Release Engineering - 5.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 3594d9f..419a600 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-5.0.0.tar.gz) = f6ab0feea862812dde08dd828cb7843820a27f56ec88ef1bf264e3fe585037b9327849e4a31c629f2712c861cdc80d59ea15c190d875d48b2d446fe15d9e57b8 +SHA512 (lxcfs-5.0.2.tar.gz) = df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407 From 52b183eee59a5275af8e681620c963384a99eb02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:38:45 +0000 Subject: [PATCH 32/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index edd6bf6..95b4525 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -75,6 +75,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 2 2022 Thomas Moschny - 5.0.2-1 - Update to 5.0.2. From 7916365082bfc83d60d27a35ae8b4a60e18cc6da Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 20 Jan 2023 09:13:13 +0100 Subject: [PATCH 33/37] Update to 5.0.3. --- lxcfs.spec | 11 ++++++++--- sources | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lxcfs.spec b/lxcfs.spec index 95b4525..6137def 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,10 +1,12 @@ Name: lxcfs -Version: 5.0.2 -Release: 2%{?dist} +Version: 5.0.3 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs -Source0: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz +Source: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz +# revert https://github.com/lxc/lxcfs/pull/555 +Patch: lxcfs-5.0.3-fix-service.patch BuildRequires: meson BuildRequires: gcc BuildRequires: python3-jinja2 @@ -75,6 +77,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Fri Jan 20 2023 Thomas Moschny - 5.0.3-1 +- Update to 5.0.3. + * Thu Jan 19 2023 Fedora Release Engineering - 5.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 419a600..cd33d3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-5.0.2.tar.gz) = df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407 +SHA512 (lxcfs-5.0.3.tar.gz) = 967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd From 2dba95ead57fd4b225bbe4fb3be82bfb577b8731 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 20 Jan 2023 09:44:05 +0100 Subject: [PATCH 34/37] Add missing patch. --- lxcfs-5.0.3-fix-service.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 lxcfs-5.0.3-fix-service.patch diff --git a/lxcfs-5.0.3-fix-service.patch b/lxcfs-5.0.3-fix-service.patch new file mode 100644 index 0000000..f6d9899 --- /dev/null +++ b/lxcfs-5.0.3-fix-service.patch @@ -0,0 +1,13 @@ +diff --git a/config/init/meson.build b/config/init/meson.build +index 8445955..5200570 100644 +--- a/config/init/meson.build ++++ b/config/init/meson.build +@@ -2,7 +2,7 @@ + + if 'systemd' in init_script + systemd = dependency('systemd') +- systemd_system_unit_dir = get_option('prefix') + systemd.get_pkgconfig_variable('systemdsystemunitdir') ++ systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir') + systemd_service = custom_target( + 'lxcfs.service', + input: 'systemd/lxcfs.service.in', From 712219cb8dbdaf926e42077f1af85ccb5f04ec2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:25:31 +0000 Subject: [PATCH 35/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxcfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxcfs.spec b/lxcfs.spec index 6137def..b6cc766 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,6 +1,6 @@ Name: lxcfs Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs @@ -77,6 +77,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Thomas Moschny - 5.0.3-1 - Update to 5.0.3. From e15a414707a79e6e9784474c45f694ac5e76ea6d Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 2 Aug 2023 18:48:09 +0200 Subject: [PATCH 36/37] Update to 5.0.4. --- lxcfs-5.0.3-fix-service.patch | 13 ------------- lxcfs.spec | 11 ++++++----- sources | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 lxcfs-5.0.3-fix-service.patch diff --git a/lxcfs-5.0.3-fix-service.patch b/lxcfs-5.0.3-fix-service.patch deleted file mode 100644 index f6d9899..0000000 --- a/lxcfs-5.0.3-fix-service.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config/init/meson.build b/config/init/meson.build -index 8445955..5200570 100644 ---- a/config/init/meson.build -+++ b/config/init/meson.build -@@ -2,7 +2,7 @@ - - if 'systemd' in init_script - systemd = dependency('systemd') -- systemd_system_unit_dir = get_option('prefix') + systemd.get_pkgconfig_variable('systemdsystemunitdir') -+ systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir') - systemd_service = custom_target( - 'lxcfs.service', - input: 'systemd/lxcfs.service.in', diff --git a/lxcfs.spec b/lxcfs.spec index b6cc766..3c42640 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -1,12 +1,10 @@ Name: lxcfs -Version: 5.0.3 -Release: 2%{?dist} +Version: 5.0.4 +Release: 1%{?dist} Summary: FUSE based filesystem for LXC License: ASL 2.0 URL: https://linuxcontainers.org/lxcfs -Source: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz -# revert https://github.com/lxc/lxcfs/pull/555 -Patch: lxcfs-5.0.3-fix-service.patch +Source: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz BuildRequires: meson BuildRequires: gcc BuildRequires: python3-jinja2 @@ -77,6 +75,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Wed Aug 2 2023 Thomas Moschny - 5.0.4-1 +- Update to 5.0.4. + * Thu Jul 20 2023 Fedora Release Engineering - 5.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index cd33d3b..8ddb28c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxcfs-5.0.3.tar.gz) = 967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd +SHA512 (lxcfs-5.0.4.tar.gz) = b404045dbabe23e1d1f1d74c1648d2596bb70aaa9f9e46f9f5635b0a02d0c451f68b2559920bbefc5b889e908cf1da0a33c148b26bdce3e45c3d0cbdff710604 From 7066a2383870452cea12bab2c9335f015ed8b645 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:23:34 +0300 Subject: [PATCH 37/37] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index bd6fab5..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# lxcfs - -The lxcfs package \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 8ddb28c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (lxcfs-5.0.4.tar.gz) = b404045dbabe23e1d1f1d74c1648d2596bb70aaa9f9e46f9f5635b0a02d0c451f68b2559920bbefc5b889e908cf1da0a33c148b26bdce3e45c3d0cbdff710604