Merge branch 'master' into next

2026-04-09 10:35:53 +02:00 · 2024-10-07 10:23:22 +00:00
parent 71cea32cd8 01782a41f8
commit e28cb28628
5 changed files with 8 additions and 8 deletions
--- a/config/rootfiles/packages/ncat
+++ b/config/rootfiles/packages/ncat
--- a/config/rootfiles/oldcore/189/filelists/ncat
+++ b/config/rootfiles/oldcore/189/filelists/ncat
@@ -0,0 +1 @@
+../../../common/ncat
--- a/config/rootfiles/oldcore/189/update.sh
+++ b/config/rootfiles/oldcore/189/update.sh
@@ -324,6 +324,11 @@ rm -vrf \
 	/lib/firmware/qcom/vpu-1.0/venus.mdt \
 	/lib/firmware/RTL8192E

+# Remove the metadata for ncat (if installed) as this is now part of the core system
+rm -f "/opt/pakfire/db/installed/meta-ncat"
+rm -f "/opt/pakfire/db/meta/meta-ncat"
+rm -f "/opt/pakfire/db/rootfiles/ncat"
+
 # Stop services
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,9 +35,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 35
+PAK_VER    = 36

-DEPS       = ebtables libpciaccess libyajl ncat qemu
+DEPS       = ebtables libpciaccess libyajl qemu

 SERVICES   = libvirtd virtlogd

--- a/lfs/ncat
+++ b/lfs/ncat
@@ -33,12 +33,6 @@ DL_FILE    = nmap-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nmap-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = ncat
-PAK_VER    = 12
-
-DEPS       =
-
-SERVICES   =

 ###############################################################################
 # Top-level Rules