diff options
103 files changed, 772 insertions, 963 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 21ba5223f..26526dff9 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -66,6 +66,7 @@ ifeq (${HOST_CONFIG_STYLE},meson) meson setup --prefix $(STAGING_HOST_DIR)/usr \ --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(HOST_MESON_FLAGS) \ + --wrap-mode=nodownload \ $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) endif ifeq (${HOST_CONFIG_STYLE},perl) @@ -87,7 +88,7 @@ host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${HOST_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) + PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq (${HOST_STYLE},manual) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 3527f2564..c750a9fb0 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -16,10 +16,10 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_13),y) -KERNEL_FILE_VER:= 6.13.6 +KERNEL_FILE_VER:= 6.13.9 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= de0053cb413d408f20fd1d5788219951b8a4403e5dac1b1d9032090938acd199 +KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) KERNEL_FILE_VER:= 6.12.18 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index abc1e1604..6f9e7ea5a 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -140,11 +140,11 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${BUILD_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) + PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq ($(filter manual,${BUILD_STYLE}),) env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) - cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + cd ${WRKBUILD} && env ${MAKE_ENV} LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ${MAKE} -f ${MAKE_FILE} \ ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE) else @echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2 diff --git a/package/at-spi2-atk/Makefile b/package/at-spi2-atk/Makefile index fd87d5d70..41ca90494 100644 --- a/package/at-spi2-atk/Makefile +++ b/package/at-spi2-atk/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= at-spi2-atk -PKG_VERSION:= 2.15.3 -PKG_EXTRAVER:= 2.15 -PKG_RELEASE:= 2 -PKG_HASH:= eaef8fcf2775e35e1e054840940808775dfa9b71bcd7bda1dd6ecbdf5b1a9e18 +PKG_VERSION:= 2.38.0 +PKG_EXTRAVER:= 2.38 +PKG_RELEASE:= 1 +PKG_HASH:= cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst +PKG_BUILDDEP:= meson-host glib libXtst PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-atk/$(PKG_EXTRAVER)/) PKG_OPTS:= dev @@ -20,6 +20,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AT_SPI2_ATK,at-spi2-atk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + at-spi2-atk-install: $(INSTALL_DIR) $(IDIR_AT_SPI2_ATK)/usr/lib $(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_ATK)/usr/lib diff --git a/package/at-spi2-core/Makefile b/package/at-spi2-core/Makefile index c6db623bf..29d2e40e9 100644 --- a/package/at-spi2-core/Makefile +++ b/package/at-spi2-core/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= at-spi2-core -PKG_VERSION:= 2.15.3 -PKG_EXTRAVER:= 2.15 +PKG_VERSION:= 2.56.0 +PKG_EXTRAVER:= 2.56 PKG_RELEASE:= 1 -PKG_HASH:= bae426d13d4a1ae3a35c6dd444e7fdef2159fbc9170eb39b6ae3213a27042d92 +PKG_HASH:= 80d7e8ea0be924e045525367f909d6668dfdd3e87cd40792c6cfd08e6b58e95c PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst libSM intltool-host +PKG_BUILDDEP:= meson-host glib libXtst libSM intltool-host PKG_NEEDS:= intl PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-core/$(PKG_EXTRAVER)/) @@ -21,6 +21,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AT_SPI2_CORE,at-spi2-core,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + at-spi2-core-install: $(INSTALL_DIR) $(IDIR_AT_SPI2_CORE)/usr/lib $(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_CORE)/usr/lib diff --git a/package/atk/Makefile b/package/atk/Makefile deleted file mode 100644 index ad6335f1b..000000000 --- a/package/atk/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# 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:= atk -PKG_VERSION:= 2.36.0 -PKG_EXTRAVER:= 2.36 -PKG_RELEASE:= 1 -PKG_HASH:= fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 -PKG_DESCR:= accessibility toolkit library -PKG_SECTION:= libs/misc -PKG_BUILDDEP:= glib meson-host -PKG_URL:= http://www.gnome.org/ -PKG_SITES:= $(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/) -PKG_LIBNAME:= libatk -PKG_OPTS:= dev - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,LIBATK,libatk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) - -WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj - -CONFIG_STYLE:= meson -BUILD_STYLE:= meson -INSTALL_STYLE:= meson - -MESON_FLAGS+= -Dintrospection=false - -libatk-install: - $(INSTALL_DIR) $(IDIR_LIBATK)/usr/lib - $(CP) $(WRKINST)/usr/lib/libatk-*.so* $(IDIR_LIBATK)/usr/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 028fbdba6..9ed63b71f 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -584,7 +584,7 @@ config BUSYBOX_IPLINK config BUSYBOX_FEATURE_IP_LINK_CAN bool "ip link set type can" - default y + default n help Configure CAN devices with "ip". diff --git a/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch new file mode 100644 index 000000000..1dfd6f379 --- /dev/null +++ b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch @@ -0,0 +1,37 @@ +From 34d331d642c3312e1c04e4650f547f1a67abee24 Mon Sep 17 00:00:00 2001 +From: Andrej Valek <andrej.v@skyrain.eu> +Date: Wed, 16 Oct 2024 10:15:08 +0200 +Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection + +The OPT_locallog was set on "option_mask32" but checked on local +"opts" variable. While this flag it's used on multiple places can't be +has to be used with "option_mask32". Without this change syslogd +is more-less unusable while no messages are logged locally. + +Signed-off-by: Andrej Valek <andrej.v@skyrain.eu> +Upstream: https://lists.busybox.net/pipermail/busybox/2024-October/090969.html +[Thomas: this was reported as beeing needed by Bernd Kuhls at +https://lore.kernel.org/buildroot/pan$de0bb$35c5a64$ca9b6f21$2408ff40@ID-313208.user.individual.net/, +but also on the Busybox mailing list at +https://lists.busybox.net/pipermail/busybox/2023-September/090499.html] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +--- + sysklogd/syslogd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c +index 7558051f0..fa03aa280 100644 +--- a/sysklogd/syslogd.c ++++ b/sysklogd/syslogd.c +@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv) + } + } + #endif +- if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) { ++ if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) { + recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */ + split_escape_and_log(recvbuf, sz); + } +-- +2.48.1 + diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 315766c57..09960903b 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,91 +4,34 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.14.6 +PKG_VERSION:= 1.18.2 PKG_RELEASE:= 1 -PKG_HASH:= 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 +PKG_HASH:= a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a PKG_DESCR:= graphics library PKG_SECTION:= libs/image PKG_DEPENDS:= fontconfig libfreetype libx11 pixman -PKG_DEPENDS+= libxr |