[1/2] jansson: Move to core system and update to 2.12
Commit Message
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
config/rootfiles/{packages => common}/jansson | 2 +-
lfs/jansson | 8 ++------
make.sh | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
rename config/rootfiles/{packages => common}/jansson (85%)
similarity index 85%
rename from config/rootfiles/packages/jansson
rename to 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
@@ -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)
@@ -1318,6 +1318,7 @@ buildipfire() {
lfsmake2 setserial
lfsmake2 setup
lfsmake2 libdnet
+ lfsmake2 jansson
lfsmake2 yaml
lfsmake2 libhtp
lfsmake2 suricata
@@ -1479,7 +1480,6 @@ buildipfire() {
lfsmake2 watchdog
lfsmake2 libpri
lfsmake2 libsrtp
- lfsmake2 jansson
lfsmake2 asterisk
lfsmake2 usb_modeswitch
lfsmake2 usb_modeswitch_data