Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
a1dbe3556f | |||
|
4d6305737f | ||
|
4b2a3ad5b5 | ||
|
d1d198a4d5 | ||
|
068cf2856e | ||
|
443c439fdc | ||
|
9068b8113d | ||
|
6465f83599 | ||
|
4796995f9b | ||
|
4bf562c6eb | ||
|
3e1a76dded | ||
|
3392f4dd2f | ||
|
f3f1050224 | ||
|
8f51dd8d33 | ||
|
2f4eed52c2 | ||
|
5bd5e4c9f5 | ||
|
b884a6b2dd |
15
.copr/Makefile
Normal file
15
.copr/Makefile
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
rpmbuild_src = $(shell rpmbuild --eval '%{_sourcedir}')
|
||||||
|
.PHONY: prepare srpm rpm
|
||||||
|
|
||||||
|
prepare:
|
||||||
|
dnf -y install rpmdevtools rpm-build
|
||||||
|
cp *.patch $(rpmbuild_src)
|
||||||
|
cp lxc-net $(rpmbuild_src)
|
||||||
|
spectool -g -R $(spec)
|
||||||
|
|
||||||
|
|
||||||
|
srpm: prepare
|
||||||
|
rpmbuild -bs --define "_srcrpmdir $(outdir)" $(spec)
|
||||||
|
|
||||||
|
rpm: prepare
|
||||||
|
rpmbuild -bb --define "_rpmdir $(outdir)" $(spec)
|
@ -1,6 +1,5 @@
|
|||||||
diff -up lxc-4.0.1/config/init/systemd/lxc-net.service.in.orig lxc-4.0.1/config/init/systemd/lxc-net.service.in
|
--- ./config/init/systemd/lxc-net.service.in.orig 2023-07-25 23:00:11.000000000 +0100
|
||||||
--- lxc-4.0.1/config/init/systemd/lxc-net.service.in.orig 2020-04-06 21:15:17.000000000 +0200
|
+++ ./config/init/systemd/lxc-net.service.in 2024-01-26 16:13:15.237248935 +0000
|
||||||
+++ lxc-4.0.1/config/init/systemd/lxc-net.service.in 2020-04-10 18:31:54.277490764 +0200
|
|
||||||
@@ -1,6 +1,7 @@
|
@@ -1,6 +1,7 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=LXC network bridge setup
|
Description=LXC network bridge setup
|
||||||
@ -8,4 +7,4 @@ diff -up lxc-4.0.1/config/init/systemd/lxc-net.service.in.orig lxc-4.0.1/config/
|
|||||||
+Wants=network-online.target
|
+Wants=network-online.target
|
||||||
Before=lxc.service
|
Before=lxc.service
|
||||||
Documentation=man:lxc
|
Documentation=man:lxc
|
||||||
|
ConditionVirtualization=!lxc
|
||||||
|
173
lxc.spec
173
lxc.spec
@ -1,50 +1,66 @@
|
|||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%global with_seccomp 1
|
%bcond_without seccomp
|
||||||
%global with_static_init 1
|
%bcond_without static_init
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
%ifarch %{ix86} x86_64 %{arm} aarch64
|
%ifarch %{ix86} x86_64 %{arm} aarch64
|
||||||
%global with_seccomp 1
|
%bcond_without seccomp
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
Name: lxc
|
Name: lxc
|
||||||
Version: 4.0.10
|
Version: 6.0.3
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Linux Resource Containers
|
Summary: Linux Resource Containers
|
||||||
License: LGPLv2+ and GPLv2
|
# Automatically converted from old format: LGPLv2+ and GPLv2 - review is highly recommended.
|
||||||
|
License: LicenseRef-Callaway-LGPLv2+ AND GPL-2.0-only
|
||||||
URL: https://linuxcontainers.org/lxc
|
URL: https://linuxcontainers.org/lxc
|
||||||
Source0: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz
|
Source0: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz
|
||||||
Source1: lxc-net
|
Source1: lxc-net
|
||||||
Patch0: lxc-2.0.7-fix-init.patch
|
Patch0: lxc-2.0.7-fix-init.patch
|
||||||
Patch1: lxc-4.0.1-fix-lxc-net.patch
|
Patch1: lxc-4.0.1-fix-lxc-net.patch
|
||||||
BuildRequires: make
|
|
||||||
|
BuildRequires: cmake
|
||||||
BuildRequires: docbook2X
|
BuildRequires: docbook2X
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: glibc-headers
|
||||||
BuildRequires: kernel-headers
|
BuildRequires: kernel-headers
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libcap
|
||||||
%if 0%{?with_seccomp}
|
|
||||||
BuildRequires: pkgconfig(libseccomp)
|
|
||||||
%endif # with_seccomp
|
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: pam-devel
|
%if %{?with_seccomp}
|
||||||
|
BuildRequires: pkgconfig(libseccomp)
|
||||||
|
%endif
|
||||||
|
BuildRequires: libselinux-devel
|
||||||
|
BuildRequires: meson >= 0.61
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: pam
|
||||||
BuildRequires: systemd
|
BuildRequires: pam-devel
|
||||||
BuildRequires: pkgconfig(bash-completion)
|
BuildRequires: pkg-config
|
||||||
%if 0%{?with_static_init}
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: pkgconfig(dbus-1)
|
||||||
|
%if %{?with_static_init}
|
||||||
BuildRequires: libcap-static
|
BuildRequires: libcap-static
|
||||||
BuildRequires: glibc-static
|
BuildRequires: glibc-static
|
||||||
%endif # with_static_init
|
%endif
|
||||||
# we are patching configure.ac
|
|
||||||
BuildRequires: autoconf automake libtool
|
|
||||||
# lxc-extra subpackage not needed anymore, lxc-ls has been rewriten in
|
# lxc-extra subpackage not needed anymore, lxc-ls has been rewriten in
|
||||||
# C and does not depend on the Python3 binding anymore
|
# C and does not depend on the Python3 binding anymore
|
||||||
Provides: lxc-extra = %{version}-%{release}
|
Provides: lxc-extra = %{version}-%{release}
|
||||||
Obsoletes: lxc-extra < 1.1.5-3
|
Obsoletes: lxc-extra < 1.1.5-3
|
||||||
|
|
||||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2274215
|
||||||
|
Requires: lxc-libs%{?_isa} = %{version}-%{release}
|
||||||
|
Requires: lxcfs
|
||||||
|
Requires: openssl
|
||||||
|
Requires: rsync
|
||||||
|
# Requires: dnsmasq
|
||||||
|
# Requires: bridge-utils
|
||||||
|
# Needed to create openSUSE containers using template.
|
||||||
|
# Recommends: build
|
||||||
|
# Recommends: criu >= 2.0
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Linux Resource Containers provide process and resource isolation without the
|
Linux Resource Containers provide process and resource isolation without the
|
||||||
@ -114,70 +130,70 @@ This package contains documentation for %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{name}-%{version}
|
%autosetup -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -vif
|
%meson \
|
||||||
%configure --with-distro=fedora \
|
-D examples=true \
|
||||||
--enable-doc \
|
-D man=true \
|
||||||
--enable-api-docs \
|
-D tools=true \
|
||||||
--disable-silent-rules \
|
-D commands=true \
|
||||||
--docdir=%{_pkgdocdir} \
|
-D capabilities=true \
|
||||||
--disable-rpath \
|
-D openssl=true \
|
||||||
--disable-static \
|
-D selinux=true \
|
||||||
--disable-apparmor \
|
|
||||||
--enable-selinux \
|
|
||||||
--enable-capabilities \
|
|
||||||
--enable-pam \
|
|
||||||
--enable-openssl \
|
|
||||||
%if 0%{?with_seccomp}
|
%if 0%{?with_seccomp}
|
||||||
--enable-seccomp \
|
-D seccomp=true \
|
||||||
%endif # with_seccomp
|
%endif
|
||||||
--with-init-script=systemd \
|
-D memfd-rexec=true \
|
||||||
--disable-werror \
|
-D thread-safety=true \
|
||||||
# intentionally blank line
|
-D dbus=true \
|
||||||
|
-D tests=false \
|
||||||
|
-D init-script=systemd \
|
||||||
|
-D systemd-unitdir=%{_unitdir} \
|
||||||
|
-D distrosysconfdir=sysconfig \
|
||||||
|
-D pam-cgroup=true \
|
||||||
|
-D runtime-path=%{_rundir} \
|
||||||
|
%{nil}
|
||||||
|
%meson_build
|
||||||
|
|
||||||
%{make_build}
|
cd doc/api/ && doxygen
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{make_install}
|
%meson_install
|
||||||
mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
|
mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
|
||||||
|
|
||||||
# docs
|
# docs
|
||||||
mkdir -p %{buildroot}%{_pkgdocdir}/api
|
mkdir -p %{buildroot}%{_pkgdocdir}/api
|
||||||
cp -a AUTHORS README %{buildroot}%{_pkgdocdir}
|
cp -a AUTHORS README.md %{buildroot}%{_pkgdocdir}
|
||||||
cp -a doc/api/html/* %{buildroot}%{_pkgdocdir}/api/
|
cp -a doc/api/html/* %{buildroot}%{_pkgdocdir}/api/
|
||||||
|
|
||||||
# cache dir
|
# cache dir
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
|
mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
|
||||||
|
|
||||||
# remove libtool .la file
|
# remove libtool .a file
|
||||||
rm -rf %{buildroot}%{_libdir}/liblxc.la
|
rm -r %{buildroot}%{_libdir}/liblxc.a
|
||||||
|
|
||||||
# lxc-net config file
|
# lxc-net config file
|
||||||
cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-net
|
cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-net
|
||||||
|
|
||||||
%check
|
|
||||||
make check
|
|
||||||
|
|
||||||
|
|
||||||
%post libs
|
%post libs
|
||||||
%{?ldconfig}
|
|
||||||
%systemd_post %{name}-net.service
|
%systemd_post %{name}-net.service
|
||||||
%systemd_post %{name}.service
|
%systemd_post %{name}.service
|
||||||
|
%systemd_post lxc-monitord.service
|
||||||
|
|
||||||
%preun libs
|
%preun libs
|
||||||
%systemd_preun %{name}-net.service
|
%systemd_preun %{name}-net.service
|
||||||
%systemd_preun %{name}.service
|
%systemd_preun %{name}.service
|
||||||
|
%systemd_preun lxc-monitord.service
|
||||||
|
|
||||||
|
|
||||||
%postun libs
|
%postun libs
|
||||||
%{?ldconfig}
|
|
||||||
%systemd_postun %{name}-net.service
|
%systemd_postun %{name}-net.service
|
||||||
%systemd_postun %{name}.service
|
%systemd_postun %{name}.service
|
||||||
|
%systemd_postun lxc-monitord.service
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -193,7 +209,8 @@ make check
|
|||||||
%{_datadir}/%{name}/%{name}.functions
|
%{_datadir}/%{name}/%{name}.functions
|
||||||
%dir %{_datadir}/bash-completion
|
%dir %{_datadir}/bash-completion
|
||||||
%dir %{_datadir}/bash-completion/completions
|
%dir %{_datadir}/bash-completion/completions
|
||||||
%{_datadir}/bash-completion/completions/%{name}
|
%{_datadir}/bash-completion/completions/_%{name}
|
||||||
|
%{_datadir}/bash-completion/completions/%{name}-*
|
||||||
|
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
@ -208,9 +225,9 @@ make check
|
|||||||
%{_libexecdir}/%{name}
|
%{_libexecdir}/%{name}
|
||||||
# fixme: should be in libexecdir?
|
# fixme: should be in libexecdir?
|
||||||
%{_sbindir}/init.%{name}
|
%{_sbindir}/init.%{name}
|
||||||
%if 0%{?with_static_init}
|
%if %{?with_static_init}
|
||||||
%{_sbindir}/init.%{name}.static
|
%{_sbindir}/init.%{name}.static
|
||||||
%endif # with_static_init
|
%endif
|
||||||
%{_bindir}/%{name}-autostart
|
%{_bindir}/%{name}-autostart
|
||||||
%{_sharedstatedir}/%{name}
|
%{_sharedstatedir}/%{name}
|
||||||
%dir %{_sysconfdir}/%{name}
|
%dir %{_sysconfdir}/%{name}
|
||||||
@ -229,13 +246,15 @@ make check
|
|||||||
%{_mandir}/*/man8/pam_cgfs*
|
%{_mandir}/*/man8/pam_cgfs*
|
||||||
%dir %{_pkgdocdir}
|
%dir %{_pkgdocdir}
|
||||||
%{_pkgdocdir}/AUTHORS
|
%{_pkgdocdir}/AUTHORS
|
||||||
%{_pkgdocdir}/README
|
%{_pkgdocdir}/README.md
|
||||||
|
%{_pkgdocdir}/examples
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_unitdir}/%{name}.service
|
%{_unitdir}/%{name}.service
|
||||||
%{_unitdir}/%{name}@.service
|
%{_unitdir}/%{name}@.service
|
||||||
%{_unitdir}/%{name}-net.service
|
%{_unitdir}/%{name}-net.service
|
||||||
|
%{_unitdir}/%{name}-monitord.service
|
||||||
%dir %{_localstatedir}/cache/%{name}
|
%dir %{_localstatedir}/cache/%{name}
|
||||||
/%{_lib}/security/pam_cgfs.so
|
%{_libdir}/security/pam_cgfs.so
|
||||||
|
|
||||||
|
|
||||||
%files templates
|
%files templates
|
||||||
@ -258,6 +277,52 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 15 2025 Sérgio Basto <sergio@serjux.com> - 6.0.3-1
|
||||||
|
- Update lxc to 6.0.3 (#2333359)
|
||||||
|
|
||||||
|
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Sep 21 2024 Sérgio Basto <sergio@serjux.com> - 6.0.2-1
|
||||||
|
- Update lxc to 6.0.2 (#2313692)
|
||||||
|
|
||||||
|
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 6.0.1-2
|
||||||
|
- convert license to SPDX
|
||||||
|
|
||||||
|
* Fri Jul 19 2024 Sérgio Basto <sergio@serjux.com> - 6.0.1-1
|
||||||
|
- Update lxc to 6.0.1 (#2097935)
|
||||||
|
|
||||||
|
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 09 2024 Sérgio Basto <sergio@serjux.com> - 5.0.3-2
|
||||||
|
- (#2274215) force lxc requires lxc-libs
|
||||||
|
- Add more Requires
|
||||||
|
|
||||||
|
* Fri Jan 26 2024 Sérgio Basto <sergio@serjux.com> - 5.0.3-1
|
||||||
|
- Update lxc to 5.0.3 (inspired in https://build.opensuse.org/package/show/Virtualization:containers/lxc)
|
||||||
|
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.12-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.12-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.12-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.12-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.12-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 26 2022 Thomas Moschny <thomas.moschny@gmx.de> - 4.0.12-1
|
||||||
|
- Update to 4.0.12.
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.10-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
* Sat Sep 18 2021 Thomas Moschny <thomas.moschny@gmx.de> - 4.0.10-1
|
* Sat Sep 18 2021 Thomas Moschny <thomas.moschny@gmx.de> - 4.0.10-1
|
||||||
- Update to 4.0.10.
|
- Update to 4.0.10.
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (lxc-4.0.10.tar.gz) = ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
|
SHA512 (lxc-6.0.3.tar.gz) = 4ed41155b74afa135ae8e01f55a8cbbc7284a80e9789aaa2e69264d6b90a6527baf51f9c68dd3364aa83e7939d070f5c7dad924c751927783e883adce539fbdf
|
||||||
|
Loading…
x
Reference in New Issue
Block a user