From b7ff3a32c79870875fa4ba7bf1faef41424df59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 24 Aug 2026 19:00:49 -0400 Subject: [PATCH] Keyring build: .key source names so makepkg does not treat them as sigs Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01QKxGW1raAWaqeU8WdHsMsp --- packages/build-keyring.sh | 3 ++- packages/omarchycn-keyring/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/build-keyring.sh b/packages/build-keyring.sh index df047bd2..82603a66 100755 --- a/packages/build-keyring.sh +++ b/packages/build-keyring.sh @@ -10,7 +10,8 @@ set -euo pipefail pacman -Sy --noconfirm --quiet base-devel > /dev/null useradd -m builder cp -r /src/packages/omarchycn-keyring /home/builder/pkg -cp /src/cn/keys/omarchycn-registry.asc /src/cn/keys/omarchycn-release.asc /home/builder/pkg/ +cp /src/cn/keys/omarchycn-registry.asc /home/builder/pkg/omarchycn-registry.key +cp /src/cn/keys/omarchycn-release.asc /home/builder/pkg/omarchycn-release.key chown -R builder /home/builder/pkg cd /home/builder/pkg sudo -u builder makepkg --noconfirm diff --git a/packages/omarchycn-keyring/PKGBUILD b/packages/omarchycn-keyring/PKGBUILD index b988e22d..84f2facb 100644 --- a/packages/omarchycn-keyring/PKGBUILD +++ b/packages/omarchycn-keyring/PKGBUILD @@ -6,11 +6,11 @@ arch=(any) url="https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn" license=(MIT) install=omarchycn-keyring.install -source=(omarchycn-registry.asc omarchycn-release.asc omarchycn-trusted) +source=(omarchycn-registry.key omarchycn-release.key omarchycn-trusted) sha256sums=(SKIP SKIP SKIP) build() { - cat omarchycn-registry.asc omarchycn-release.asc | gpg --dearmor > omarchycn.gpg + cat omarchycn-registry.key omarchycn-release.key | gpg --dearmor > omarchycn.gpg } package() {