From b15628ec80160d4eeadbd5a7c71702cef1249fe4 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Thu, 11 Dec 2025 00:51:15 +0100 Subject: [PATCH 1/3] apk: bump to 3.0.2 We drop patch 0020-apk-fix-compile: integrated at source. Compressed help now functions normally. Signed-off-by: Paul Donald Link: https://github.com/openwrt/openwrt/pull/21127 Signed-off-by: Robert Marko --- package/system/apk/Makefile | 7 +-- .../0020-apk-fix-compile-when-using-C89.patch | 56 ------------------- 2 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 07ad1d7a32..25a2b0a9a2 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -5,11 +5,10 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2025-12-03 -PKG_SOURCE_VERSION:=982c9961ad9e71b4068911329c9d8121cedfd9f7 -PKG_MIRROR_HASH:=4fc89e2bbbe10edfaa199b1ca9ace139aa39b43d3de6236e8be8b421d81b334b +PKG_SOURCE_VERSION:=d093f7c198a64bff0cd58afeaf638909fda24ca8 +PKG_MIRROR_HASH:=596dffa2fa019be2755433ed210e30593a6a8708346cf31486d6ad8008e47556 -PKG_VERSION=3.0.1 +PKG_VERSION=3.0.2 PKG_MAINTAINER:=Paul Spooren PKG_LICENSE:=GPL-2.0-only diff --git a/package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch b/package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch deleted file mode 100644 index 8cd30542dd..0000000000 --- a/package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 54385e6dc02ada9ec827b6b79b9359951197fee5 Mon Sep 17 00:00:00 2001 -From: Paul Donald -Date: Tue, 9 Dec 2025 00:31:27 +0100 -Subject: [PATCH] apk: fix compile when using C89 - -The older standard is more strict, and gives rise to errors: - -../src/apk.c: In function 'parse_options': -../src/apk.c:584:4: error: a label can only be part of a statement and a declaration is not a statement - 584 | char *arg = opt_parse_arg(&st); - | ^~~~ - -So move the *arg declaration to function start. - -../src/app_mkpkg.c: In function 'mkpkg_setup_compat': -../src/app_mkpkg.c:423:2: error: label at end of compound statement - 423 | default: - | ^~~~~~~ - -add break; - -Signed-off-by: Paul Donald ---- - src/apk.c | 3 ++- - src/app_mkpkg.c | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/src/apk.c -+++ b/src/apk.c -@@ -556,6 +556,7 @@ static int parse_options(int argc, char - struct apk_opt_match m; - bool applet_arg_pending = false; - int r; -+ char *arg; - - applet = applet_from_arg0(argv[0]); - if (!applet) { -@@ -581,7 +582,7 @@ static int parse_options(int argc, char - case 0: - break; - case OPT_MATCH_NON_OPTION: -- char *arg = opt_parse_arg(&st); -+ arg = opt_parse_arg(&st); - if (applet_arg_pending && strcmp(arg, applet->name) == 0) - applet_arg_pending = false; - else if (arg[0] || !applet || !applet->remove_empty_arguments) ---- a/src/app_mkpkg.c -+++ b/src/app_mkpkg.c -@@ -421,6 +421,7 @@ static void mkpkg_setup_compat(struct mk - case 0: ctx->compat_rootnode = 1; // fallthrough - case 1: ctx->compat_dirnode = 1; // fallthrough - default: -+ break; - } - } - From 24b8db118b6c84b92d17f969794b2bd6d73b8cdc Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 29 Nov 2025 16:18:26 +0000 Subject: [PATCH 2/3] image: add CONFIG_EXTRA_IMAGE_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows an optional tag to be put in the .config file which is included in the filename of the resulting images, so it's easier to build images with different functionality for the same target hardware. Signed-off-by: David Woodhouse Link: https://github.com/openwrt/openwrt/pull/20984 Signed-off-by: Petr Štetiar --- include/image.mk | 3 +++ package/base-files/image-config.in | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/include/image.mk b/include/image.mk index 0fbaf66dd1..38005b2ab2 100644 --- a/include/image.mk +++ b/include/image.mk @@ -41,6 +41,9 @@ KDIR=$(KERNEL_BUILD_DIR) KDIR_TMP=$(KDIR)/tmp DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts +ifeq ($(EXTRA_IMAGE_NAME),) +EXTRA_IMAGE_NAME:=$(call qstrip,$(CONFIG_EXTRA_IMAGE_NAME)) +endif IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-) IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-) IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 67ef4d415a..0f71384190 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -5,6 +5,14 @@ # See /LICENSE for more information. # +config EXTRA_IMAGE_NAME + string + prompt "Extra image filename" if IMAGEOPT + default "" + help + Add this to the output image filenames, to distinguish between + different builds for the same hardware type. + config TARGET_DEFAULT_LAN_IP_FROM_PREINIT bool "Use preinit IP configuration as default LAN IP" if IMAGEOPT default n From ff4546093e0146654007d71a2cc37034fe9f633e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 13 Dec 2025 12:53:39 +0100 Subject: [PATCH 3/3] odhcpd: update to Git HEAD (2025-12-13) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cf51aeb93220 odhcpd: fix captive_portal_uri reset e8b7fdea8d5e dhcpv4: fix DNS server option b84553e496a3 router: Modify relayed RA PIO P flag according to interface policy da3e2a9829cc router: Modify relayed RA PIO A flags according to interface policy bad7138b70f0 README.md: update dhcp ubus events https://github.com/openwrt/odhcpd/compare/ca00527e5fc3...cf51aeb93220 Also remove duplicated /usr/share/libubox/jshn.sh include. Signed-off-by: Álvaro Fernández Rojas --- package/network/services/odhcpd/Makefile | 6 +++--- package/network/services/odhcpd/files/odhcpd.defaults | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 92dfd823b4..71bbb70616 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git -PKG_MIRROR_HASH:=cce1d4f3c88f4eec0cf8b19429f12e6fc2f47dca9b4d643a31569c1209f8fabc -PKG_SOURCE_DATE:=2025-12-10 -PKG_SOURCE_VERSION:=ca00527e5fc3d8d2b8c1a60fbeb6a25e2bf68674 +PKG_MIRROR_HASH:=b69961edb0de3d2d0c4a7c883fba264c88fd158328ce0e8f42c634e164679fb9 +PKG_SOURCE_DATE:=2025-12-13 +PKG_SOURCE_VERSION:=cf51aeb93220672d54d0d0f3707710bf544801e2 PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults index fbb7ec92af..3e01ba2d9b 100644 --- a/package/network/services/odhcpd/files/odhcpd.defaults +++ b/package/network/services/odhcpd/files/odhcpd.defaults @@ -89,8 +89,6 @@ fi touch /etc/config/dhcp -. /usr/share/libubox/jshn.sh - json_load "$(cat /etc/board.json)" json_select network json_select lan