build: fix recipe line break in wrap_mirror fallback path

Commit 042996b46b ("build: stricter hash validation on download")
refactored the $(if) in wrap_mirror from a single line to multiple lines.
The else branch (used when MIRROR is empty) was moved to a new line without
a trailing backslash on the preceding line. This causes download methods
that use wrap_mirror (e.g. git) to fail when PKG_SOURCE_MIRROR is 0:

    SHELL= flock ...flock -c '  ...
    bash: -c: line 1: unexpected EOF while looking for matching `''

The fix is to add the missing \ to the else branch.

Signed-off-by: Karsten Sperling <ksperling@apple.com>

include/download.mk

@@ -161,7 +161,7 @@ $(if $(if $(MIRROR), \
 				echo "Hash mismatch for file $(FILE): expected $(MIRROR_HASH), got $$$$file_hash"; \
 				false; \
 			}; \
-		)),
+		)), \
 	$(3)) \
 $(if $(filter check,$(1)), \
 	$(call check_hash,$(FILE),$(MIRROR_HASH),$(2)MIRROR_$(call hash_var,$(MIRROR_MD5SUM))) \

include/kernel.mk

@@ -129,11 +129,6 @@ ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL
 	KERNELRELEASE=$(LINUX_VERSION)
 endif
 
-ifneq ($(HOST_OS),Linux)
-  KERNEL_MAKE_FLAGS += CONFIG_STACK_VALIDATION=
-  export SKIP_STACK_VALIDATION:=1
-endif
-
 KERNEL_MAKEOPTS = -C $(LINUX_DIR) $(KERNEL_MAKE_FLAGS)
 
 ifdef CONFIG_USE_SPARSE

package/boot/uboot-imx/Makefile

@@ -59,6 +59,9 @@ define U-Boot/wandboard
   BUILD_DEVICES:=wandboard_dual
 endef
 
+UBOOT_CUSTOMIZE_CONFIG := \
+	--disable TOOLS_MKEFICAPSULE
+
 UBOOT_TARGETS := \
 	apalis_imx6 \
 	kontron-osm-s-mx8mp \

package/libs/libmd/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmd
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://archive.hadrons.org/software/libmd/
-PKG_HASH:=1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332
+PKG_HASH:=ac15ffb8430502fbaccdec66c5a82ee0eab0b0f36220df56710feadfeb13d0a0
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING

package/libs/libxml2/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
-PKG_VERSION:=2.15.1
+PKG_VERSION:=2.15.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION))
-PKG_HASH:=c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c
+PKG_HASH:=78262a6e7ac170d6528ebfe2efccdf220191a5af6a6cd61ea4a9a9a5042c7a07
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=Copyright

package/network/services/unetd/Makefile

@@ -8,6 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unetd
+PKG_RELEASE:=2
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/unetd.git
 PKG_SOURCE_DATE:=2026-05-22

package/network/services/unetd/files/unet.uc

@@ -586,6 +586,7 @@ function network_invite(ctx, argv, named)
 	let req = {
 		network,
 		timeout: named.timeout,
+		enroll_info: { network },
 	};
 
 	if (named["access-key"]) {
@@ -606,12 +607,13 @@ function network_invite(ctx, argv, named)
 function network_join_peer_update(model, ctx, msg)
 {
 	let joinreq = ctx.data.enroll;
-	let name = joinreq.name;
 
 	let data = network_handle_enroll_update(model, ctx, msg);
 	if (!data)
 		return;
 
+	let name = data.enroll_meta?.network ?? joinreq.name;
+
 	let iface = {
 		proto: "unet",
 		metric: joinreq.metric,

package/utils/nilfs-utils/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nilfs-utils
-PKG_VERSION:=2.2.12
+PKG_VERSION:=2.3.0
 PKG_RELEASE:=1
 PKG_URL:=https://nilfs.sourceforge.io
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://nilfs.sourceforge.io/download/
-PKG_HASH:=fc9a8520b68928d43fffa465c3b3845cc9b7d4973f4fbde4b3c7ecf25ce52d09
+PKG_HASH:=c0876a7ecd13d4b54cb65abb9ad6cd0bf1ed102d03ca12738f12eab9bd84e67b
 
 PKG_MAINTAINER:=Pavlo Samko <bulldozerbsg@gmail.com>
 PKG_LICENSE:=GPL-2.0
@@ -63,19 +63,12 @@ define Package/libnilfsgc
   DEPENDS:=+libnilfs
 endef
 
-define Package/libnilfscleaner
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libnilfscleaner
-  DEPENDS:=+libuuid +nilfs-cleanerd @KERNEL_POSIX_MQUEUE
-endef
-
 define Package/nilfs-clean
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=Filesystem
   TITLE:=run garbage collector on NILFS file system
-  DEPENDS:=+libnilfs +libnilfscleaner
+  DEPENDS:=+libuuid +libnilfs @KERNEL_POSIX_MQUEUE
 endef
 
 define Package/nilfs-resize
@@ -121,25 +114,26 @@ endef
 # libmount is used and support of the selinux context mount options
 # depends on the libmount that distro provides.
 CONFIGURE_ARGS += \
+	--enable-usrmerge \
 	--without-selinux
 
 define Package/nilfs-mkfs/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.nilfs2 $(1)/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.nilfs2 $(1)/usr/sbin/
 endef
 
 define Package/nilfs-cleanerd/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) $(PKG_INSTALL_DIR)/etc/nilfs_cleanerd.conf $(1)/etc/
 
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/nilfs_cleanerd $(1)/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/nilfs_cleanerd $(1)/usr/sbin/
 endef
 
 define Package/nilfs-mount/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/mount.nilfs2 $(1)/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/sbin/umount.nilfs2 $(1)/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/mount.nilfs2 $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/umount.nilfs2 $(1)/usr/sbin/
 endef
 
 define Package/libnilfs/install
@@ -152,11 +146,6 @@ define Package/libnilfsgc/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnilfsgc.so* $(1)/usr/lib/
 endef
 
-define Package/libnilfscleaner/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnilfscleaner.so* $(1)/usr/lib/
-endef
-
 define Package/nilfs-clean/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/nilfs-clean $(1)/usr/sbin/
@@ -195,7 +184,6 @@ $(eval $(call BuildPackage,nilfs-cleanerd))
 $(eval $(call BuildPackage,nilfs-mount))
 $(eval $(call BuildPackage,libnilfs))
 $(eval $(call BuildPackage,libnilfsgc))
-$(eval $(call BuildPackage,libnilfscleaner))
 $(eval $(call BuildPackage,nilfs-clean))
 $(eval $(call BuildPackage,nilfs-resize))
 $(eval $(call BuildPackage,nilfs-tune))

target/linux/generic/hack-6.18/201-gen_init_cpio_portability.patch

@@ -0,0 +1,52 @@
+From 60e044199e773df4863405dba0f7abe16a43282d Mon Sep 17 00:00:00 2001
+From: Mark Mentovai <mark@mentovai.com>
+Date: Fri, 29 May 2026 12:48:31 -0400
+Subject: [PATCH] gen_init_cpio: fix build on macOS hosts
+
+ae18b94099b0 (2025-08-20, in 6.18) introduced a dependency on the
+Linux-specific O_LARGEFILE, and 97169cd6d95b (2025-08-20, in 6.18)
+introduced a dependency on the Linux-specific copy_file_range. Both of
+these commits were a part of the
+https://lore.kernel.org/all/20250819032607.28727-1-ddiss@suse.de/
+series. These new dependencies may not be available on non-Linux
+systems, although it is possible to cross-build Linux on non-Linux build
+hosts, and it is appropriate to run tools like gen_init_cpio on such
+build hosts. It is straightforward to avoid these Linux-specific
+features when not building on Linux.
+
+Signed-off-by: Mark Mentovai <mark@mentovai.com>
+---
+ usr/gen_init_cpio.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/usr/gen_init_cpio.c
++++ b/usr/gen_init_cpio.c
+@@ -456,6 +456,7 @@ static int cpio_mkfile(const char *name,
+ 		    push_pad(namepadlen ? namepadlen : padlen(offset, 4)) < 0)
+ 			goto error;
+ 
++#ifdef __linux__
+ 		if (size) {
+ 			this_read = copy_file_range(file, NULL, outfd, NULL, size, 0);
+ 			if (this_read > 0) {
+@@ -466,6 +467,7 @@ static int cpio_mkfile(const char *name,
+ 			}
+ 			/* short or failed copy falls back to read/write... */
+ 		}
++#endif
+ 
+ 		while (size) {
+ 			unsigned char filebuf[65536];
+@@ -674,7 +676,11 @@ int main (int argc, char *argv[])
+ 			break;
+ 		case 'o':
+ 			outfd = open(optarg,
+-				     O_WRONLY | O_CREAT | O_LARGEFILE | O_TRUNC,
++				     O_WRONLY | O_CREAT | O_TRUNC
++#ifdef O_LARGEFILE
++					     | O_LARGEFILE
++#endif
++				     ,
+ 				     0600);
+ 			if (outfd < 0) {
+ 				fprintf(stderr, "failed to open %s\n", optarg);

target/linux/generic/hack-6.18/202-objtool_portability.patch

@@ -0,0 +1,91 @@
+From dc5565c4478135999d8bb193bd9dfb4f8ef5f96b Mon Sep 17 00:00:00 2001
+From: Mark Mentovai <mark@mentovai.com>
+Date: Mon, 1 Jun 2026 09:11:43 -0400
+Subject: [PATCH] objtool: fix build on macOS hosts
+
+Since 5a406031d0719 (2025-03-17, in 6.15), objtool calls sendfile, but
+sendfile is Linux-specific and a sendfile with the requisite
+capabilities is not available on other operating systems. Provide a more
+portable fallback implementation to be used when cross-building on
+non-Linux hosts.
+
+Signed-off-by: Mark Mentovai <mark@mentovai.com>
+---
+ tools/objtool/builtin-check.c | 40 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+--- a/tools/objtool/builtin-check.c
++++ b/tools/objtool/builtin-check.c
+@@ -10,7 +10,9 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#ifdef __linux__
+ #include <sys/sendfile.h>
++#endif
+ #include <objtool/builtin.h>
+ #include <objtool/objtool.h>
+ #include <objtool/warn.h>
+@@ -187,12 +189,28 @@ static bool opts_valid(void)
+ 	return false;
+ }
+ 
++#ifndef __linux__
++#define RETRY_EINTR(x)                                                  \
++	({                                                              \
++		__typeof__(x) eintr_wrapper_result;                     \
++		do {                                                    \
++			eintr_wrapper_result = (x);                     \
++		} while (eintr_wrapper_result == -1 && errno == EINTR); \
++		eintr_wrapper_result;                                   \
++	})
++#endif
++
+ static int copy_file(const char *src, const char *dst)
+ {
+ 	size_t to_copy, copied;
+ 	int dst_fd, src_fd;
+ 	struct stat stat;
++#ifdef __linux__
+ 	off_t offset = 0;
++#else
++	char buf[65536];
++	ssize_t nread, nwrote;
++#endif
+ 
+ 	src_fd = open(src, O_RDONLY);
+ 	if (src_fd == -1) {
+@@ -217,11 +235,33 @@ static int copy_file(const char *src, co
+ 	}
+ 
+ 	for (to_copy = stat.st_size; to_copy > 0; to_copy -= copied) {
++#ifdef __linux__
+ 		copied = sendfile(dst_fd, src_fd, &offset, to_copy);
+ 		if (copied == -1) {
+ 			ERROR_GLIBC("sendfile");
+ 			return 1;
+ 		}
++#else
++		nread = RETRY_EINTR(
++			read(src_fd, buf,
++			     to_copy < sizeof(buf) ? to_copy : sizeof(buf)));
++		if (nread < 0) {
++			ERROR_GLIBC("read");
++			return 1;
++		}
++		if (nread == 0) {
++			ERROR("unexpected premature EOF");
++			return 1;
++		}
++		for (copied = 0; copied < nread; copied += nwrote) {
++			nwrote = RETRY_EINTR(
++				write(dst_fd, buf + copied, nread - copied));
++			if (nwrote < 0) {
++				ERROR_GLIBC("write");
++				return 1;
++			}
++		}
++#endif
+ 	}
+ 
+ 	close(dst_fd);

toolchain/gcc/patches-14.x/240-libsanitizer-fix-termio-glibc-2.40.patch

@@ -0,0 +1,53 @@
+From: Backport from GCC 15
+
+libsanitizer: remove struct termio and legacy ioctl interceptors for glibc
+
+glibc 2.43 no longer exposes struct termio (the old UNIX System V
+terminal struct) through <termios.h>. The old TCGETA/TCSETA/TCSETAF/
+TCSETAW ioctls that operated on struct termio are legacy interfaces
+superseded by the POSIX TCGETS/TCSETS family using struct termios.
+
+GCC 15 already dropped these; this patch backports that removal to GCC 14.
+
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -479,9 +479,6 @@
+   unsigned struct_input_id_sz = sizeof(struct input_id);
+   unsigned struct_mtpos_sz = sizeof(struct mtpos);
+   unsigned struct_rtentry_sz = sizeof(struct rtentry);
+-#if SANITIZER_GLIBC || SANITIZER_ANDROID
+-  unsigned struct_termio_sz = sizeof(struct termio);
+-#endif
+   unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
+   unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
+   unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -1012,7 +1012,6 @@
+ extern unsigned struct_input_absinfo_sz;
+ extern unsigned struct_input_id_sz;
+ extern unsigned struct_mtpos_sz;
+-extern unsigned struct_termio_sz;
+ extern unsigned struct_vt_consize_sz;
+ extern unsigned struct_vt_sizes_sz;
+ extern unsigned struct_vt_stat_sz;
+--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -338,17 +338,9 @@
+   _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
+   _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
+   _(TCFLSH, NONE, 0);
+-#if SANITIZER_GLIBC
+-  _(TCGETA, WRITE, struct_termio_sz);
+-#endif
+   _(TCGETS, WRITE, struct_termios_sz);
+   _(TCSBRK, NONE, 0);
+   _(TCSBRKP, NONE, 0);
+-#if SANITIZER_GLIBC
+-  _(TCSETA, READ, struct_termio_sz);
+-  _(TCSETAF, READ, struct_termio_sz);
+-  _(TCSETAW, READ, struct_termio_sz);
+-#endif
+   _(TCSETS, READ, struct_termios_sz);
+   _(TCSETSF, READ, struct_termios_sz);
+   _(TCSETSW, READ, struct_termios_sz);