From 554a5583ab73db71b09a20b56ea4e26c8e960082 Mon Sep 17 00:00:00 2001
From: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:03:12 -0300
Subject: [PATCH] fix(build-apt-repo): add ubuntu20.04/focal + default to xCAT
 Signing Key

Adds the missing focal (20.04) codename and switches the default apt signing
identity from the legacy xcat@megware.com key to the xCAT Signing Key
(64C82A868D818E69) so xcat-dep apt InRelease is signed by the same key as
xcat-core apt.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
---
 build-apt-repo.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-apt-repo.sh b/build-apt-repo.sh
index 7a2b8ca..ce4400d 100755
--- a/build-apt-repo.sh
+++ b/build-apt-repo.sh
@@ -9,11 +9,14 @@ fi
 
 REPO_ROOT="$SCRIPT_DIR"
 APT_DIR=""
-GPG_KEY_ID="xcat@megware.com"
+# Default to the xCAT Signing Key (same key that signs xcat-core), NOT the legacy megware key,
+# so xcat-dep apt InRelease is signed by the same key as xcat-core apt. Override with --gpg-key-id.
+GPG_KEY_ID="64C82A868D818E69"
 SKIP_SIGN=0
 DRY_RUN=0
 
 declare -A CODENAME_MAP=(
+    [ubuntu20.04]=focal
     [ubuntu22.04]=jammy
     [ubuntu24.04]=noble
     [ubuntu26.04]=resolute