From: John Audia <therealgraysky@proton.me>
Date: Sun, 9 Mar 2025 18:34:35 +0000 (-0400)
Subject: lxc: lxc-checkconfig fix typo
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=f32083fa27dddca5257af3549e070aab1c9c276e;p=feed%2Fpackages.git

lxc: lxc-checkconfig fix typo

Fix a typo introduced in https://github.com/openwrt/packages/pull/25719/commits/fd686a32209f74cd12ca434bc3245ef0f7589c46
which partially broke lxc-checkconfig

Build system: x86/64
Build-tested: bcm27xx/bcm2712
Run-tested: bcm27xx/bcm2712

Signed-off-by: John Audia <therealgraysky@proton.me>
---

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index e1fc688d4a..b661c76bda 100644
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxc
 PKG_VERSION:=6.0.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
diff --git a/utils/lxc/patches/020-lxc-checkconfig.patch b/utils/lxc/patches/020-lxc-checkconfig.patch
index 328ee9f3f0..b463faa9d5 100644
--- a/utils/lxc/patches/020-lxc-checkconfig.patch
+++ b/utils/lxc/patches/020-lxc-checkconfig.patch
@@ -1,6 +1,6 @@
 --- a/src/lxc/cmd/lxc-checkconfig.in
 +++ b/src/lxc/cmd/lxc-checkconfig.in
-@@ -7,6 +7,16 @@ export LANGUAGE=en
+@@ -7,6 +7,15 @@ export LANGUAGE=en
  # Allow environment variables to override config
  : "${CONFIG:=/proc/config.gz}"
  : "${MODNAME:=configs}"
@@ -11,9 +11,16 @@
 +  CONFIG_NEW="/tmp/config-$(uname -r)"
 +  $GUNZIP -c $CONFIG > $CONFIG_NEW
 +  CONFIG=$CONFIG_NEW
-+
 +  GREP=grep
 +fi
  
  GREP="grep"
  
+@@ -255,7 +264,6 @@ echo
+ printf "CONFIG_NETFILTER_XT_MATCH_COMMENT: " && is_enabled CONFIG_NETFILTER_XT_MATCH_COMMENT && is_probed xt_comment
+ echo
+ 
+-echo "
+ printf "CONFIG_FHANDLE: " && is_enabled CONFIG_FHANDLE
+ echo
+ printf "CONFIG_EVENTFD: " && is_enabled CONFIG_EVENTFD