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
65 lines
1.4 KiB
Bash
Executable File
65 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
|
|
|
|
function clean_up_arch_emulation {
|
|
cat <<EOF >$TMP_MOUNT_PATH/tmp/clean_up_qemu_binary
|
|
#!/bin/bash
|
|
|
|
set -eux
|
|
set -o pipefail
|
|
|
|
sudo rm -rf "${TMP_MOUNT_PATH}${1}"
|
|
EOF
|
|
|
|
sudo chmod +x "$TMP_MOUNT_PATH/tmp/clean_up_qemu_binary"
|
|
}
|
|
|
|
function check_copy_file {
|
|
if [ -f "$1" ] ; then
|
|
if [ ! -f "${TMP_MOUNT_PATH}${1}" ]; then
|
|
sudo cp "$1" "$TMP_MOUNT_PATH/usr/bin"
|
|
clean_up_arch_emulation $1
|
|
fi
|
|
else
|
|
echo "qemu binary file not found."
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function copy_binary {
|
|
echo "checking for architecture compatibility..."
|
|
img_arch=$2
|
|
if [[ "$host_arch" != "$img_arch" ]]; then
|
|
qemu_binary=$1
|
|
check_copy_file $qemu_binary
|
|
else
|
|
echo "Emulation not required for this host/image architecture combination"
|
|
fi
|
|
}
|
|
|
|
host_arch="$(uname -m)"
|
|
|
|
case "$ARCH" in
|
|
"i386" | "amd64")
|
|
qemu_binary_file="/usr/bin/qemu-i386-static"
|
|
copy_binary $qemu_binary_file $ARCH
|
|
;;
|
|
"armhf")
|
|
qemu_binary_file="/usr/bin/qemu-arm-static"
|
|
copy_binary $qemu_binary_file $ARCH
|
|
;;
|
|
"arm64")
|
|
qemu_binary_file="/usr/bin/qemu-aarch64-static"
|
|
copy_binary $qemu_binary_file $ARCH
|
|
;;
|
|
*)
|
|
echo "architecture not supported"
|
|
exit 1
|
|
;;
|
|
esac
|