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
64 lines
1.4 KiB
Bash
Executable file
64 lines
1.4 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
SCRIPTNAME=$(basename $0)
|
|
function show_options () {
|
|
echo "Usage: $SCRIPTNAME -d <directory>"
|
|
echo
|
|
echo "Options:"
|
|
echo " -d -- directory to search for package-uninstalls-* files"
|
|
exit 1
|
|
}
|
|
|
|
TEMP=$(getopt -o hd: -n $SCRIPTNAME -- "$@")
|
|
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
|
|
eval set -- "$TEMP"
|
|
|
|
WORKDIR=
|
|
|
|
while true ; do
|
|
case "$1" in
|
|
-d) WORKDIR=$2; shift 2;;
|
|
-h) show_options;;
|
|
--) shift ; break ;;
|
|
*) echo "Error: unsupported option $1."; exit 1;;
|
|
esac
|
|
done
|
|
|
|
if [ -z "$WORKDIR" ]; then
|
|
show_options
|
|
fi
|
|
|
|
PACKAGES=
|
|
|
|
for PACKAGEFILE in $(find $WORKDIR -maxdepth 1 -name "package-installs-*" ); do
|
|
basefile=$(basename $PACKAGEFILE)
|
|
element_name=${basefile#"package-installs-"}
|
|
while read pkg; do
|
|
if [ -z "$pkg" ]; then
|
|
continue
|
|
fi
|
|
# Ignore comments
|
|
if [ ${pkg:0:1} = "#" ]; then
|
|
continue
|
|
fi
|
|
if [ ! ${pkg:0:1} = "-" ]; then
|
|
continue
|
|
fi
|
|
|
|
if [ -e /usr/share/pkg-map/$element_name ]; then
|
|
# map the package to its true name
|
|
pkg=$(pkg-map --element $element_name $pkg)
|
|
fi
|
|
|
|
pkg=${pkg:1}
|
|
PACKAGES="$PACKAGES $pkg"
|
|
done < $PACKAGEFILE
|
|
done
|
|
|
|
install-packages -e $PACKAGES
|