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
49 lines
1.1 KiB
Bash
Executable File
49 lines
1.1 KiB
Bash
Executable File
#!/bin/bash
|
|
# Ensure that all binaries listed in ramdisk elements, exist
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
export TARGET_DIR="/tmp/in_target.d/"
|
|
|
|
if [ -z $TARGET_DIR ] ; then
|
|
echo "Target dir not specified"
|
|
exit 1
|
|
fi
|
|
|
|
if [ ! -d $TARGET_DIR ] ; then
|
|
echo "Unable to find specified directory in target: $TARGET_DIR"
|
|
bash
|
|
exit 1
|
|
fi
|
|
|
|
BINARY_DEPS=
|
|
|
|
for _FILE in $(ls ${TARGET_DIR}/binary-deps.d/) ; do
|
|
_FILE="${TARGET_DIR}/binary-deps.d/${_FILE}"
|
|
if [ -a $_FILE ]; then
|
|
for _LINE in $(cat $_FILE) ; do
|
|
BINARY_DEPS="${BINARY_DEPS} $_LINE"
|
|
done
|
|
fi
|
|
done
|
|
|
|
for _BIN in $BINARY_DEPS ; do
|
|
_LOCATION=$(which "$_BIN" || echo "")
|
|
if [ -z "$_LOCATION" ]; then
|
|
echo "$_BIN is not found in PATH. Please ensure your elements install it"
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
if [ "$BINARY_DEPS" == "" ]; then
|
|
echo "No binary-deps found"
|
|
else
|
|
DEPS_OUTPUT="/etc/dib_binary_deps"
|
|
echo "Creating binary_deps record at: ${DEPS_OUTPUT}"
|
|
echo "$BINARY_DEPS" >${DEPS_OUTPUT}
|
|
fi
|