mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-22 08:52:29 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/tailscale: don't overwrite tailscaled when using merged bin

Browse Source 
When merged bin was added in Buildroot commit
428ac6fcc4 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 <james.hilliard1@gmail.com>
Tested-by: TIAN Yuanhao <tianyuanhao3@163.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
James Hilliard
2026-03-16 13:57:26 -06:00
committed by Thomas Petazzoni
parent 97e7c6d82f
commit 60b07db9cf
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/tailscale/tailscale.mk
View File

@@ -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)