[Buildroot] [PATCH 1/1] package/tailscale: don't overwrite tailscaled when using merged bin

[Buildroot] [PATCH 1/1] package/tailscale: don't overwrite tailscaled when using merged bin

[James Hilliard]

When merged bin was enabled in systemd in buildroot commit
a530492cd3e6de7ed5f9406f7573fe7b9061b3d5 the tailscaled package
started overwriting the tailscaled binary with a broken symlink 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 <james.hilliard1@gmail.com>
---
 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)
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/tailscale: don't overwrite tailscaled when using merged bin

[TIAN Yuanhao]

Tested-by: TIAN Yuanhao <tianyuanhao3@163.com>

At 2026-03-17 03:57:26, "James Hilliard" <james.hilliard1@gmail.com> wrote:
>When merged bin was enabled in systemd in buildroot commit
>a530492cd3e6de7ed5f9406f7573fe7b9061b3d5 the tailscaled package
>started overwriting the tailscaled binary with a broken symlink 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 <james.hilliard1@gmail.com>
>---
> 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)
>-- 
>2.43.0
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/tailscale: don't overwrite tailscaled when using merged bin

[TIAN Yuanhao]

Hello,

Can someone review this patch?

At 2026-05-20 18:10:56, "TIAN Yuanhao" <tianyuanhao3@163.com> wrote:
>Tested-by: TIAN Yuanhao <tianyuanhao3@163.com>
>
>At 2026-03-17 03:57:26, "James Hilliard" <james.hilliard1@gmail.com> wrote:
>>When merged bin was enabled in systemd in buildroot commit
>>a530492cd3e6de7ed5f9406f7573fe7b9061b3d5 the tailscaled package
>>started overwriting the tailscaled binary with a broken symlink 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 <james.hilliard1@gmail.com>
>>---
>> 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)
>>-- 
>>2.43.0
>>
>_______________________________________________
>buildroot mailing list
>buildroot@buildroot.org
>https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/tailscale: don't overwrite tailscaled when using merged bin

[Thomas Petazzoni via buildroot]

On Mon, Mar 16, 2026 at 01:57:26PM -0600, James Hilliard wrote:
> When merged bin was enabled in systemd in buildroot commit
> a530492cd3e6de7ed5f9406f7573fe7b9061b3d5 the tailscaled package

This isn't correct: it has nothing to do with
systemd. BR2_ROOTFS_MERGED_BIN can be enabled independently of
systemd. So the problem started occurring when BR2_ROOTFS_MERGED_BIN
support was merged.

I've updated the commit message, and applied. Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot