[Buildroot] [PATCH 1/1] package/tailscale: install service files

[Buildroot] [PATCH 1/1] package/tailscale: install service files

[TIAN Yuanhao]

Install tailscaled to /usr/sbin, as the service file references that
location.

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: James Hilliard <james.hilliard1@gmail.com>
---
 package/tailscale/tailscale.mk | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk
index 55f8ac4ab9..c974c0fd6b 100644
--- a/package/tailscale/tailscale.mk
+++ b/package/tailscale/tailscale.mk
@@ -15,6 +15,27 @@ TAILSCALE_LDFLAGS = \
 	-X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \
 	-X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION)
 
+define TAILSCALE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/bin/tailscale \
+		$(TARGET_DIR)/usr/bin/tailscale
+	$(INSTALL) -D -m 0755 $(@D)/bin/tailscaled \
+		$(TARGET_DIR)/usr/sbin/tailscaled
+endef
+
+define TAILSCALE_INSTALL_INIT_OPENRC
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.defaults \
+		$(TARGET_DIR)/etc/default/tailscaled
+	$(INSTALL) -D -m 0755 $(@D)/cmd/tailscaled/tailscaled.openrc \
+		$(TARGET_DIR)/etc/init.d/S60tailscaled
+endef
+
+define TAILSCALE_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.defaults \
+		$(TARGET_DIR)/etc/default/tailscaled
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service
+endef
+
 define TAILSCALE_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_TUN)
 endef
-- 
2.46.1

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

Re: [Buildroot] [PATCH 1/1] package/tailscale: install service files

[yann.morin]

Yuanhao, All,

On 2025-04-11 04:37 -0700, TIAN Yuanhao spake thusly:
> Install tailscaled to /usr/sbin, as the service file references that
> location.
> 
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> Cc: James Hilliard <james.hilliard1@gmail.com>
> ---
[--SNIP--]
> +define TAILSCALE_INSTALL_TARGET_CMDS
> +	$(INSTALL) -D -m 0755 $(@D)/bin/tailscale \
> +		$(TARGET_DIR)/usr/bin/tailscale
> +	$(INSTALL) -D -m 0755 $(@D)/bin/tailscaled \
> +		$(TARGET_DIR)/usr/sbin/tailscaled
> +endef

I would suggest that, rather than override the default _CMDS, you
provide a post-install hook that does a symlink in sbin.

> +define TAILSCALE_INSTALL_INIT_OPENRC
[--SNIP--]
> +define TAILSCALE_INSTALL_INIT_SYSTEMD
[--SNIP--]

What about TAILSCALE_INSTALL_INIT_SYSV ?

Regards,
Yann E. MORIN.

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/tailscale: install service files

[TIAN Yuanhao]

[-- Attachment #1.1: Type: text/plain, Size: 1088 bytes --]

Hi Yann,At 2025-04-11 22:56:49, yann.morin@orange.com wrote:
>Yuanhao, All,
>
>On 2025-04-11 04:37 -0700, TIAN Yuanhao spake thusly:
>> Install tailscaled to /usr/sbin, as the service file references that
>> location.
>> 
>> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
>> Cc: James Hilliard <james.hilliard1@gmail.com>
>> ---
>[--SNIP--]
>> +define TAILSCALE_INSTALL_TARGET_CMDS
>> +	$(INSTALL) -D -m 0755 $(@D)/bin/tailscale \
>> +		$(TARGET_DIR)/usr/bin/tailscale
>> +	$(INSTALL) -D -m 0755 $(@D)/bin/tailscaled \
>> +		$(TARGET_DIR)/usr/sbin/tailscaled
>> +endef
>
>I would suggest that, rather than override the default _CMDS, you
>provide a post-install hook that does a symlink in sbin.

How about creating this symbolic link in TAILSCALE_INSTALL_INIT_***?


>
>> +define TAILSCALE_INSTALL_INIT_OPENRC
>[--SNIP--]
>> +define TAILSCALE_INSTALL_INIT_SYSTEMD
>[--SNIP--]
>

>What about TAILSCALE_INSTALL_INIT_SYSV ?


The upstream repository does not provide a sysv init script, and I am not familiar with sysv init either.


>
>Regards,
>Yann E. MORIN.
>

Regards,
TIAN Yuanhao

[-- Attachment #1.2: Type: text/html, Size: 1973 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

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

[Buildroot] [PATCH v2 1/1] package/tailscale: install systemd service files

[TIAN Yuanhao]

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: James Hilliard <james.hilliard1@gmail.com>
Cc: Yann E. MORIN <yann.morin@orange.com>

---
Changes v1 -> v2:
  - Remove untested TAILSCALE_INSTALL_INIT_OPENRC
  - Change default service files to use /bin instead of /sbin
---
 package/tailscale/tailscale.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk
index 55f8ac4ab9..6345b2c0cc 100644
--- a/package/tailscale/tailscale.mk
+++ b/package/tailscale/tailscale.mk
@@ -15,6 +15,15 @@ TAILSCALE_LDFLAGS = \
 	-X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \
 	-X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION)
 
+define TAILSCALE_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.defaults \
+		$(TARGET_DIR)/etc/default/tailscaled
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service
+	$(SED) 's,/sbin/tailscaled ,/bin/tailscaled ,' \
+		$(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service
+endef
+
 define TAILSCALE_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_TUN)
 endef
-- 
2.46.1

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

Re: [Buildroot] [PATCH 1/1] package/tailscale: install service files

[yann.morin]

Yuanhao, All,

On 2025-04-12 17:14 +0800, TIAN Yuanhao spake thusly:
> At 2025-04-11 22:56:49, yann.morin@orange.com wrote:
> >Yuanhao, All,>>On 2025-04-11 04:37 -0700, TIAN Yuanhao spake thusly:
> >> Install tailscaled to /usr/sbin, as the service file references that
> >> location.>> >> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> >> Cc: James Hilliard <james.hilliard1@gmail.com>
> >> --->[--SNIP--]>> +define TAILSCALE_INSTALL_TARGET_CMDS
> >> +    $(INSTALL) -D -m 0755 $(@D)/bin/tailscale \
> >> +            $(TARGET_DIR)/usr/bin/tailscale
> >> +    $(INSTALL) -D -m 0755 $(@D)/bin/tailscaled \
> >> +            $(TARGET_DIR)/usr/sbin/tailscaled
> >> +endef>>I would suggest that, rather than override the default _CMDS, you
> >provide a post-install hook that does a symlink in sbin.
> How about creating this symbolic link in TAILSCALE_INSTALL_INIT_***?

You'd have to replicate that for all the _INIT_* commands, so better do
it once and for all.

Afterall, adding the symlink is not due to the init system in use; it's
due to a limitation in Buildroot's golang-package infra, which does not
allow specifying the destination for each individual executable, and
forcibly shoves all in /usr/bin/. So, adding the symlink should just be
done unconditionally, as a post-install hook.

> >>> +define TAILSCALE_INSTALL_INIT_OPENRC
> >[--SNIP--]>> +define TAILSCALE_INSTALL_INIT_SYSTEMD
> >[--SNIP--]>
> >What about TAILSCALE_INSTALL_INIT_SYSV ?
> The upstream repository does not provide a sysv init script, and I
> am not familiar with sysv init either.

Fair enough.

Regards,
Yann E. MORIN.

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/tailscale: install systemd service files

[yann.morin]

Yuanhao, All,

On 2025-04-14 08:07 -0700, TIAN Yuanhao spake thusly:
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> Cc: James Hilliard <james.hilliard1@gmail.com>
> Cc: Yann E. MORIN <yann.morin@orange.com>
> 
> ---
> Changes v1 -> v2:
>   - Remove untested TAILSCALE_INSTALL_INIT_OPENRC
>   - Change default service files to use /bin instead of /sbin

That's an option, too. I find it not very nice to sed the file; I think
it would be better to carry a patch that patches the service file, as it
is provided in the source tree and not generated at build.

Yet, I think it's better to do the symlink in sbin... As I said in my
earlier reply today, the location of the executable is an artifact of
the limitations of the Buildroot golang-package infrastructure, so it
is only fitting that we do workaround this with a symlink.

Note: it should be relatively easy in Buildroot to add support for
providing the location of individual binaries installed by a golang
package. Indeed, golang package usually install very few executables,
usually just one; when they install multiple, it's just a handful of
them, and they mostly always go into /usr/bin/. For the very few that
need to go in /usr/sbin, then this can be overridden in the package .mk;
maybe something like:

    TAILSCALE_BINDIR_tailscaled = /usr/sbin

and then in the golang-package infra:

    164 define $(2)_INSTALL_TARGET_CMDS
    165 »       $$(foreach d,$$($(2)_INSTALL_BINS),\
    166 »       »       $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)$(or $$($(2)_BINDIR_$$(d)),/usr/bin)/$$(d)
    167 »       )
    168 endef

(I don't think a similar feature would be needed for host packages,
because we don't care about bin vs. sbin for those.)

Regards,
Yann E. MORIN.

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 1/1] package/tailscale: install systemd service files

[TIAN Yuanhao]

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: James Hilliard <james.hilliard1@gmail.com>
Cc: Yann E. MORIN <yann.morin@orange.com>

---
Changes v2 -> v3:
  - Create symlink in /sbin  (suggested by Yann)

Changes v1 -> v2:
  - Remove untested TAILSCALE_INSTALL_INIT_OPENRC
  - Change default service files to use /bin instead of /sbin
---
 package/tailscale/tailscale.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk
index 55f8ac4ab9..7019b9afc9 100644
--- a/package/tailscale/tailscale.mk
+++ b/package/tailscale/tailscale.mk
@@ -15,6 +15,18 @@ TAILSCALE_LDFLAGS = \
 	-X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \
 	-X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION)
 
+define TAILSCALE_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.defaults \
+		$(TARGET_DIR)/etc/default/tailscaled
+	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service
+endef
+
+define TAILSCALE_INSTALL_SYMLINK
+	ln -f -s ../bin/tailscaled $(TARGET_DIR)/usr/sbin/tailscaled
+endef
+TAILSCALE_POST_INSTALL_TARGET_HOOKS += TAILSCALE_INSTALL_SYMLINK
+
 define TAILSCALE_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_TUN)
 endef
-- 
2.46.1

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

Re: [Buildroot] [PATCH v3 1/1] package/tailscale: install systemd service files

[Thomas Petazzoni via buildroot]

On Thu, 17 Apr 2025 04:22:43 -0700
TIAN Yuanhao <tianyuanhao3@163.com> wrote:

> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> Cc: James Hilliard <james.hilliard1@gmail.com>
> Cc: Yann E. MORIN <yann.morin@orange.com>
> 
> ---
> Changes v2 -> v3:
>   - Create symlink in /sbin  (suggested by Yann)

Applied to master, thanks.

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

Re: [Buildroot] [PATCH v3 1/1] package/tailscale: install systemd service files

[Arnout Vandecappelle via buildroot]

On 17/04/2025 13:22, TIAN Yuanhao wrote:
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> Cc: James Hilliard <james.hilliard1@gmail.com>
> Cc: Yann E. MORIN <yann.morin@orange.com>

  Applied to 2025.02.x, thanks.

  Regards,
  Arnout

> 
> ---
> Changes v2 -> v3:
>    - Create symlink in /sbin  (suggested by Yann)
> 
> Changes v1 -> v2:
>    - Remove untested TAILSCALE_INSTALL_INIT_OPENRC
>    - Change default service files to use /bin instead of /sbin
> ---
>   package/tailscale/tailscale.mk | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
> 
> diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk
> index 55f8ac4ab9..7019b9afc9 100644
> --- a/package/tailscale/tailscale.mk
> +++ b/package/tailscale/tailscale.mk
> @@ -15,6 +15,18 @@ TAILSCALE_LDFLAGS = \
>   	-X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \
>   	-X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION)
>   
> +define TAILSCALE_INSTALL_INIT_SYSTEMD
> +	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.defaults \
> +		$(TARGET_DIR)/etc/default/tailscaled
> +	$(INSTALL) -D -m 0644 $(@D)/cmd/tailscaled/tailscaled.service \
> +		$(TARGET_DIR)/usr/lib/systemd/system/tailscaled.service
> +endef
> +
> +define TAILSCALE_INSTALL_SYMLINK
> +	ln -f -s ../bin/tailscaled $(TARGET_DIR)/usr/sbin/tailscaled
> +endef
> +TAILSCALE_POST_INSTALL_TARGET_HOOKS += TAILSCALE_INSTALL_SYMLINK
> +
>   define TAILSCALE_LINUX_CONFIG_FIXUPS
>   	$(call KCONFIG_ENABLE_OPT,CONFIG_TUN)
>   endef

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