zstd: Make this part of the core distributions

Many packages link against it and we should make use of it
when we have it.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

diff --git a/lfs/rsync b/lfs/rsync
index 46da6075b1dd3aca8780658a2bed6a2f7adb04ca..092b0187be705a01928e03dd35a43859b0029d74 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
 PAK_VER    = 12
 
-DEPS       = zstd
+DEPS       =
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/zstd b/lfs/zstd
index 55ac837d365e701643e61c02d86e7cbb0ed345af..c6af0f12991ddb150ab9de37407142dd83fdc63a 100644 (file)
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -31,10 +31,6 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = zstd
-PAK_VER    = 1
-
-DEPS       =
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index 1d6e3c390be4cc3b41171644dccfcfb37e326c28..2a6198e05b9ef1ba79b1c8c893a075d27e67b799 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1383,6 +1383,7 @@ buildipfire() {
   lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
+  lfsmake2 zstd
   lfsmake2 openvpn
   lfsmake2 mpage
   lfsmake2 dbus
@@ -1433,7 +1434,6 @@ buildipfire() {
   lfsmake2 xvid
   lfsmake2 libmpeg2
   lfsmake2 gnump3d
-  lfsmake2 zstd
   lfsmake2 rsync
   lfsmake2 rpcbind
   lfsmake2 keyutils