From a1f025980a51e6869ab2cef15bbf6bd7788e0ff0 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 23 Jun 2015 16:38:39 -0600 Subject: [PATCH 1/2] minor update for raspbian --- bootstrap/_deb_common.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh index 653daca53..6bb8479c8 100755 --- a/bootstrap/_deb_common.sh +++ b/bootstrap/_deb_common.sh @@ -9,7 +9,11 @@ # - 6.0.10 "squeeze" (x64) # - 7.8 "wheezy" (x64) # - 8.0 "jessie" (x64) +# - Raspbian: +# - 7.8 (armhf) +apt-get update +apt-get install -y lsb-release # virtualenv binary can be found in different packages depending on # distro version (#346) @@ -43,7 +47,6 @@ fi # #276, https://github.com/martinpaljak/M2Crypto/issues/62, # M2Crypto setup.py:add_multiarch_paths -apt-get update apt-get install -y --no-install-recommends \ git-core \ python \ From fba2de706e2591dfcb79e9963707082f968ad2a2 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Wed, 24 Jun 2015 13:29:26 -0600 Subject: [PATCH 2/2] move lsb install into newer with --no-install-recommends --- bootstrap/_deb_common.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh index 6bb8479c8..a4dff6b1c 100755 --- a/bootstrap/_deb_common.sh +++ b/bootstrap/_deb_common.sh @@ -12,12 +12,11 @@ # - Raspbian: # - 7.8 (armhf) -apt-get update -apt-get install -y lsb-release # virtualenv binary can be found in different packages depending on # distro version (#346) newer () { + apt-get install -y lsb-release --no-install-recommends distro=$(lsb_release -si) # 6.0.10 => 60, 14.04 => 1404 # TODO: in sid version==unstable @@ -33,6 +32,8 @@ newer () { fi } +apt-get update + # you can force newer if lsb_release is not available (e.g. Docker # debian:jessie base image) if [ "$1" = "newer" ] || newer