Merge branch 'features/source-build' into development

packaging/alpine/local/seaweedfs/APKBUILD

@@ -7,7 +7,7 @@ url="https://github.com/seaweedfs/seaweedfs"
 arch="x86_64 aarch64"
 license="Apache-2.0"
 depends="ca-certificates /bin/sh"
-makedepends="build-base cargo rust protobuf-dev"
+makedepends="build-base cargo go protobuf-dev rust"
 provides="!$pkgname-openrc cmd:weed=$pkgver-r$pkgrel"
 install="$pkgname.pre-install"
 subpackages="
@@ -24,21 +24,12 @@ subpackages="
 	$pkgname-worker-lance:_worker_lance
 	$pkgname-worker-lance-openrc:_openrc_worker_lance:noarch
 	"
-options="!check !strip !tracedeps"
-
-case "$CARCH" in
-	x86_64)
-		_archive="$pkgname-$pkgver-linux-amd64.tar.gz"
-		;;
-	aarch64)
-		_archive="$pkgname-$pkgver-linux-arm64.tar.gz"
-		;;
-esac
+options="!strip !tracedeps"
 
 source="
-	$pkgname-$pkgver-linux-amd64.tar.gz::https://github.com/seaweedfs/seaweedfs/releases/download/$pkgver/linux_amd64.tar.gz
-	$pkgname-$pkgver-linux-arm64.tar.gz::https://github.com/seaweedfs/seaweedfs/releases/download/$pkgver/linux_arm64.tar.gz
 	$pkgname-$pkgver-src.tar.gz::https://github.com/seaweedfs/seaweedfs/archive/refs/tags/$pkgver.tar.gz
+	$pkgname-$pkgver-go-vendor.tar.gz
+	$pkgname-$pkgver-cargo-vendor.tar.gz
 	admin.toml
 	credential.toml
 	example-admin.toml
@@ -66,22 +57,31 @@ source="
 	weed.bash-completion
 	"
 
-builddir="$srcdir"
-_worker_builddir="$builddir/$pkgname-$pkgver/seaweed-worker"
+_worker_builddir="$srcdir/$pkgname-$pkgver/seaweed-worker"
 
 prepare() {
 	default_prepare
-	tar -xzf "$srcdir/$_archive" -C "$builddir"
-	tar -xzf "$srcdir/$pkgname-$pkgver-src.tar.gz" -C "$builddir"
+	tar -xzf "$srcdir/$pkgname-$pkgver-go-vendor.tar.gz" -C "$builddir"
+	tar -xzf "$srcdir/$pkgname-$pkgver-cargo-vendor.tar.gz" -C "$_worker_builddir"
+	mkdir -p "$_worker_builddir/.cargo"
+	mv "$_worker_builddir/cargo-vendor-config.toml" "$_worker_builddir/.cargo/config.toml"
 }
 
 build() {
+	go build -mod=vendor -buildvcs=false -trimpath -o "$builddir/weed-bin" ./weed
+
 	cd "$_worker_builddir"
-	cargo build --locked --release -p weed-lance-worker
+	cargo build --frozen --locked --release -p weed-lance-worker
+}
+
+check() {
+	"$builddir/weed-bin" version
+	"$builddir/weed-bin" scaffold -config master >/dev/null
+	"${CARGO_TARGET_DIR:-$_worker_builddir/target}/release/weed-worker" --help >/dev/null
 }
 
 package() {
-	install -Dm755 "$srcdir"/weed "$pkgdir"/usr/bin/weed
+	install -Dm755 "$builddir"/weed-bin "$pkgdir"/usr/bin/weed
 	install -Dm755 "${CARGO_TARGET_DIR:-$_worker_builddir/target}/release/weed-worker" \
 		"$pkgdir"/usr/bin/weed-worker
 	local _config
@@ -137,18 +137,19 @@ _bashcomp() {
 }
 
 sha512sums="
-cf446e4a70451fd46923416d2a048d8f0b6ee4eba91911acb71ed4ed572a91f17d823d33f31cef5ce592cf622e15468bf41e0f373d1c6cafb3039d6fd3b758e9  seaweedfs-4.48-linux-amd64.tar.gz
-fd4d4947dc4587ec943ad4c11e0a6bc4d3cd1c59ad45299cf84bcbc8d25a2b8745fd426343087928bedc50e168b4448d2d358a2356974a3d8cdc3bfce04bbe48  seaweedfs-4.48-linux-arm64.tar.gz
 91a34fec9bb78832f421b54dd823adb1c1690b746083d947c5f72e4ad7670362512bbb920432f42342482774fd8be2b396645ff3bc764b10f328432601733fe3  seaweedfs-4.48-src.tar.gz
-4f24760848c909fdee1ae8569ef7ef7cbec2c885d891a543d7beddee492bddbf266e6789601095a86798d1b00256782c45297ea36cdb527bb6b64980dd02486a  admin.toml
+25020f7fce02672fd716a0d35fa45b6a55833dbb23f6dc17598478077f0f6d84bb9071da32ce061801c22c8c64990ec93ac7403887c494eff81cd2e1f8875a62  seaweedfs-4.48-go-vendor.tar.gz
+10ac7b7d877936559454c253303ab1b21cc125a662122f1129036763a914295f8cae2303f61f806dbf39cbcd1725be95a612f545f2295ac6f19d32357952949c  seaweedfs-4.48-cargo-vendor.tar.gz
+58be6587b082f45b4dd22ad8ebb1b8bf84cea2a7c0cb6b4ad4a749ac0bfdf92d10d22281a432f9e5a87afa0b940cd0172671a292fbe17803e56425cd940d47f9  admin.toml
+7f77ad8787629e3defbc89e39e5432482aa50d87ddd723de927a9c6c77b14b1673cbf5b3fc3c18dd7d0eba26fbcd4220d2da6939ed097d0294b24ccd5c002635  credential.toml
 507b389f6373b5f4d8ca69f27bc806b39bda8edf7f58e4f32720958e7782ee171dd0461bdecb285e5a8bf2cf4ea3d6cbe8b62ae6ac43c2a40d0eb053d50a22f8  example-admin.toml
 7105de7053654b8c0502521ce58585915fc831c3152801e1db02b1c5214dc3c3ed31f4fc18000665d8338c7a10ffbf0d248368bef2ef3a6d37d46cd856398366  example-credential.toml
-64821eba8661b39b94016a7ca3fa37b74154dcc998bcb9978a6b9983a58741ff28a2984db3c0789595d1864354f83b33cf6bb31b014ffd71ebd6570d8760dc26  example-filer.toml
-e5753bd0bcc60dc84428c40ba556c08acae61dec083a5b76640125f637532e7c5759a72cdfd95114222a7a0901a916ec3c4d12f306853cfca0fe9a0b1857893e  example-master.toml
+c6ec4fc7709c42dc6771b5039203c44cbd693742abcd7720936c00b1bd5f99bb2999bb1545680ae4418efedd65d71c234f4602f52ce9d58b1ff7ec53eafb1a1a  example-filer.toml
+59965fd2649a956677c6d4104ff07ff010d6edd1d3733eaa5c5bc01eabe54429c413e35d52ed4a4c0129bfa798e434828b32a5f0ef19dbbe4eab0199faa2738c  example-master.toml
 aea1b3114311304230cb30143825329ef7353a302d094c131ca4e049b847305e2143b76078e6574c6d7d4039c03a2e2d5a4925de80cd7cb2be75b2b522ce47f7  example-volume.toml
 2c200c28172a5d0b1c80ab28e849287e7af8d103355638fd3183b8614d3e2b1b3482132522663f7c6d844e10e13b8c6e23fb5fba0dec2cc83de45c2f17b33477  example-notification.toml
 328cfe43d0c2ebf5092a1178af45c37b07593085135c31649754f0df9fd4c043847c13b56c3c7c45194541db8082309c4845c825d7011e4c3e503b1e6576528d  example-replication.toml
-3b45b0f5bf6c5339cfb63c3ddb489b7122e03996ce380c7a244778ef1e7f6c06b4e3e56ea695a2dc3c9c49322a58df865ff50b2904318abafee5e66b2af757f1  example-security.toml
+b7caad9dff0bb812d4046b8e0285ac4e88a7af3a742a168579df08762da735a025725f78286e17bdd4b19a966a3d7ab88e0e52efbb5cf1c69d7a4ff071390e0f  example-security.toml
 70069f97edf261a2cd0669dd60adad80533609a25d7429254e0c3322d7e80337f5ff69a5581bc39e6a15442098d14d610ce5f0cb14f02c461c8d3dd440b22c56  example-shell.toml
 130b9932f99d0a3ec3c30c74eaf1dc441c1a9252da30e2c5365084f2a0679f58531e6180689c24b71f92cf9a7966b02ea25ee31d356e7118cbb82743d0bfcbd9  filer.toml
 088c3aebc142054af1b54a92a2c5bd30d53be61bdf382f7cae2efef2d917d7b57022d9b494a60f32c7bf56689d4ce2f971e19c98da1d87e27021a3e948035605  master.toml

packaging/alpine/local/seaweedfs/README.md

@@ -1,18 +1,22 @@
 # SeaweedFS Alpine Package
 
-Repackages official SeaweedFS 4.47 Linux release tarballs for `x86_64` and
-`aarch64`.
+Builds SeaweedFS 4.48 from its upstream source release for `x86_64` and
+`aarch64`. The package intentionally builds the upstream baseline feature set,
+without optional build tags. Versioned Go and Cargo vendor archives make the
+build fully offline after source retrieval.
 
 ## Package Commands
 
-Refresh generated sources:
+When updating SeaweedFS, refresh the vendor archives before generating the
+config scaffolds and checksums:
 
 ```sh
+ALPINE_PACKAGE=seaweedfs mise run apk:update-vendor
 ALPINE_PACKAGE=seaweedfs mise run apk:update-generated
 ALPINE_PACKAGE=seaweedfs mise run apk:checksum
 ```
 
-The refresh command generates every SeaweedFS 4.47 scaffold configuration:
+The refresh command generates every SeaweedFS scaffold configuration:
 `admin`, `credential`, `filer`, `master`, `volume`, `notification`,
 `replication`, `security`, and `shell`.
 
@@ -140,5 +144,5 @@ rc-service seaweedfs.master restart
 Pin:
 
 ```sh
-apk add seaweedfs=4.47-r2
+apk add seaweedfs=4.47-r3
 ```

packaging/alpine/local/seaweedfs/scripts/update-generated-sources.sh

@@ -7,29 +7,27 @@ pkgver="$(
   awk -F= '$1 == "pkgver" { print $2; exit }' "${package_dir}/APKBUILD"
 )"
 tmpdir="$(mktemp -d)"
+repo_root="${REPO_ROOT:-$(cd "${package_dir}/../../../.." && pwd)}"
+source_archive="${repo_root}/.cache/apk-distfiles/seaweedfs-${pkgver}-src.tar.gz"
 
 cleanup() {
   rm -rf "${tmpdir}"
 }
 trap cleanup EXIT
 
-case "$(uname -m)" in
-  x86_64)
-    archive="linux_amd64.tar.gz"
-    ;;
-  aarch64|arm64)
-    archive="linux_arm64.tar.gz"
-    ;;
-  *)
-    printf 'unsupported host architecture for SeaweedFS generated sources: %s\n' "$(uname -m)" >&2
-    exit 2
-    ;;
-esac
-
-curl -fsSL \
-  -o "${tmpdir}/${archive}" \
-  "https://github.com/seaweedfs/seaweedfs/releases/download/${pkgver}/${archive}"
-tar -xzf "${tmpdir}/${archive}" -C "${tmpdir}" weed
+if [[ ! -f "${source_archive}" ]]; then
+  source_archive="${tmpdir}/seaweedfs-${pkgver}-src.tar.gz"
+  curl -fsSL \
+    -o "${source_archive}" \
+    "https://github.com/seaweedfs/seaweedfs/archive/refs/tags/${pkgver}.tar.gz"
+fi
+tar -xzf "${source_archive}" -C "${tmpdir}"
+source_dir="${tmpdir}/seaweedfs-${pkgver}"
+tar -xzf "${package_dir}/seaweedfs-${pkgver}-go-vendor.tar.gz" -C "${source_dir}"
+(
+  cd "${source_dir}"
+  go build -mod=vendor -buildvcs=false -trimpath -o "${tmpdir}/weed" ./weed
+)
 
 for config in "${configs[@]}"; do
   "${tmpdir}/weed" scaffold -config "${config}" 2>/dev/null \

packaging/alpine/local/seaweedfs/scripts/update-vendor-sources.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+package_dir="${PACKAGE_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
+pkgver="$(awk -F= '$1 == "pkgver" { print $2; exit }' "${package_dir}/APKBUILD")"
+tmpdir="$(mktemp -d)"
+repo_root="${REPO_ROOT:-$(cd "${package_dir}/../../../.." && pwd)}"
+source_archive="${repo_root}/.cache/apk-distfiles/seaweedfs-${pkgver}-src.tar.gz"
+
+cleanup() {
+  rm -rf "${tmpdir}"
+}
+trap cleanup EXIT
+
+if [[ ! -f "${source_archive}" ]]; then
+  source_archive="${tmpdir}/seaweedfs-${pkgver}-src.tar.gz"
+  curl -fsSL \
+    -o "${source_archive}" \
+    "https://github.com/seaweedfs/seaweedfs/archive/refs/tags/${pkgver}.tar.gz"
+fi
+tar -xzf "${source_archive}" -C "${tmpdir}"
+source_dir="${tmpdir}/seaweedfs-${pkgver}"
+
+(
+  cd "${source_dir}"
+  go mod vendor
+)
+(
+  cd "${source_dir}/seaweed-worker"
+  cargo vendor --locked vendor > cargo-vendor-config.toml
+)
+
+tar --sort=name --mtime='@0' --owner=0 --group=0 --numeric-owner \
+  -C "${source_dir}" -czf "${package_dir}/seaweedfs-${pkgver}-go-vendor.tar.gz" vendor
+tar --sort=name --mtime='@0' --owner=0 --group=0 --numeric-owner \
+  -C "${source_dir}/seaweed-worker" \
+  -czf "${package_dir}/seaweedfs-${pkgver}-cargo-vendor.tar.gz" \
+  vendor cargo-vendor-config.toml