From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/2] jansson: Move to core system and update to 2.12 Date: Sun, 26 May 2019 19:51:39 +0200 Message-ID: <20190526175140.3231-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8030400055066890916==" List-Id: --===============8030400055066890916== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- config/rootfiles/{packages =3D> common}/jansson | 2 +- lfs/jansson | 8 ++------ make.sh | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) rename config/rootfiles/{packages =3D> common}/jansson (85%) diff --git a/config/rootfiles/packages/jansson b/config/rootfiles/common/jans= son similarity index 85% rename from config/rootfiles/packages/jansson rename to config/rootfiles/common/jansson index 3901a0690..005bd2ce5 100644 --- 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 14c6a3ee3..2c95c62ef 100644 --- a/lfs/jansson +++ b/lfs/jansson @@ -24,17 +24,13 @@ =20 include Config =20 -VER =3D 2.10 +VER =3D 2.12 =20 THISAPP =3D jansson-$(VER) DL_FILE =3D $(THISAPP).tar.gz DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) -PROG =3D jansson -PAK_VER =3D 1 - -DEPS =3D "" =20 ############################################################################= ### # Top-level Rules @@ -44,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 16a2c4e84c0a80ca61bd6e619a0f9358 +$(DL_FILE)_MD5 =3D 0ed1f3a924604aae68067c214b0010ef =20 install : $(TARGET) =20 diff --git a/make.sh b/make.sh index e70da788e..2a5584f1a 100755 --- a/make.sh +++ b/make.sh @@ -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 --=20 2.20.1 --===============8030400055066890916==--