Fix #1142: allow git install on Raspbian 9

This commit is contained in:
Denys Havrysh 2017-09-08 09:41:14 +03:00
parent f24508bc3e
commit ca7a90d00e
2 changed files with 4 additions and 3 deletions

View file

@ -206,7 +206,7 @@ listed on the official supported operating systems document, the level of suppor
Since Salt is written in Python, the packages available from `SaltStack's corporate repository`_ Since Salt is written in Python, the packages available from `SaltStack's corporate repository`_
are CPU architecture independent and could be installed on any hardware supported by Linux kernel. are CPU architecture independent and could be installed on any hardware supported by Linux kernel.
However, SaltStack does package Salt's binary dependencies only for ``x86_64`` (``amd64``) and However, SaltStack does package Salt's binary dependencies only for ``x86_64`` (``amd64``) and
``AArch32`` (``armhf``), which is limited for Debian/Raspbian 8 platforms. ``AArch32`` (``armhf``). The latter is available only for Debian/Raspbian 8 platforms.
It is recommended to use ``git`` bootstrap mode as described above to install Salt on other It is recommended to use ``git`` bootstrap mode as described above to install Salt on other
architectures, such as ``x86`` (``i386``), ``AArch64`` (``arm64``) or ``ARM EABI`` (``armel``). architectures, such as ``x86`` (``i386``), ``AArch64`` (``arm64``) or ``ARM EABI`` (``armel``).
@ -232,7 +232,7 @@ Debian and derivatives
- Debian GNU/Linux 7/8/9 - Debian GNU/Linux 7/8/9
- Linux Mint Debian Edition 1 (based on Debian 8) - Linux Mint Debian Edition 1 (based on Debian 8)
- Kali Linux 1.0 (based on Debian 7) - Kali Linux 1.0 (based on Debian 7)
- Raspbian 8 (``armhf``) - Raspbian 8 (``armhf`` packages) and 9 (using ``git`` installation mode only)
Debian Best Effort Support: Testing Release Debian Best Effort Support: Testing Release
******************************************* *******************************************

View file

@ -1408,6 +1408,7 @@ __debian_derivatives_translation() {
kali_1_debian_base="7.0" kali_1_debian_base="7.0"
linuxmint_1_debian_base="8.0" linuxmint_1_debian_base="8.0"
raspbian_8_debian_base="8.0" raspbian_8_debian_base="8.0"
raspbian_9_debian_base="9.0"
# Translate Debian derivatives to their base Debian version # Translate Debian derivatives to their base Debian version
match=$(echo "$DISTRO_NAME_L" | egrep ${DEBIAN_DERIVATIVES}) match=$(echo "$DISTRO_NAME_L" | egrep ${DEBIAN_DERIVATIVES})
@ -1432,7 +1433,7 @@ __debian_derivatives_translation() {
;; ;;
esac esac
_debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base") _debian_version=$(eval echo "\$${_debian_derivative}_${_major}_debian_base" 2>/dev/null)
if [ "$_debian_version" != "" ]; then if [ "$_debian_version" != "" ]; then
echodebug "Detected Debian $_debian_version derivative" echodebug "Detected Debian $_debian_version derivative"