Browse code
lxcfs: Fix service failure
- Updated the version to latest 5.0.3
- Fixed service by adding required
/var/lib/lxcfs path
Change-Id: I5a90197cc2c178bf563cb4c3e4b44693c285eb77
Signed-off-by: Ankit Jain <ankitja@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/19259
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Shreenidhi Shedi <sshedi@vmware.com>
Ankit Jain authored on 2023/01/24 15:23:56Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,28 @@ |
| 0 |
+From 3a798b460ffdcaed0c05ac0d1492786d089b693a Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Ankit Jain <ankitja@vmware.com> |
|
| 2 |
+Date: Tue, 24 Jan 2023 06:12:43 +0000 |
|
| 3 |
+Subject: [PATCH] lxcfs:meson_build: Fix service |
|
| 4 |
+ |
|
| 5 |
+- Revert https://github.com/lxc/lxcfs/pull/555 |
|
| 6 |
+ |
|
| 7 |
+Signed-off-by: Ankit Jain <ankitja@vmware.com> |
|
| 8 |
+--- |
|
| 9 |
+ config/init/meson.build | 2 +- |
|
| 10 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
|
| 11 |
+ |
|
| 12 |
+diff --git a/config/init/meson.build b/config/init/meson.build |
|
| 13 |
+index 8445955..5200570 100644 |
|
| 14 |
+--- a/config/init/meson.build |
|
| 15 |
+@@ -2,7 +2,7 @@ |
|
| 16 |
+ |
|
| 17 |
+ if 'systemd' in init_script |
|
| 18 |
+ systemd = dependency('systemd')
|
|
| 19 |
+- systemd_system_unit_dir = get_option('prefix') + systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
|
| 20 |
++ systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
|
| 21 |
+ systemd_service = custom_target( |
|
| 22 |
+ 'lxcfs.service', |
|
| 23 |
+ input: 'systemd/lxcfs.service.in', |
|
| 24 |
+-- |
|
| 25 |
+2.23.1 |
|
| 26 |
+ |
| ... | ... |
@@ -1,25 +1,31 @@ |
| 1 | 1 |
Summary: Linux Containers File System |
| 2 | 2 |
Name: lxcfs |
| 3 |
-Version: 5.0.0 |
|
| 3 |
+Version: 5.0.3 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
URL: https://linuxcontainers.org/lxcfs/downloads/ |
| 6 | 6 |
Source0: %{name}-%{version}.tar.gz
|
| 7 | 7 |
License: LGPL 2.1+ |
| 8 | 8 |
Group: System Environment/Libraries |
| 9 |
-%define sha512 %{name}=f6ab0feea862812dde08dd828cb7843820a27f56ec88ef1bf264e3fe585037b9327849e4a31c629f2712c861cdc80d59ea15c190d875d48b2d446fe15d9e57b8
|
|
| 9 |
+%define sha512 %{name}=967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd
|
|
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
BuildRequires: gcc meson python3-jinja2 |
| 13 | 13 |
BuildRequires: libtool |
| 14 | 14 |
BuildRequires: fuse-devel |
| 15 |
-BuildRequires: systemd |
|
| 15 |
+BuildRequires: systemd-devel |
|
| 16 |
+BuildRequires: help2man |
|
| 16 | 17 |
Requires: fuse |
| 18 |
+Requires(post): systemd |
|
| 19 |
+Requires(preun): systemd |
|
| 20 |
+Requires(postun): systemd |
|
| 21 |
+ |
|
| 22 |
+Patch0: 0001-lxcfs-meson_build-Fix-service.patch |
|
| 17 | 23 |
|
| 18 | 24 |
%description |
| 19 | 25 |
LXCFS is a simple userspace filesystem designed to work around some current limitations of the Linux kernel. |
| 20 | 26 |
|
| 21 | 27 |
%prep |
| 22 |
-%autosetup |
|
| 28 |
+%autosetup -p1 |
|
| 23 | 29 |
|
| 24 | 30 |
%build |
| 25 | 31 |
%meson |
| ... | ... |
@@ -27,28 +33,33 @@ LXCFS is a simple userspace filesystem designed to work around some current limi |
| 27 | 27 |
|
| 28 | 28 |
%install |
| 29 | 29 |
%meson_install |
| 30 |
+install -vdm755 %{buildroot}%{_sharedstatedir}/%{name}
|
|
| 30 | 31 |
|
| 31 | 32 |
%post |
| 32 |
-%systemd_post lxcfs.service |
|
| 33 |
+%systemd_post %{name}.service
|
|
| 33 | 34 |
|
| 34 | 35 |
%preun |
| 35 |
-%systemd_preun lxcfs.service |
|
| 36 |
+%systemd_preun %{name}.service
|
|
| 36 | 37 |
|
| 37 | 38 |
%postun |
| 38 |
-%systemd_postun lxcfs.service |
|
| 39 |
+%systemd_postun %{name}.service
|
|
| 39 | 40 |
|
| 40 | 41 |
%clean |
| 41 | 42 |
rm -rf %{buildroot}
|
| 42 | 43 |
|
| 43 | 44 |
%files |
| 44 | 45 |
%defattr(-,root,root,-) |
| 45 |
-/lib/systemd/system/%{name}.service
|
|
| 46 |
-%{_bindir}/lxcfs
|
|
| 47 |
-%{_libdir}/%{name}/liblxcfs.so
|
|
| 46 |
+%{_bindir}/%{name}
|
|
| 47 |
+%{_unitdir}/%{name}.service
|
|
| 48 |
+%{_libdir}/%{name}/lib%{name}.so
|
|
| 48 | 49 |
%{_datadir}/%{name}/*.hook
|
| 49 | 50 |
%{_datadir}/lxc/config/common.conf.d/00-lxcfs.conf
|
| 51 |
+%{_mandir}/man1/%{name}.1*
|
|
| 52 |
+%dir %{_sharedstatedir}/%{name}
|
|
| 50 | 53 |
|
| 51 | 54 |
%changelog |
| 55 |
+* Tue Jan 24 2023 Ankit Jain <ankitja@vmware.com> 5.0.3-1 |
|
| 56 |
+- Update to 5.0.3 and fixes services failure |
|
| 52 | 57 |
* Mon Apr 18 2022 Gerrit Photon <photon-checkins@vmware.com> 5.0.0-1 |
| 53 | 58 |
- Automatic Version Bump |
| 54 | 59 |
* Mon May 03 2021 Gerrit Photon <photon-checkins@vmware.com> 4.0.8-1 |