tailscale: create combined tailscale/tailscaled

Modify Makefile to combine tailscale and tailscaled according to
Tailscale documentatio (https://tailscale.com/kb/1207/small-tailscale)

This resulted for x86_64 in an exec of 31MB + the symlink. Before it
was 29MB (tailscaled) and 10MB (tailscale).

Signed-off-by: Thomas Kupper <thomas.kupper@gmail.com>
This commit is contained in:
Thomas Kupper 2024-01-06 10:49:36 +00:00 committed by Tianling Shen
parent e9e1ae2386
commit 7bef195bba

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tailscale PKG_NAME:=tailscale
PKG_VERSION:=1.56.1 PKG_VERSION:=1.56.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
@ -25,33 +25,22 @@ PKG_BUILD_PARALLEL:=1
PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_FLAGS:=no-mips16
GO_PKG:=\ GO_PKG:=\
tailscale.com/cmd/tailscale \
tailscale.com/cmd/tailscaled tailscale.com/cmd/tailscaled
GO_PKG_LDFLAGS:=-X 'tailscale.com/version.longStamp=$(PKG_VERSION)-$(PKG_RELEASE) (OpenWrt)' GO_PKG_LDFLAGS:=-X 'tailscale.com/version.longStamp=$(PKG_VERSION)-$(PKG_RELEASE) (OpenWrt)'
GO_PKG_LDFLAGS_X:=tailscale.com/version.shortStamp=$(PKG_VERSION) GO_PKG_LDFLAGS_X:=tailscale.com/version.shortStamp=$(PKG_VERSION)
GO_PKG_TAGS:=ts_include_cli
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk include ../../lang/golang/golang-package.mk
define Package/tailscale/Default define Package/tailscale
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=VPN SUBMENU:=VPN
TITLE:=Zero config VPN TITLE:=Zero config VPN
URL:=https://tailscale.com URL:=https://tailscale.com
DEPENDS:=$(GO_ARCH_DEPENDS) DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +kmod-tun
endef PROVIDES:=tailscaled
define Package/tailscaled
$(call Package/tailscale/Default)
TITLE+= (daemon)
DEPENDS+= +ca-bundle +kmod-tun
endef
define Package/tailscale
$(call Package/tailscale/Default)
TITLE+= (utility)
DEPENDS+= +tailscaled
endef endef
define Package/tailscale/description define Package/tailscale/description
@ -59,24 +48,17 @@ define Package/tailscale/description
and cloud instances. Even when separated by firewalls or subnets. and cloud instances. Even when separated by firewalls or subnets.
endef endef
Package/tailscaled/description:=$(Package/tailscale/description) define Package/tailscale/conffiles
define Package/tailscaled/conffiles
/etc/config/tailscale /etc/config/tailscale
/etc/tailscale/ /etc/tailscale/
endef endef
define Package/tailscale/install define Package/tailscale/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/tailscale $(1)/usr/sbin
endef
define Package/tailscaled/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/tailscaled $(1)/usr/sbin $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/tailscaled $(1)/usr/sbin
$(LN) tailscaled $(1)/usr/sbin/tailscale
$(INSTALL_BIN) ./files//tailscale.init $(1)/etc/init.d/tailscale $(INSTALL_BIN) ./files//tailscale.init $(1)/etc/init.d/tailscale
$(INSTALL_DATA) ./files//tailscale.conf $(1)/etc/config/tailscale $(INSTALL_DATA) ./files//tailscale.conf $(1)/etc/config/tailscale
endef endef
$(eval $(call BuildPackage,tailscale)) $(eval $(call BuildPackage,tailscale))
$(eval $(call BuildPackage,tailscaled))