Compare commits

..

17 Commits

Author SHA1 Message Date
a1dbe3556f
add copr build config 2025-06-02 11:19:32 -04:00
Sérgio M. Basto
4d6305737f Update lxc to 6.0.3 (#2333359) 2025-02-15 05:29:45 +00:00
Fedora Release Engineering
4b2a3ad5b5 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 16:29:03 +00:00
Sérgio M. Basto
d1d198a4d5 Update lxc to 6.0.2 (#2313692) 2024-09-21 02:18:16 +01:00
Miroslav Suchý
068cf2856e convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-02 10:30:42 +02:00
Sérgio M. Basto
443c439fdc Update lxc to 6.0.1 (#2097935) 2024-07-19 16:23:30 +01:00
Fedora Release Engineering
9068b8113d Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 16:23:33 +00:00
Sérgio M. Basto
6465f83599 (#2274215) force lxc requires lxc-libs
Add more Requires
2024-04-10 01:06:45 +01:00
Sérgio M. Basto
4796995f9b (#2274215) force lxc requires lxc-libs 2024-04-10 00:20:00 +01:00
Sérgio M. Basto
4bf562c6eb Update lxc to 5.0.3 2024-01-26 16:52:22 +00:00
Fedora Release Engineering
3e1a76dded Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 05:22:35 +00:00
Fedora Release Engineering
3392f4dd2f Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 06:35:15 +00:00
Fedora Release Engineering
f3f1050224 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 13:25:22 +00:00
Fedora Release Engineering
8f51dd8d33 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 18:38:36 +00:00
Fedora Release Engineering
2f4eed52c2 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 20:12:33 +00:00
Thomas Moschny
5bd5e4c9f5 Update to 4.0.12. 2022-05-26 10:25:51 +02:00
Fedora Release Engineering
b884a6b2dd - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 18:24:19 +00:00
4 changed files with 123 additions and 114 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
/lxc-*.tar.gz /lxc-*.tar.gz
/v1.*.tar.gz

View File

@ -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

226
lxc.spec
View File

@ -1,51 +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: 5%{?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
Source2: https://git.shrug.pw/neilhanlon/lxc-templates/archive/v1.0.4.tar.gz
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
@ -92,17 +107,6 @@ overhead of full virtualization.
The %{name}-templates package contains templates for creating containers. The %{name}-templates package contains templates for creating containers.
%package templates-extra
Summary: Extra Templates for %{name}
Requires: %{name}-templates%{?_isa} = %{version}-%{release}
%description templates-extra
Linux Resource Containers provide process and resource isolation without the
overhead of full virtualization.
The %{name}-templates-extra package contains extra templates for creating containers
previously available in the lxc-templates package, but are now considered
legacy.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
@ -126,85 +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
# build extra templates
tar -xf %{SOURCE2}
cd lxc-templates/
autoreconf -vif
%configure
%{make_build}
%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
# lxc-templates from github
cd lxc-templates
%{make_install}
ls -v
%check
make check
cd lxc-templates
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
@ -220,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
@ -235,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}
@ -256,37 +246,22 @@ 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
%{_datadir}/%{name}/templates/lxc-busybox
%{_datadir}/%{name}/templates/lxc-download
%{_datadir}/%{name}/templates/lxc-local
%{_datadir}/%{name}/templates/lxc-oci
%{_datadir}/%{name}/config/common*
%{_datadir}/%{name}/config/userns.conf
%{_datadir}/%{name}/config/nesting.conf
%{_datadir}/%{name}/config/oci.common.conf
%files templates-extra
%exclude %{_datadir}/%{name}/templates/lxc-busybox
%exclude %{_datadir}/%{name}/templates/lxc-download
%exclude %{_datadir}/%{name}/templates/lxc-local
%exclude %{_datadir}/%{name}/templates/lxc-oci
%exclude %{_datadir}/%{name}/config/common*
%exclude %{_datadir}/%{name}/config/userns.conf
%exclude %{_datadir}/%{name}/config/nesting.conf
%exclude %{_datadir}/%{name}/config/oci.common.conf
%{_datadir}/%{name}/templates/lxc-* %{_datadir}/%{name}/templates/lxc-*
%{_datadir}/%{name}/config/* %{_datadir}/%{name}/config/*
%files devel %files devel
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_includedir}/lxc %{_includedir}/lxc
@ -302,14 +277,51 @@ make check
%changelog %changelog
* Thu Aug 04 2022 Neil Hanlon <neil@shrug.pw> - 4.0.10-4 * Sat Feb 15 2025 Sérgio Basto <sergio@serjux.com> - 6.0.3-1
- fix rocky template patch - Update lxc to 6.0.3 (#2333359)
* Thu Aug 04 2022 Neil Hanlon <neil@shrug.pw> - 4.0.10-3 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.2-2
- add a rockylinux template - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu May 19 2022 Neil Hanlon <neil@shrug.pw> - 4.0.10-2 * Sat Sep 21 2024 Sérgio Basto <sergio@serjux.com> - 6.0.2-1
- build additional templates into a templates-extra package - 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.

View File

@ -1,2 +1 @@
SHA512 (lxc-4.0.10.tar.gz) = ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318 SHA512 (lxc-6.0.3.tar.gz) = 4ed41155b74afa135ae8e01f55a8cbbc7284a80e9789aaa2e69264d6b90a6527baf51f9c68dd3364aa83e7939d070f5c7dad924c751927783e883adce539fbdf
SHA512 (v1.0.4.tar.gz) = 2a7ad3f7e1ceb5fb8a094796590f3786953c2ff57d3f3d7285a3a918725df0b02ee2526de25cd4491d1a677279e3a8507da7886d6d01102f9f1908351abb19c4