-
-
Save bobpaul/123c00dbe1ef4a880a5e5ed414993d2b to your computer and use it in GitHub Desktop.
Updated tailscale-git, missing makedeps, added more archs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/PKGBUILD b/PKGBUILD | |
index 1997758..98fbbc3 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -4,13 +4,13 @@ | |
pkgname=tailscale-git | |
_pkgname=tailscale | |
-pkgver=1.59.6+t4e822c031 | |
+pkgver=1.81.140+t75a03fc71 | |
pkgrel=1 | |
pkgdesc="A mesh VPN that makes it easy to connect your devices, wherever they are." | |
-arch=("x86_64") | |
+arch=("x86_64" "aarch64" "powerpc64le" "riscv64") | |
url="https://tailscale.com" | |
license=("MIT") | |
-makedepends=("git") | |
+makedepends=("git" "go") | |
depends=("glibc") | |
optdepends=('networkmanager: DNS resolver integration' | |
'openresolv: DNS resolver integration' | |
@@ -30,7 +30,15 @@ pkgver() { | |
prepare() { | |
cd "${_pkgname}" | |
- TOOLCHAIN="$PWD/../tailscale-go" tool/go mod vendor | |
+ case "$CARCH" in | |
+ "x86_64"|"aarch64") | |
+ TOOLCHAIN="$PWD/../tailscale-go" tool/go mod vendor | |
+ ;; | |
+ *) | |
+ go mod vendor | |
+ ;; | |
+ esac | |
+ | |
# go mod vendor can contribute some changes to go.mod or go.sum. | |
# Revert them so that the version stamp in "tailscale version" doesn't have | |
# "-dirty" suffix. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Maintainer: Timothy Gu <timothygu99@gmail.com> | |
# Contributor: Morten Linderud <foxboron@archlinux.org> | |
# Contributor: David Anderson <dave@natulte.net> | |
pkgname=tailscale-git | |
_pkgname=tailscale | |
pkgver=1.81.140+t75a03fc71 | |
pkgrel=1 | |
pkgdesc="A mesh VPN that makes it easy to connect your devices, wherever they are." | |
arch=("x86_64" "aarch64" "powerpc64le" "riscv64") | |
url="https://tailscale.com" | |
license=("MIT") | |
makedepends=("git" "go") | |
depends=("glibc") | |
optdepends=('networkmanager: DNS resolver integration' | |
'openresolv: DNS resolver integration' | |
'systemd: DNS resolver integration with systemd-resolved') | |
provides=($_pkgname) | |
conflicts=($_pkgname) | |
backup=("etc/default/tailscaled") | |
source=("git+https://github.com/tailscale/$_pkgname.git") | |
sha256sums=('SKIP') | |
install="tailscale.install" | |
pkgver() { | |
cd "${_pkgname}" | |
eval "$(./build_dist.sh shellvars)" | |
echo "$VERSION_LONG" | sed 's/-/+/g' | |
} | |
prepare() { | |
cd "${_pkgname}" | |
case "$CARCH" in | |
"x86_64"|"aarch64") | |
TOOLCHAIN="$PWD/../tailscale-go" tool/go mod vendor | |
;; | |
*) | |
go mod vendor | |
;; | |
esac | |
# go mod vendor can contribute some changes to go.mod or go.sum. | |
# Revert them so that the version stamp in "tailscale version" doesn't have | |
# "-dirty" suffix. | |
git restore go.mod go.sum | |
} | |
build() { | |
cd "${_pkgname}" | |
# https://wiki.archlinux.org/title/Go_package_guidelines#Flags_and_build_options | |
export CGO_CPPFLAGS="${CPPFLAGS}" | |
export CGO_CFLAGS="${CFLAGS}" | |
export CGO_CXXFLAGS="${CXXFLAGS}" | |
export CGO_LDFLAGS="${LDFLAGS}" | |
export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" | |
# The version stamp flags mirror build_dist.sh. However, we have to | |
# duplicate that logic since we also want to set -linkmode=external, and Go | |
# has no way of merging ldflags specified through GOFLAGS with those in the | |
# command line: https://github.com/golang/go/issues/26849 | |
eval "$(./build_dist.sh shellvars)" | |
GO_LDFLAGS="\ | |
-linkmode=external \ | |
-X tailscale.com/version.longStamp=${VERSION_LONG} \ | |
-X tailscale.com/version.shortStamp=${VERSION_SHORT}" | |
for cmd in ./cmd/tailscale ./cmd/tailscaled; do | |
TOOLCHAIN="$PWD/../tailscale-go" ./build_dist.sh -ldflags "$GO_LDFLAGS" $cmd | |
done | |
} | |
#TODO: Figure out why tests are failing | |
# check() { | |
# cd "${_pkgname}" | |
# go test $(go list ./... | grep -v tsdns_test) | |
# } | |
package() { | |
cd "${_pkgname}" | |
install -Dm755 tailscale tailscaled -t "$pkgdir/usr/bin" | |
install -Dm644 cmd/tailscaled/tailscaled.defaults "$pkgdir/etc/default/tailscaled" | |
install -Dm644 cmd/tailscaled/tailscaled.service -t "$pkgdir/usr/lib/systemd/system" | |
install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment