saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow arm64 installation on Debian systems

Browse source 
Previously, AArch64 machines ('arm64' DPKG architecture) were not
supported due to missing repository metadata.

- relax bail-out condition in DPKG machine architecture check to
  allow arm64; print a warning about experimental support;
- if no custom repo is defined, default to re-using amd64 repo on
  arm64 since all packages are arch-independent;

Fixes: https://github.com/saltstack/salt-bootstrap/issues/1240

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
This commit is contained in:
Alexandru Avadanii 2018-06-24 19:41:20 +02:00
parent 372526350a
commit 6ad614bd4a
No known key found for this signature in database
GPG key ID: 2707869B060FC8D9
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bootstrap-salt.sh
View file

@ -1315,6 +1315,7 @@ __check_dpkg_architecture() {
fi
__REPO_ARCH="$DPKG_ARCHITECTURE"
__REPO_ARCH_DEB='deb'
__return_code=0
case $DPKG_ARCHITECTURE in
@ -1326,6 +1327,18 @@ __check_dpkg_architecture() {
"amd64")
error_msg=""
;;
"arm64")
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 does not yet have arm64 metadata,
# use amd64 repositories on arm64, since all pkgs are arch-independent
__REPO_ARCH="amd64"
__REPO_ARCH_DEB="deb [arch=$__REPO_ARCH]"
warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository."
fi
error_msg=""
;;
"armhf")
if [ "$DISTRO_NAME_L" = "ubuntu" ] || [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then
error_msg="Support for armhf packages at $_REPO_URL is limited to Debian/Raspbian 8 platforms."
@ -1340,6 +1353,11 @@ __check_dpkg_architecture() {
;;
esac
if [ "${warn_msg}" != "" ]; then
# AArch64: Do not fail at this point, but warn the user about experimental support
# See https://github.com/saltstack/salt-bootstrap/issues/1240
echowarn "${warn_msg}"
fi
if [ "${error_msg}" != "" ]; then
echoerror "${error_msg}"
if [ "$ITYPE" != "git" ]; then
@ -2611,7 +2629,7 @@ __install_saltstack_ubuntu_repository() {
# SaltStack's stable Ubuntu repository:
SALTSTACK_UBUNTU_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/ubuntu/${UBUNTU_VERSION}/${__REPO_ARCH}/${STABLE_REV}"
echo "deb $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/saltstack.list
echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/saltstack.list
__apt_key_fetch "$SALTSTACK_UBUNTU_URL/SALTSTACK-GPG-KEY.pub" || return 1
@ -3010,7 +3028,7 @@ __install_saltstack_debian_repository() {
# amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location
SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}"
echo "deb $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
__apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALTSTACK-GPG-KEY.pub" || return 1