From 60b07db9cf00fbd5ce036d8b85e8526b65d8d4c5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 16 Mar 2026 13:57:26 -0600 Subject: [PATCH] package/tailscale: don't overwrite tailscaled when using merged bin When merged bin was added in Buildroot commit 428ac6fcc4c286dd013ada411bf1ab5c0ad11614 the tailscaled package started overwriting the tailscaled binary with a broken symlink when BR2_ROOTFS_MERGED_BIN=y as it assumed /usr/bin and /usr/sbin were not merged. To ensure this doesn't happen only apply the symlink when BR2_ROOTFS_MERGED_BIN is not selected. Signed-off-by: James Hilliard Tested-by: TIAN Yuanhao Signed-off-by: Thomas Petazzoni --- package/tailscale/tailscale.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk index 86039fd4b1..f231022476 100644 --- a/package/tailscale/tailscale.mk +++ b/package/tailscale/tailscale.mk @@ -22,10 +22,12 @@ define TAILSCALE_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service endef +ifeq ($(BR2_ROOTFS_MERGED_BIN),) define TAILSCALE_INSTALL_SYMLINK ln -f -s ../bin/tailscaled $(TARGET_DIR)/usr/sbin/tailscaled endef TAILSCALE_POST_INSTALL_TARGET_HOOKS += TAILSCALE_INSTALL_SYMLINK +endif define TAILSCALE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6)