From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Aug 2020 10:13:01 +0000 (+0000)
Subject: zstd: Make this part of the core distributions
X-Git-Tag: v2.25-core149~6^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c67ff7d72c2232b6994e1ff97277d4040711f97d;p=ipfire-2.x.git

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 46da6075b1..092b0187be 100644
--- 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 55ac837d36..c6af0f1299 100644
--- 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 1d6e3c390b..2a6198e05b 100755
--- 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