From 7fc46cdfda31b3dd5323f4299cdea89f5e921130 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 12 Sep 2022 17:57:21 -0700 Subject: [PATCH 1/2] Ensure the REPO_ARCH for Arm64 is correct. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 65e8f04..e8fe1ea 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1440,7 +1440,7 @@ __check_dpkg_architecture() { else # Saltstack official repository does not yet have arm64 metadata, # use amd64 repositories on arm64, since all pkgs are arch-independent - __REPO_ARCH="amd64" + __REPO_ARCH="arm64" __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]" warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository." fi From 3b833c217a3a7007bfa18334f7d39275b63ed39a Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Tue, 13 Sep 2022 08:06:50 -0700 Subject: [PATCH 2/2] fixing mention of amd64 which should be arm64. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e8fe1ea..7804091 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1439,7 +1439,7 @@ __check_dpkg_architecture() { warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents." else # Saltstack official repository does not yet have arm64 metadata, - # use amd64 repositories on arm64, since all pkgs are arch-independent + # use arm64 repositories on arm64, since all pkgs are arch-independent __REPO_ARCH="arm64" __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]" warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository."