From d1e32f80a64bc4d590634c2127f79a2474bec48d Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Mon, 7 Dec 2015 13:03:59 -0800 Subject: [PATCH] Run package-intalls with py3k if we must Use dib-python to run package-installs using the provided python version. Automatically detect the python version for our package-installs-squash since that runs outside the chroot. Change-Id: I926022bcf8cbcd81b051026ffd5d6477650045ad --- elements/dib-python/pre-install.d/01-dib-python | 4 +--- elements/package-installs/bin/package-installs-v2 | 2 +- elements/package-installs/element-deps | 1 + .../package-installs/extra-data.d/99-squash-package-install | 4 +++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/elements/dib-python/pre-install.d/01-dib-python b/elements/dib-python/pre-install.d/01-dib-python index 57ae94ed8..1868573ef 100755 --- a/elements/dib-python/pre-install.d/01-dib-python +++ b/elements/dib-python/pre-install.d/01-dib-python @@ -6,9 +6,7 @@ fi set -eu set -o pipefail -which which || install-packages which - -python_path=$(which python2 || which python3) +python_path=$(command -v python2 || command -v python3) if [ -z "$python_path" ]; then echo "Could not find python2 or python3 executable." exit 1 diff --git a/elements/package-installs/bin/package-installs-v2 b/elements/package-installs/bin/package-installs-v2 index d5fe4d844..855d3aedd 100755 --- a/elements/package-installs/bin/package-installs-v2 +++ b/elements/package-installs/bin/package-installs-v2 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/local/bin/dib-python # Copyright 2014 Hewlett-Packard Development Company, L.P. # diff --git a/elements/package-installs/element-deps b/elements/package-installs/element-deps index ef25eec63..8ad55b95b 100644 --- a/elements/package-installs/element-deps +++ b/elements/package-installs/element-deps @@ -1 +1,2 @@ +dib-python pkg-map diff --git a/elements/package-installs/extra-data.d/99-squash-package-install b/elements/package-installs/extra-data.d/99-squash-package-install index c86113f64..b107f338c 100755 --- a/elements/package-installs/extra-data.d/99-squash-package-install +++ b/elements/package-installs/extra-data.d/99-squash-package-install @@ -5,4 +5,6 @@ fi set -eu set -o pipefail -sudo -E $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json +python_path=$(command -v python2 || command -v python3) + +sudo -E $python_path $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json