mk/package.mk

@@ -248,7 +248,7 @@ ifeq (,$(filter nostaging,$(7)))
 	    fi; \
 	    find usr ! -type d 2>/dev/null | \
 	    grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' \
-		       -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' -e '^usr/lib/.*\.la$$$$' | \
+		       -e '^usr/info' -e '^usr/lib/libc.so$$$$' -e '^usr/bin/[a-z0-9-]+-config' -e '^usr/lib/.*\.la$$$$' | \
 	    tee '$${STAGING_PKG_DIR}/$(1)' | \
 	    $(CPIO) -padlmu --quiet '$${STAGING_TARGET_DIR}'
 endif

mk/pkg-bottom.mk

@@ -216,7 +216,7 @@ ifeq (,$(filter nostaging,${PKG_OPTS}))
 	@-cd ${WRKINST}; \
 	    find usr ! -type d 2>/dev/null | \
 	    grep -E -v -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' \
-			-e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \
+			-e '^usr/lib/libc.so$$' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \
 			-e '^/usr/lib/libpthread_nonshared.a' | \
 	    tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
 	    $(CPIO) -padlmu --quiet '${STAGING_TARGET_DIR}'

package/cjson/Makefile

@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		cjson
+PKG_VERSION:=		1.7.19
+PKG_RELEASE:=		1
+PKG_HASH:=		7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562
+PKG_DESCR:=		ultralightweight json parser in ansi c
+PKG_SECTION:=		libs/data
+PKG_BUILDDEP:=		cmake-host
+PKG_URL:=		https://github.com/davegamble/cjson
+PKG_SITES:=		https://github.com/DaveGamble/cJSON/archive/refs/tags/
+PKG_OPTS:=		dev
+
+DISTFILES:=		v$(PKG_VERSION).tar.gz
+WRKDIST=		$(WRKDIR)/cJSON-$(PKG_VERSION)
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CJSON,cjson,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:=		cmake
+CMAKE_FLAGS+=		-DENABLE_CUSTOM_COMPILER_FLAGS=OFF \
+			-DENABLE_CJSON_TEST=OFF
+
+cjson-install:
+	$(INSTALL_DIR) $(IDIR_CJSON)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcjson.so* \
+		$(IDIR_CJSON)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/mosquitto/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		mosquitto
-PKG_VERSION:=		2.0.18
+PKG_VERSION:=		2.1.2
 PKG_RELEASE:=		1
-PKG_HASH:=		d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a
+PKG_HASH:=		fd905380691ac65ea5a93779e8214941829e3d6e038d5edff9eac5fd74cbed02
 PKG_DESCR:=		mqtt broker
 PKG_SECTION:=		net/misc
-PKG_DEPENDS:=		c-ares libopenssl
-PKG_BUILDDEP:=		cmake-host c-ares openssl
+PKG_DEPENDS:=		c-ares libopenssl cjson
+PKG_BUILDDEP:=		cmake-host c-ares openssl cjson
 PKG_NEEDS:=		threads
 PKG_URL:=		http://mosquitto.org
 PKG_SITES:=		http://mosquitto.org/files/source/
@@ -22,7 +22,13 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,MOSQUITTO,mosquitto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 CONFIG_STYLE:=          cmake
-CMAKE_FLAGS+=		-DINC_MEMTRACK=OFF -DWITH_TLS_PSK=OFF
+MAKE_FLAGS+=		VERBOSE=1
+CMAKE_FLAGS+=		-DINC_MEMTRACK=OFF \
+			-DWITH_TLS_PSK=OFF \
+			-DWITH_DOCS=OFF \
+			-DWITH_TESTS=OFF \
+			-DWITH_APPS=OFF \
+			-DWITH_CTRL_SHELL=OFF
 
 mosquitto-install:
 	$(INSTALL_DIR) $(IDIR_MOSQUITTO)/usr/bin

package/sqlite/Makefile

@@ -4,21 +4,21 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		sqlite
-PKG_VERSION:=		3.37.1
+PKG_VERSION:=		3.53.3
 PKG_RELEASE:=		1
-PKG_HASH:=		40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e
+PKG_HASH:=		c917d7db16648ec95f714974ace5e5dcf46b7dc70e26600a0a102a3141125db0
 PKG_DESCR:=		embeddable sql database cli
 PKG_SECTION:=		sys/misc
 PKG_BUILDDEP:=		ncurses readline
 PKG_DEPENDS:=		libsqlite libreadline libncurses
 PKG_URL:=		http://www.sqlite.org/
-PKG_SITES:=		http://www.sqlite.org/2021/
+PKG_SITES:=		http://www.sqlite.org/2026/
+PKG_NEEDS:=		c++
 PKG_LIBNAME:=		libsqlite
 PKG_OPTS:=		dev
-PKG_NOPARALLEL:=	1
 
-DISTFILES:=		sqlite-autoconf-3370100.tar.gz
-WRKDIST=		${WRKDIR}/sqlite-autoconf-3370100
+DISTFILES:=		sqlite-autoconf-3530300.tar.gz
+WRKDIST=		${WRKDIR}/sqlite-autoconf-3530300
 
 PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE
 PKGSD_LIBSQLITE:=	emeddable sql library
@@ -33,6 +33,11 @@ $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},$
 
 TARGET_CFLAGS:=		$(filter-out -ffast-math,$(TARGET_CFLAGS))
 
+CONFIG_STYLE:=		minimal
+CONFIGURE_ARGS+=	--prefix=/usr \
+			--host="$(GNU_TARGET_NAME)" \
+			--build="$(GNU_HOST_NAME)"
+
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
 CONFIGURE_ARGS+=	--enable-dynamic-extensions=no
 endif