Fix ReSukiSU version metadata in WSA builds

Author: Ognisty321

.github/workflows/build.yml

@@ -60,6 +60,16 @@ jobs:
           submodules: recursive
           fetch-depth: 1
 
+      - name: Hydrate and validate ReSukiSU version history
+        run: |
+          set -euo pipefail
+          if [ "$(git -C KernelSU rev-parse --is-shallow-repository)" = "true" ]; then
+            git -C KernelSU fetch --unshallow --tags origin
+          fi
+          resukisu_version="$(scripts/wsa-resukisu-version.sh KernelSU)"
+          echo "ReSukiSU version code: $resukisu_version"
+          echo "RESUKISU_VERSION_CODE=$resukisu_version" >> "$GITHUB_ENV"
+
       - name: Install build dependencies
         run: |
           sudo apt-get update
@@ -96,6 +106,7 @@ jobs:
           set -e
           cp configs/wsa/config-wsa-x64 .config
           ./scripts/config --file .config --set-str LOCALVERSION '-WSA-ReSukiSU'
+          ./scripts/config --file .config --set-str KSU_FULL_NAME_FORMAT '%TAG_NAME%-%COMMIT_SHA%@%REPO_NAME% (%KSU_VERSION%)'
           ./scripts/config --file .config \
             -e KSU \
             -d KSU_DEBUG \
@@ -128,6 +139,14 @@ jobs:
           set -e
           make ARCH=x86_64 LLVM=1 CC="ccache clang" -j"$(nproc)" bzImage
 
+      - name: Verify embedded ReSukiSU version
+        run: |
+          set -euo pipefail
+          version_object="$(find KernelSU/kernel -path '*/supercall/dispatch.o' -type f -print -quit)"
+          test -n "$version_object"
+          strings "$version_object" | grep -F "($RESUKISU_VERSION_CODE)"
+          echo "Embedded ReSukiSU version verified: $RESUKISU_VERSION_CODE"
+
       - name: Inspect output
         id: inspect
         run: |

KernelSU

@@ -54,6 +54,15 @@ if git -C KernelSU rev-parse --is-inside-work-tree >/dev/null 2>&1; then
 	kv kernelsu_commit "$(git -C KernelSU rev-parse HEAD 2>/dev/null || printf unknown)"
 	kv kernelsu_branch "$(git -C KernelSU rev-parse --abbrev-ref HEAD 2>/dev/null || printf unknown)"
 	kv kernelsu_dirty "$(git_tracked_dirty KernelSU)"
+	kernelsu_shallow="$(git -C KernelSU rev-parse --is-shallow-repository)"
+	kv kernelsu_shallow "$kernelsu_shallow"
+	if [ "$kernelsu_shallow" = "true" ]; then
+		printf 'cannot generate release metadata from shallow ReSukiSU history\n' >&2
+		exit 1
+	fi
+	kernelsu_commit_count="$(git -C KernelSU rev-list --count HEAD)"
+	kv kernelsu_commit_count "$kernelsu_commit_count"
+	kv kernelsu_version_code "$((30000 + kernelsu_commit_count + 700))"
 	if [ -f KernelSU/kernel/kpm/kpm_loader_x86_64.h ]; then
 		loader_name="$(sed -n 's/^#define SUKISU_KPM_LOADER_NAME "\(.*\)"/\1/p' KernelSU/kernel/kpm/kpm_loader_x86_64.h)"
 		loader_semver="$(sed -n 's/^#define SUKISU_KPM_LOADER_SEMVER "\(.*\)"/\1/p' KernelSU/kernel/kpm/kpm_loader_x86_64.h)"

scripts/wsa-release-manifest.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REPO="${1:-KernelSU}"
+MINIMUM_VERSION="${MINIMUM_RESUKISU_VERSION:-35002}"
+
+if ! git -C "$REPO" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+	printf 'ReSukiSU repository not found: %s\n' "$REPO" >&2
+	exit 1
+fi
+
+if [ "$(git -C "$REPO" rev-parse --is-shallow-repository)" = "true" ]; then
+	printf 'shallow ReSukiSU history cannot produce a valid version code: %s\n' "$REPO" >&2
+	printf 'fetch the complete history before building\n' >&2
+	exit 1
+fi
+
+COMMIT_COUNT="$(git -C "$REPO" rev-list --count HEAD)"
+case "$COMMIT_COUNT" in
+	''|*[!0-9]*)
+		printf 'invalid ReSukiSU commit count: %s\n' "$COMMIT_COUNT" >&2
+		exit 1
+		;;
+esac
+
+VERSION_CODE=$((30000 + COMMIT_COUNT + 700))
+if [ "$VERSION_CODE" -lt "$MINIMUM_VERSION" ]; then
+	printf 'ReSukiSU version %s is below the supported minimum %s\n' \
+		"$VERSION_CODE" "$MINIMUM_VERSION" >&2
+	exit 1
+fi
+
+printf '%s\n' "$VERSION_CODE"

scripts/wsa-resukisu-version.sh

@@ -135,6 +135,25 @@ fi
 actual_artifact_sha="$(sha256sum "$artifact" | awk '{ print $1 }')"
 check_equal artifact_sha256 "$expected_artifact_sha" "$actual_artifact_sha"
 
+expected_kernelsu_shallow="$(required_value kernelsu_shallow)"
+check_equal kernelsu_shallow false "$expected_kernelsu_shallow"
+
+expected_kernelsu_commit_count="$(required_value kernelsu_commit_count)"
+expected_kernelsu_version_code="$(required_value kernelsu_version_code)"
+case "$expected_kernelsu_commit_count:$expected_kernelsu_version_code" in
+	*[!0-9:]*|:*|*:)
+		printf 'invalid ReSukiSU version metadata in manifest\n' >&2
+		exit 1
+		;;
+esac
+calculated_kernelsu_version_code="$((30000 + expected_kernelsu_commit_count + 700))"
+check_equal kernelsu_version_code "$calculated_kernelsu_version_code" "$expected_kernelsu_version_code"
+if [ "$expected_kernelsu_version_code" -lt 35002 ]; then
+	printf 'kernelsu_version_code is below the supported minimum: %s\n' \
+		"$expected_kernelsu_version_code" >&2
+	failures=1
+fi
+
 if [ "$SKIP_SOURCE" != "1" ] && git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
 	expected_kernel_commit="$(required_value kernel_commit)"
 	actual_kernel_commit="$(git rev-parse HEAD)"
@@ -152,6 +171,15 @@ if [ "$SKIP_SOURCE" != "1" ] && git rev-parse --is-inside-work-tree >/dev/null 2
 		expected_kernelsu_dirty="$(required_value kernelsu_dirty)"
 		actual_kernelsu_dirty="$(git_tracked_dirty KernelSU)"
 		check_equal kernelsu_dirty "$expected_kernelsu_dirty" "$actual_kernelsu_dirty"
+
+		actual_kernelsu_shallow="$(git -C KernelSU rev-parse --is-shallow-repository)"
+		check_equal kernelsu_shallow "$expected_kernelsu_shallow" "$actual_kernelsu_shallow"
+
+		actual_kernelsu_commit_count="$(git -C KernelSU rev-list --count HEAD)"
+		check_equal kernelsu_commit_count "$expected_kernelsu_commit_count" "$actual_kernelsu_commit_count"
+
+		actual_kernelsu_version_code="$((30000 + actual_kernelsu_commit_count + 700))"
+		check_equal kernelsu_version_code "$expected_kernelsu_version_code" "$actual_kernelsu_version_code"
 	fi
 fi