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.2 KiB
Bash
Executable File
49 lines
1.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
|
|
set -eux
|
|
set -o pipefail
|
|
|
|
TMP_BOOTLOADER_DIR=/tmp/bootloader_files
|
|
mkdir -p $TMP_BOOTLOADER_DIR
|
|
|
|
if [ $DISTRO_NAME = "fedora" ]; then
|
|
GRUB_FILE="/boot/efi/EFI/fedora/grubx64.efi"
|
|
else
|
|
GRUB_FILE="/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed"
|
|
fi
|
|
|
|
if [ $DISTRO_NAME = "fedora" ]; then
|
|
SHIM_FILE="/boot/efi/EFI/fedora/shim.efi"
|
|
else
|
|
SHIM_FILE="/usr/lib/shim/shim.efi.signed"
|
|
fi
|
|
|
|
#fedora
|
|
if [ $DISTRO_NAME = "fedora" ]; then
|
|
SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin"
|
|
LDLINUX_FILE="/usr/share/syslinux/ldlinux.c32"
|
|
#debian
|
|
elif [ $DISTRO_NAME = "debian" ]; then
|
|
SYSLINUX_FILE="/usr/lib/ISOLINUX/isolinux.bin"
|
|
LDLINUX_FILE="/usr/lib/syslinux/modules/bios/ldlinux.c32"
|
|
#ubuntu
|
|
else
|
|
SYSLINUX_FILE="/usr/lib/syslinux/isolinux.bin"
|
|
LDLINUX_FILE="/usr/lib/syslinux/ldlinux.c32"
|
|
fi
|
|
|
|
cp $GRUB_FILE $TMP_BOOTLOADER_DIR
|
|
cp $SHIM_FILE $TMP_BOOTLOADER_DIR
|
|
cp $SYSLINUX_FILE $TMP_BOOTLOADER_DIR
|
|
|
|
# Starting from SYSLINUX 5.00, the isolinux.bin is dependent
|
|
# on ldlinux.c32.
|
|
# http://www.syslinux.org/wiki/index.php/Library_modules
|
|
if [ -f "$LDLINUX_FILE" ]; then
|
|
cp $LDLINUX_FILE $TMP_BOOTLOADER_DIR
|
|
fi
|