openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 23:34:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

lxc: update to 6.0.1

Browse Source 
Changelog: https://discuss.linuxcontainers.org/t/lxc-6-0-lts-has-been-released/19567

Required libdbus as a depends for liblxc.  I verified that both
lxc-create and lxc-checkconfig work with the rebases to the
following patches but do please review:

  020-lxc-checkconfig.patch
  025-remove-unsupported-option.patch

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia
2024-06-28 16:23:48 -04:00
committed by Rosen Penev
parent 0729ad976b
commit 3e331ddcc0
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/lxc/Makefile
View File

@@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=lxc PKG_NAME:=lxc
PKG_VERSION:=5.0.3 PKG_VERSION:=6.0.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
PKG_HASH:=2693a4c654dcfdafb3aa95c262051d8122afa1b6f5cef1920221ebbdee934d07 PKG_HASH:=ccb38fbcdb86a82ee8192ccc85bba47edaf824439e9a7f12ab178d51ff1f77e0
PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com> PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
@@ -137,7 +137,7 @@ define Package/liblxc
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=LXC userspace library TITLE:=LXC userspace library
DEPENDS+= +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl DEPENDS+= +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl +libdbus
endef endef
define Package/lxc-init define Package/lxc-init

9
utils/lxc/patches/020-lxc-checkconfig.patch
View File

@@ -1,14 +1,13 @@
--- a/src/lxc/cmd/lxc-checkconfig.in --- a/src/lxc/cmd/lxc-checkconfig.in
+++ b/src/lxc/cmd/lxc-checkconfig.in +++ b/src/lxc/cmd/lxc-checkconfig.in
@@ -4,6 +4,17 @@ @@ -7,6 +7,16 @@ export LANGUAGE=en
# Allow environment variables to override config # Allow environment variables to override config
: ${CONFIG:=/proc/config.gz} : "${CONFIG:=/proc/config.gz}"
: ${MODNAME:=configs} : "${MODNAME:=configs}"
+: ${ZGREP:=zgrep} +: ${ZGREP:=zgrep}
+: ${GUNZIP:=gunzip} +: ${GUNZIP:=gunzip}
+ +
+if [ -z $(command -v $ZGREP) ] && ! [ -z $(command -v $GUNZIP) ] && [ -x $(command -v $GUNZIP) ] && [ -f $CONFIG ] && [ "$CONFIG" == "/proc/config.gz" ] ; then +if [ -z $(command -v $ZGREP) ] && ! [ -z $(command -v $GUNZIP) ] && [ -x $(command -v $GUNZIP) ] && [ -f $CONFIG ] && [ "$CONFIG" == "/proc/config.gz" ] ; then
+
+ CONFIG_NEW="/tmp/config-$(uname -r)" + CONFIG_NEW="/tmp/config-$(uname -r)"
+ $GUNZIP -c $CONFIG > $CONFIG_NEW + $GUNZIP -c $CONFIG > $CONFIG_NEW
+ CONFIG=$CONFIG_NEW + CONFIG=$CONFIG_NEW
@@ -16,5 +15,5 @@
+ GREP=grep + GREP=grep
+fi +fi
CAT="cat" GREP="grep"

19
utils/lxc/patches/025-remove-unsupported-option.patch
View File

@@ -1,13 +1,16 @@
--- a/templates/lxc-download.in --- a/templates/lxc-download.in
+++ b/templates/lxc-download.in +++ b/templates/lxc-download.in
@@ -384,20 +384,7 @@ fi @@ -380,26 +380,10 @@ if tar --version | grep -sq "bsdtar"; th
# Unpack the rootfs IS_BSD_TAR="true"
echo "Unpacking the rootfs" fi
-EXCLUDES="" -EXCLUDES=""
-excludelist=$(relevant_file excludes) -excludelist=$(relevant_file excludes)
-if [ -f "${excludelist}" ]; then -if [ -f "${excludelist}" ]; then
- while read -r line; do - while read -r line; do
- if [ ${IS_BSD_TAR} = "true" ]; then
- line="^${line}"
- fi
- EXCLUDES="${EXCLUDES} --exclude=${line}" - EXCLUDES="${EXCLUDES} --exclude=${line}"
- done < "${excludelist}" - done < "${excludelist}"
-fi -fi
@@ -17,8 +20,12 @@
-# is to use a function wrapper, but the latter can't be used here as the args -# is to use a function wrapper, but the latter can't be used here as the args
-# are dynamic. We thus need to ignore the warning brought by shellcheck. -# are dynamic. We thus need to ignore the warning brought by shellcheck.
-# shellcheck disable=SC2086 -# shellcheck disable=SC2086
-tar --anchored ${EXCLUDES} --numeric-owner -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}" if [ "${IS_BSD_TAR}" = "true" ]; then
+tar --numeric-owner -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}" - tar ${EXCLUDES} --numeric-owner -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
+ tar --numeric-owner -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
else
- tar --anchored ${EXCLUDES} --numeric-owner --xattrs-include='*' -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
+ tar --numeric-owner --xattrs-include='*' -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
fi
mkdir -p "${LXC_ROOTFS}/dev/pts/" mkdir -p "${LXC_ROOTFS}/dev/pts/"