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
69 lines
1.8 KiB
Bash
Executable file
69 lines
1.8 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
_LIB="/tmp/ramdisk-build"
|
|
|
|
source $_LIB/common-defaults
|
|
source $_LIB/img-defaults
|
|
source $_LIB/ramdisk-defaults
|
|
|
|
source $_LIB/common-functions
|
|
source $_LIB/img-functions
|
|
source $_LIB/ramdisk-functions
|
|
|
|
KERNEL_VERSION=${DIB_KERNEL_VERSION:-$(find_kernel_version)}
|
|
|
|
MODULE_DIR=$MODULE_ROOT/lib/modules/$KERNEL_VERSION
|
|
if [ -f /dib-signed-kernel-version ] ; then
|
|
. /dib-signed-kernel-version
|
|
fi
|
|
if [ -n "${DIB_SIGNED_KERNEL_VERSION:-}" ]; then
|
|
# Though kernel name is suffixed with efi.signed, modules directory is
|
|
# without that suffix
|
|
MOD_KERNEL_NAME=`echo "$DIB_SIGNED_KERNEL_VERSION" |sed "s/\.efi\.signed//g"`
|
|
MODULE_DIR=$MODULE_ROOT/lib/modules/$MOD_KERNEL_NAME
|
|
fi
|
|
|
|
FIRMWARE_DIR=$MODULE_ROOT/lib/firmware
|
|
LIB_UDEV=$LIB_UDEV_ROOT/lib/udev
|
|
INIT="$_LIB/scripts/init"
|
|
FUNCTIONS_D="$_LIB/scripts/d"
|
|
BUSYBOX=${BUSYBOX:-$(which busybox)}
|
|
# NOTE(bnemec): IMAGE_ELEMENT is normally set in disk-image-create, but we're
|
|
# not using that to build the image here.
|
|
IMAGE_ELEMENT=
|
|
|
|
mk_build_dir
|
|
mkdir -p $TMP_BUILD_DIR/mnt
|
|
export TMP_HOOKS_PATH=/tmp
|
|
export TMP_MOUNT_PATH=$TMP_BUILD_DIR/mnt
|
|
|
|
echo "building ramdisk in $TMP_MOUNT_PATH"
|
|
|
|
create_ramdisk_base
|
|
populate_lib
|
|
populate_busybox
|
|
populate_init
|
|
populate_udev
|
|
SCRIPT_HOME=/tmp/in_target.d/bin TMP_HOOKS_PATH=/tmp/in_target.d run_d ramdisk-install
|
|
finalise_image
|
|
save_image /tmp/ramdisk
|
|
# In the past save_image did this for us. If EXIT handler is not
|
|
# reset ramdisk image builds fail.
|
|
trap EXIT
|
|
cp /boot/vmlinu[zx]-${KERNEL_VERSION} /tmp/kernel
|
|
if [ -n "${DIB_SIGNED_KERNEL_VERSION:-}" ]; then
|
|
cp /boot/vmlinu[zx]-${DIB_SIGNED_KERNEL_VERSION} /tmp/kernel
|
|
fi
|
|
|
|
chmod o+r /tmp/kernel
|
|
|
|
if [ -f /dib-signed-kernel-version ] ; then
|
|
echo "Removing /dib-signed-kernel-version"
|
|
rm -f /dib-signed-kernel-version
|
|
fi
|