jansson: Move to core system and update to 2.12

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/jansson b/config/rootfiles/common/jansson
similarity index 85%
rename from config/rootfiles/packages/jansson
rename to config/rootfiles/common/jansson
index 3901a0690a6939b32b3ff2b2f345c24de05910c5..005bd2ce5310f6904527afa69ab61d1c8264a435 100644 (file)
--- a/config/rootfiles/packages/jansson
+++ b/config/rootfiles/common/jansson
@@ -4,5 +4,5 @@
 #usr/lib/libjansson.la
 #usr/lib/libjansson.so
 usr/lib/libjansson.so.4
-usr/lib/libjansson.so.4.10.0
+usr/lib/libjansson.so.4.11.1
 #usr/lib/pkgconfig/jansson.pc

diff --git a/lfs/jansson b/lfs/jansson
index 14c6a3ee3c59c709e769235fd31ca603b4289351..2c95c62effce86cea13631c2a7663a2791f92ae8 100644 (file)
--- a/lfs/jansson
+++ b/lfs/jansson
@@ -24,17 +24,13 @@
 
 include Config
 
-VER        = 2.10
+VER        = 2.12
 
 THISAPP    = jansson-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = jansson
-PAK_VER    = 1
-
-DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 16a2c4e84c0a80ca61bd6e619a0f9358
+$(DL_FILE)_MD5 = 0ed1f3a924604aae68067c214b0010ef
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 0981b9a66eaa0c68d4024b6ce54f926377805074..f27539690a6aff31867f2ea771ef0a7465a875a1 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1337,6 +1337,7 @@ buildipfire() {
   lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
+  lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
   lfsmake2 suricata
@@ -1498,7 +1499,6 @@ buildipfire() {
   lfsmake2 watchdog
   lfsmake2 libpri
   lfsmake2 libsrtp
-  lfsmake2 jansson
   lfsmake2 asterisk
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data