libseccomp: Move the package into the core system

This is required by lldpd.

Fixes: #13905 - LLDP daemon fails to start due to missing config directory and dependency
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/libseccomp b/config/rootfiles/common/libseccomp
similarity index 100%
rename from config/rootfiles/packages/libseccomp
rename to config/rootfiles/common/libseccomp

diff --git a/config/rootfiles/core/199/filelists/libseccomp b/config/rootfiles/core/199/filelists/libseccomp
new file mode 120000 (symlink)
index 0000000..0db124b
--- /dev/null
+++ b/config/rootfiles/core/199/filelists/libseccomp
@@ -0,0 +1 @@
+../../../common/libseccomp
\ No newline at end of file

diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh
index db017945e86acca9dfbd3e82948f827b0b5d0761..561b7a8ef446a8f6d4159f1b28a2f532bfdf5070 100644 (file)
--- a/config/rootfiles/core/199/update.sh
+++ b/config/rootfiles/core/199/update.sh
@@ -87,7 +87,7 @@ rm -rvf \
 # Stop services
 
 # Remove dropped packages
-for package in dbus; do \
+for package in dbus libseccomp; do \
         if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
                 stop_service "${package}"
                 for i in $(</opt/pakfire/db/rootfiles/${package}); do

diff --git a/lfs/libseccomp b/lfs/libseccomp
index 4369183238faf85c1b972d227ab06b80c0de2738..4cd24ca6199b5dce835167a9169efcd8174c59da 100644 (file)
--- a/lfs/libseccomp
+++ b/lfs/libseccomp
@@ -24,8 +24,6 @@
 
 include Config
 
-SUMMARY    = A Seccomp (mode 2) helper library
-
 VER        = 2.6.0
 
 THISAPP    = libseccomp-$(VER)
@@ -33,12 +31,6 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libseccomp
-PAK_VER    = 11
-
-DEPS       =
-
-SERVICES   =
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/qemu b/lfs/qemu
index 8dfac27536cb681cda7f9ba9b04f8b05a3a4175f..d7a0ba9cad92a59a88289e1b981da90f579de136 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -35,9 +35,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 50
+PAK_VER    = 51
 
-DEPS       = alsa libusbredir spice libseccomp libslirp
+DEPS       = alsa libusbredir spice libslirp
 
 SERVICES   =
 

diff --git a/lfs/tor b/lfs/tor
index 09c965c03d8940d80647b89c812ed82b2838dc33..350f721ac1bb5933f40c6e977e2ea00ff93b8617 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -34,9 +34,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 91
+PAK_VER    = 92
 
-DEPS       = libseccomp
+DEPS       =
 
 SERVICES   = tor