omarandClaude Opus 5
a8f2b0f068
PKG_VERSION/PKG_RELEASE were hand-written literals nobody bumped, so
v0.2.2 … v0.2.6 all shipped as `shaterd 0.2.0-r3` with different binaries
inside (v0.2.6's ELF is 5 491 616 B against r2's 5 488 336 B). Both opkg
and apk offer an upgrade only when the feed's version string differs from
the installed one, so `apk update` saw nothing new and the routers could
not be updated through the normal path at all.
ci/version.sh is now the single source of truth. It derives the version
from `git describe`:
tag `vX.Y.Z` -> PKG_VERSION=X.Y.Z PKG_RELEASE=1
off-tag build -> nearest tag + PKG_RELEASE=<commits since it> + 1
no tag/no git -> 0.0.0-r1 (below everything ever published)
Ordering verified with the real tools, not from memory — apk-tools 3.0.3
(`apk version -t`) and opkg 38eccbb1 (`opkg compare-versions`) agree that
0.2.0-r3 < 0.2.6-r2 < 0.2.6-r10 < 0.2.6-r12 < 0.2.7-r1 < 0.3.0-r1, so a
release always outranks the rolling builds that preceded it and rolling
builds grow monotonically between releases.
The value travels as SHATER_PKG_VERSION/SHATER_PKG_RELEASE in the SDK
build environment of BOTH lanes; the Makefiles keep a literal fallback so
a manual/offline build still works with no CI and no git. Because the
hand-off crosses docker, `su` and make's env import, ci/sdk-build.sh and
ci/sdk-build-apk.sh now ASSERT that the produced .ipk/.apk really carries
that version — the B4 failure mode was a stale version shipping silently,
and that can no longer happen quietly.
The binary agrees with the package: scripts/build-shaterd.sh takes
constant.Version from the same ci/version.sh (vX.Y.Z-rR[-g<sha>]) instead
of its own `git describe`, and the workflow computes it once per job.
Both build jobs now check out with fetch-depth: 0 — `git describe` needs
tags and ancestry, which the default shallow checkout has neither of.
byedpi is deliberately left alone: PKG_VERSION:=0.17.3 is upstream
ByeDPI's own version, what PKG_HASH pins and what tells an operator which
ByeDPI is installed. Stamping our tag on it would also be a downgrade —
every comparator reads 0.2.7 < 0.17.3 (component-wise, 2 < 17), verified.
Docs: INSTALL.md gains §2.1 (the scheme + the ordering evidence), and the
update sections of §5/§6 now explicitly warn against a bare `opkg upgrade`
/ `apk upgrade` and give the targeted form instead, quoting apk-tools 3:
"If list of packages is provided, only those packages are upgraded along
with needed dependencies". README.md and the release bodies match.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
41 lines
1.9 KiB
Makefile
41 lines
1.9 KiB
Makefile
#
|
|
# luci-app-shater — thin LuCI launcher for the Shater v0.2 stack.
|
|
#
|
|
# A deliberately minimal, client-side-JS LuCI app (no server-side Lua CBI): one
|
|
# page under Services that shows a mini data-plane dashboard and an "Open panel"
|
|
# button. The RICH UI is the separate embedded admin panel served by shaterd on
|
|
# its own port; this app only (a) reads `shaterd status` and (b) mints a single-
|
|
# use handoff token so the browser can open the panel with a session
|
|
# (docs-shater/ARCHITECTURE.md §2).
|
|
#
|
|
# Backend: a tiny rpcd exec plugin (root/usr/libexec/rpcd/shater) that shells out
|
|
# to the `shaterd` CLI (`status`, `mint-token`) — no AF_UNIX client needed on the
|
|
# router. Pure data + scripts => PKGARCH:=all.
|
|
#
|
|
# luci.mk (auto package def, JS minify, i18n subpackages, cache-clear postinst)
|
|
# lives in the luci feed. This package is built OUT OF TREE (openwrt/), copied
|
|
# into the OpenWrt/SDK tree with the luci feed installed, so we include it via the
|
|
# canonical feeds path rather than the in-feed-relative `../../luci.mk`.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
LUCI_TITLE:=LuCI thin launcher for Shater (mini dashboard + panel handoff)
|
|
LUCI_DEPENDS:=+shater-core +rpcd
|
|
LUCI_PKGARCH:=all
|
|
|
|
# Version comes from the git tag via ci/version.sh -> SHATER_PKG_VERSION /
|
|
# SHATER_PKG_RELEASE in the SDK build env (see openwrt/shaterd/Makefile for the
|
|
# full rationale — bug B4). The literals are the manual/offline fallback only.
|
|
# These MUST stay above the luci.mk include: luci.mk only defaults PKG_VERSION/
|
|
# PKG_RELEASE when they are still unset, and the i18n subpackages inherit them.
|
|
PKG_VERSION:=$(if $(SHATER_PKG_VERSION),$(SHATER_PKG_VERSION),0.2.0)
|
|
PKG_RELEASE:=$(if $(SHATER_PKG_RELEASE),$(SHATER_PKG_RELEASE),1)
|
|
|
|
PKG_MAINTAINER:=Shater <maqrota@icloud.com>
|
|
PKG_LICENSE:=GPL-3.0-or-later
|
|
|
|
include $(TOPDIR)/feeds/luci/luci.mk
|
|
|
|
# call BuildPackage - OpenWrt buildroot signature to be used by luci.mk
|