97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
74 lines
2.1 KiB
Bash
Executable file
74 lines
2.1 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
# install-packages package [package ...]
|
|
|
|
ACTION=install
|
|
MAP_ELEMENT=""
|
|
|
|
SCRIPTNAME=$(basename $0)
|
|
function show_options () {
|
|
echo "Usage: $SCRIPTNAME [package ...]"
|
|
echo
|
|
echo "Options:"
|
|
echo " -u -- update all packages"
|
|
echo " -e -- erase/remove packages"
|
|
echo " -m -- use custom element package map (Example: -m nova)"
|
|
exit 0
|
|
}
|
|
|
|
install_deb_packages () {
|
|
DEBIAN_FRONTEND=noninteractive \
|
|
http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
|
|
no_proxy=${no_proxy:-} \
|
|
apt-get --option "Dpkg::Options::=--force-confold" \
|
|
--option "Dpkg::Options::=--force-confdef" --assume-yes "$@"
|
|
}
|
|
|
|
TEMP=$(getopt -o hudem: -n $SCRIPTNAME -- "$@")
|
|
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
|
|
eval set -- "$TEMP"
|
|
|
|
while true ; do
|
|
case "$1" in
|
|
-u) install_deb_packages dist-upgrade; exit 0;;
|
|
-e) ACTION="remove"; shift;;
|
|
-m) MAP_ELEMENT=$2; shift 2;;
|
|
-h) show_options;;
|
|
--) shift; break ;;
|
|
*) echo "Error: unsupported option $1."; exit 1;;
|
|
esac
|
|
done
|
|
|
|
PKGS=$@
|
|
if [ -n "$MAP_ELEMENT" ]; then
|
|
if ! PKGS=$(pkg-map --element $MAP_ELEMENT $@); then
|
|
echo "bin/pkg-map error. $PKGS"
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
if [ -z "${PKGS}" ]; then
|
|
echo "Not running install-packages $ACTION with empty packages list"
|
|
else
|
|
install_deb_packages $ACTION $PKGS
|
|
fi
|