|
|
@@ -1,3 +1,4 @@
|
|
|
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
|
|
|
|
|
%global with_python3 1
|
|
|
@@ -11,7 +12,7 @@
|
|
|
|
|
|
Name: lxc
|
|
|
Version: 2.0.1
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
Summary: Linux Resource Containers
|
|
|
Summary(ja): Linux リソースコンテナ
|
|
|
Group: Applications/System
|
|
|
@@ -31,8 +32,9 @@ Patch1: lxc-2.0.0-remove-werror.patch
|
|
|
BuildRequires: docbook-utils
|
|
|
Buildrequires: docbook2X
|
|
|
Buildrequires: doxygen
|
|
|
+BuildRequires: glibc-static
|
|
|
BuildRequires: kernel-headers
|
|
|
-BuildRequires: libcap-devel
|
|
|
+BuildRequires: libcap-static
|
|
|
BuildRequires: libtool
|
|
|
BuildRequires: lua-devel
|
|
|
BuildRequires: perl-XML-SAX
|
|
|
@@ -67,13 +69,23 @@ Requires(preun): initscripts, chkconfig
|
|
|
Requires(postun): initscripts
|
|
|
%endif # with_systemd
|
|
|
|
|
|
-
|
|
|
-%description libs
|
|
|
+%description libs
|
|
|
Linux Resource Containers provide process and resource isolation without the
|
|
|
overhead of full virtualization.
|
|
|
|
|
|
The %{name}-libs package contains libraries for running %{name} applications.
|
|
|
|
|
|
+%if %{build_compat32}
|
|
|
+%package -n compat32-%{name}-init-static
|
|
|
+Summary: init command for %{name}-execute
|
|
|
+Summary(ja): %{name}-execute用initコマンド
|
|
|
+Group: Applications/System
|
|
|
+
|
|
|
+%description -n compat32-%{name}-init-static
|
|
|
+This package is init(8) needed by %{name}-execute.
|
|
|
+
|
|
|
+%endif
|
|
|
+
|
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
%package -n python3-%{name}
|
|
|
@@ -219,6 +231,9 @@ install -m775 %{SOURCE10} %{buildroot}%{_datadir}/lxc/templates/
|
|
|
install -m775 %{SOURCE11} %{buildroot}%{_datadir}/lxc/config/
|
|
|
install -m775 %{SOURCE12} %{buildroot}%{_datadir}/lxc/config/
|
|
|
|
|
|
+%if %{build_compat32}
|
|
|
+cp %{buildroot}%{_sbindir}/init.%{name}.static %{buildroot}%{_sbindir}/init.%{name}.static-x86
|
|
|
+%endif
|
|
|
|
|
|
%check
|
|
|
make check
|
|
|
@@ -287,8 +302,8 @@ fi
|
|
|
%{_libdir}/liblxc.so.*
|
|
|
%{_libdir}/%{name}
|
|
|
%{_libexecdir}/%{name}
|
|
|
-# fixme: should be in libexecdir?
|
|
|
%{_sbindir}/init.%{name}
|
|
|
+%{_sbindir}/init.%{name}.static
|
|
|
%{_bindir}/%{name}-autostart
|
|
|
%{_sharedstatedir}/%{name}
|
|
|
%dir %{_sysconfdir}/%{name}
|
|
|
@@ -315,6 +330,12 @@ fi
|
|
|
%dir %{_localstatedir}/cache/%{name}
|
|
|
|
|
|
|
|
|
+%if %{build_compat32}
|
|
|
+%files -n compat32-%{name}-init-static
|
|
|
+%{_sbindir}/init.%{name}.static-x86
|
|
|
+%endif
|
|
|
+
|
|
|
+
|
|
|
%if 0%{?with_python3}
|
|
|
%files -n python3-%{name}
|
|
|
%{python3_sitearch}/*
|
|
|
@@ -354,6 +375,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jun 26 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.1-2
|
|
|
+- enabled init.lxc.static for lxc-execute.
|
|
|
+
|
|
|
* Thu Jun 23 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.1-1
|
|
|
- updated to 2.0.1.
|
|
|
- replaced all patches.
|
tomop