Commit Graph

64 Commits

Author SHA1 Message Date
John Audia 7984d2d74a lxc-auto: step by 1 sec up to $max_timeout
If the user defines a $max_timeout of 30, the service will wait 30 seconds
before it considers lxc-stop complete even though lxc-stop might actually
finish much sooner.  This introduces an unneeded delay.

This commit changes the behavior to check once per second to see when lxc-stop
actually stops doing so up to $max_timeout.  It also slightly simplifies the
code with logic to append the -t $max_timeout to the script.

Signed-off-by: John Audia <graysky@archlinux.us>
2021-09-25 12:37:06 -07:00
John Audia 049cf1e1b0 lxc: remove legacy cgroups from common.conf
I am unaware of any kernel currently provided that retains cgroup v1 support.
This patch removes these lines in /usr/share/lxc/config/common.conf to allow
for error free usage.

Providing common.conf as-is will result in failure to start. One solution is to
comment out the legacy lines.[1] This requires users to either provide a custom
version of this file on their builds or to manually edit it with each update.

Since many do not build their own, the first option is not available to them.
Manually editing the file with each update will cause a failure to start
containers set to auto-start upon rebooting into the update.

1. https://forum.openwrt.org/t/openwrt-arm64-quick-lxc-howto-guide-lms-in-debian-system-in-lxc-container/99835

Signed-off-by: John Audia <graysky@archlinux.us>
2021-09-18 15:04:46 -07:00
Rosen Penev 3df43e2f66 lxc: update to 4.0.10
Remove getline patch. It seems to be for uClibc, which is no longer in
the tree.

Remove commands patch. Issue was fixed upstream. Same with the tests
patch.

Remove gpg patch. It's an upstream backport.

Refreshed others.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-08-28 16:47:22 -07:00
Josef Schlehofer 70e06afd07
lxc: add patch to switch GPG server
By default, there was used sks-keyservers.net pool, which has invalid
SSL certificate and they also announced that their service is deprecate
and no longer maintained.

Use the same GPG server as LXC is using by default in the newer
releases.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2021-07-10 18:16:52 +02:00
Eneas U de Queiroz 470176905d
lxc: fix build without seccomp if libseccomp built
This fixes compiling lxc without seccomp support if libseccomp is
already installed to the staging dir.  Patches were applied upstream.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2021-02-25 22:51:08 -03:00
Rosen Penev cbe4b726da
lxc: update to 4.0.5
Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-11-19 16:16:43 -08:00
Paul Spooren 30ea917518 treewide: replace `which` with `command -v`
Fix shellcheck SC2230
> which is non-standard. Use builtin 'command -v' instead.

Once applied to everything concerning OpenWrt we can disable the busybox
feature `which` and save 3.8kB.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-08-09 13:58:14 -10:00
Martin Hammer 610f90b644 lxc: bump version
Signed-off-by: Martin Hammer <34623636+hammer-is@users.noreply.github.com>
Signed-off-by: martin <martin@DESKTOP-C822DHJ.lan>
2020-05-25 23:44:58 +02:00
Martin Hammer dcfaef0da5 lxc: start() during boot()
Signed-off-by: Martin Hammer <34623636+hammer-is@users.noreply.github.com>
Signed-off-by: martin <martin@DESKTOP-C822DHJ.lan>
2020-05-25 22:23:59 +02:00
Eneas U de Queiroz a1baf2eae0
lxc: use -minterlink-mips16 only with USE_MIPS16
The flag is either not supported or not needed unless there's mixed
mips/mips16 code.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2020-05-23 17:37:14 -03:00
Eneas U de Queiroz a826bc17eb
lxc: group everything under lxc menu
This makes every lxc-* package depend on lxc so that they are grouped
under the lxc menu.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2020-05-22 14:02:25 -07:00
Rosen Penev 29dd78c6fc
lxc: don't build for ARC
Similar to libseccomp, ARC is completely unsupported.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-05-22 14:02:25 -07:00
Rosen Penev 4b9c819b02
lxc: cleanup Makefile and outdated configure options
Added PKG_NO_MIPS16 as MIPS16 is no longer supported.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-05-22 14:02:25 -07:00
Rosen Penev 50f17d3cf5
lxc: remove lua
Lua support seems to be gone from LXC 4.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-05-22 14:02:24 -07:00
Robert Marko 9f43594e3a lxc: bump to 4.0.2
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Signed-off-by: Marijan Svalina <marijan.svalina@sartura.hr>
Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2020-05-19 00:19:15 +02:00
Rosen Penev 04e94b44b5
lxc: Fix pkgconfig file
It's pointing to the host.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-11-27 23:28:24 -08:00
Yousong Zhou b6a3145df5 cgroups-mount,docker-ce,lxc: rework kernel feature dependency
Fix that KERNEL_CGROUPS is enabled (selected) automatically along with
cgroups-mount

Replace "if PACKAGE_docker-ce" with a menu to avoid circular denpendency
issue involving PACKAGE_docker-ce, PACKAGE_cgroups-mount and
KERNEL_CGRUOPS

docker-ce, lxc: replace KERNEL_LXC_MISC with more specific options

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2019-09-12 10:31:16 +08:00
Sven Eckelmann bbb1ea7345 treewide: Change .*GPL.*+ licenses to SPDX compatible identifier
The CONTRIBUTING.md requests an (or multiple) SPDX identifier for GPL
licenses. But a lot of packages did use a different, non-SPDX style with a
"+" at the end instead of "-or-later".

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-09-10 07:45:15 +02:00
Rosen Penev 118926c852
Merge pull request #8999 from neheb/lx
lxc: Backport uClibc patch
2019-05-17 13:22:20 -07:00
Rosen Penev 189a170038 lxc: Backport uClibc patch
Fixes compilation

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-05-15 17:31:07 -07:00
Eneas U de Queiroz 57b4d94d98
lxc: hide seccomp support for arc
libseccomp does not compile for arc, so we can't show that option for
arc.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-15 09:48:42 -03:00
Daniel F. Dickinson cc039d801e lxc: Disable use of unwanted libraries explicity
Otherwise one gets a failure if the libraries (e.g. Python
header file) exist in the build system.  Worse in some cases
is host headers being found if one doesn't specifically
disable a library search in autotools.  It is especially
important that Python is disabled by default.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-27 15:11:11 -05:00
Rafał Miłecki 6e1104cc6d lxc: bump PKG_RELEASE after backporting nl patch
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2018-07-29 21:18:06 +02:00
Rafał Miłecki 13d57a5e9f lxc: nl: avoid NULL pointer dereference
This backports upstream fix from the master branch.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2018-07-29 21:17:08 +02:00
Rafał Miłecki c40a0ca3a3 lxc: add lxc-unprivileged helper package for unprivileged containers
LXC requires newuidmap and newguidmap with SUID to run unprivileged
containers. This package should help users make sure they are available.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2017-12-12 13:02:15 +01:00
Karl Vogel 8b92595621 utils/lxc: disable gnutls during configure
Previous versions of LXC never compiled in gnutls support due to a bug in the
configure script. As other TLS implementations are not supported and the feature
was disabled in previous builds, disable it during configure.

See https://github.com/lxc/lxc/pull/1360 for details regarding the bug in the
autoconf of the previous versions.

Signed-off-by: Karl Vogel <karl.vogel@gmail.com>
2017-10-26 11:29:43 +02:00
Marko Ratkaj 792c5713ad lxc: bump to 2.1.1
This is the first bugfix release for LXC 2.1. Full list of changes can
be found here:

https://linuxcontainers.org/lxc/news/

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
2017-10-23 15:31:21 +02:00
Marko Ratkaj 9672b88d2a lxc: bump to 2.1.0
Bump LXC package from 1.1.5 to 2.1.0. Version 2.x includes many
improvements and optimizations.

https://linuxcontainers.org/lxc/news/

Some tools like lxc-top are rewritten in C and are no longer broken and
dependent on lua.

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
2017-10-19 17:09:25 +02:00
Etienne Champetier 4006865ae8 treewide: run "make check FIXUP=1"
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git

(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-08-29 21:41:14 -07:00
Michal Hrusecky 0708c4171e
lxc: Use more FSH compliant /srv/lxc instead of new root dir
Normally LXC uses /var/lib, but due to hack OpenWRT employs this is not an
option. But instead of introducing new top-level directory, FSH compatible /srv
can be used.

Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
2016-05-30 09:04:26 +02:00
Daniel Dickinson b7b0f59e1c utils/lxc: Add working autostart for OpenWrt
Standard LXC autostart is currently not working in OpenWrt,
therefore add our own autostart mechanism for now.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
2016-03-12 19:01:59 -05:00
Daniel Dickinson 403079aff8 utils/lxc: lxc-create templates depend on flock
Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
2016-03-12 19:00:18 -05:00
Mak Krnic fdacf2cd20 lxc: update to version 1.1.5 2016-02-10 11:39:59 +01:00
Marko Ratkaj 00e774f374 lxc: bump version to 1.1.3
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
2015-09-27 23:44:26 +02:00
Daniel Golle c8a6990932 lxc: fix build on mpc85xx
Initialize ret to 0 so compiler no longer complains about
monitor.c: In function 'lxc_monitor_open':
monitor.c:212:5: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-06-09 12:03:20 +02:00
Daniel Golle 180d34f70b lxc: allow building with seccomp
seccomp was unconditionally disabled before.
Also a non-escaped newline in a place where it should be escaped
made the build process skip some CONFIGURE_ARGS.
Fix CONFIGURE_ARGS and add an option to allow building with seccomp.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-06-04 14:43:21 +02:00
Alex Samorukov 19d236187e Add lxc-device applet to the utils/lxc.
lxc-device manages devices in running container.

Signed-off-by: Alex Samorukov <samm@os2.kiev.ua>
2015-05-27 23:35:11 +02:00
Alex Samorukov 552f24a63f Add lxc-device applet
Signed-off-by: Alex Samorukov <samm@os2.kiev.ua>
2015-05-13 18:10:59 +00:00
Alex Samorukov 274b985123 LXC: Update to 1.1.2 and remove patch merged by upstream
Signed-off-by: Alex Samorukov <samm@os2.kiev.ua>
2015-04-21 21:50:11 +02:00
Mario Halambek 268dd7c603 lxc: bump to 1.1.1
Signed-off-by: Mario Halambek <mario.halambek@sartura.hr>
2015-03-25 18:50:44 +01:00
Steven Barth efc8978b91 Merge pull request #878 from jow-/lxc-autoconf-fix
lxc: use generic autoreconf fixup
2015-03-02 07:58:37 +01:00
Marko Ratkaj 64a3a4840e lxc: update to 1.1.0
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
Signed-off-by: Luka Perkov <luka@openwrt.org>
2015-02-08 02:35:09 +01:00
Jo-Philipp Wich 8baab92562 lxc: use generic autoreconf fixup
Use the generic autoreconf facility to pickup proper variants of
autoconf, automake and libtool.

Remove the unneeded Build/Configure override.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-02-08 00:12:26 +01:00
Luka Perkov dfd4daf633 lxc: correctly install configuration files
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-11-17 21:48:36 +01:00
Luka Perkov e044d612a0 lxc: minor dependencies tweak
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-11-13 14:59:44 +01:00
Luka Perkov b76bb76071 lxc: update dependencies
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-11-11 11:49:38 +01:00
Luka Perkov 77949c83bb lxc: add spdx license info
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-11-11 11:15:23 +01:00
Luka Perkov f0cf42ca7e lxc: move patch
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-10-30 06:25:38 -04:00
Luka Perkov 2e0a7026d9 lxc: organize patches
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-10-29 03:43:09 -04:00
Luka Perkov 2c52da0cf2 lxc: fix lxc-destroy
Signed-off-by: Luka Perkov <luka@openwrt.org>
2014-10-29 03:41:12 -04:00