From c32e0b2040dfad2cbe2037bb5b42f5e14fce3f9d Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Thu, 16 Nov 2023 19:54:36 +0000 Subject: [PATCH 1/3] Update README.rst with 2023.11.16 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 9a3b67d..3345164 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2023.11.16: ``3757ed82161113fed4c711fd7332e922265eeeb54e6e4f657a08ea82d57cc3a2`` - 2023.11.07: ``91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784`` - 2023.08.03: ``963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8`` - 2023.07.25: ``eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323`` From cb148ad4ad9b6abd72e7a7139601c0b5002af169 Mon Sep 17 00:00:00 2001 From: Shane Lee Date: Tue, 2 Jan 2024 14:26:40 -0700 Subject: [PATCH 2/3] Add arm support for Debian 10 --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 44b7235..e415e27 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1522,9 +1522,9 @@ __check_dpkg_architecture() { if [ "$_CUSTOM_REPO_URL" != "null" ]; then warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents." else - # Saltstack official repository has arm64 metadata beginning with Debian 11, + # Saltstack official repository has arm64 metadata beginning with Debian 10, # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent - if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then + if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then __REPO_ARCH="amd64" else __REPO_ARCH="arm64" From 8aa272b2363c373248a51b448682673fb4b908bb Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Thu, 4 Jan 2024 22:32:10 +0000 Subject: [PATCH 3/3] Update develop branch for the v2024.01.04 release --- CHANGELOG.md | 8 ++++++++ bootstrap-salt.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 090531c..0d98bc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v2024.01.04 + +## What's Changed + +- Add arm support for Debian 10 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/1981 + +**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2023.11.16...v2024.01.04 + # v2023.11.16 ## What's Changed diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e415e27..c632146 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2023.11.16" +__ScriptVersion="2024.01.04" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"