scripts/image: build an image for each UBOOT_SYSTEM

This commit is contained in:
Jonas Karlman 2019-05-01 16:27:07 +00:00
parent e9c26b5d66
commit e92b858d9e
2 changed files with 42 additions and 4 deletions

View File

@ -33,7 +33,7 @@ function do_mkimage() {
DISTRO="$DISTRO" \ DISTRO="$DISTRO" \
TARGET_IMG="$TARGET_IMG" \ TARGET_IMG="$TARGET_IMG" \
BUILD_NAME="$IMAGE_NAME" \ BUILD_NAME="$IMAGE_NAME" \
IMAGE_NAME="$IMAGE_NAME" \ IMAGE_NAME="${1:-$IMAGE_NAME}" \
INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \ INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
BOOTLOADER="$BOOTLOADER" \ BOOTLOADER="$BOOTLOADER" \
KERNEL_NAME="$KERNEL_NAME" \ KERNEL_NAME="$KERNEL_NAME" \
@ -316,7 +316,26 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')" UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
UUID_STORAGE="$(uuidgen)" UUID_STORAGE="$(uuidgen)"
do_mkimage DEVICE_BOARDS=$($SCRIPTS/uboot_helper "$PROJECT" "$DEVICE")
if [ "$BOOTLOADER" = "u-boot" -a -z "$UBOOT_SYSTEM" -a -n "$DEVICE" -a -n "$DEVICE_BOARDS" ]; then
for UBOOT_SYSTEM in $DEVICE_BOARDS; do
# Re-install u-boot package
rm $STAMPS_INSTALL/u-boot/install_target
UBOOT_SYSTEM="$UBOOT_SYSTEM" $SCRIPTS/install u-boot
# Re-run bootloader/release
if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
echo "Running $FOUND_PATH"
. $FOUND_PATH
fi
do_mkimage "$IMAGE_NAME-$UBOOT_SYSTEM"
done
else
do_mkimage
fi
fi fi
# Cleanup release dir # Cleanup release dir

View File

@ -36,7 +36,7 @@ function do_mkimage() {
DISTRO="$DISTRO" \ DISTRO="$DISTRO" \
TARGET_IMG="$TARGET_IMG" \ TARGET_IMG="$TARGET_IMG" \
BUILD_NAME="$IMAGE_NAME" \ BUILD_NAME="$IMAGE_NAME" \
IMAGE_NAME="$IMAGE_NAME" \ IMAGE_NAME="${1:-$IMAGE_NAME}" \
INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \ INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
BOOTLOADER="$BOOTLOADER" \ BOOTLOADER="$BOOTLOADER" \
KERNEL_NAME="$KERNEL_NAME" \ KERNEL_NAME="$KERNEL_NAME" \
@ -366,7 +366,26 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')" UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
UUID_STORAGE="$(uuidgen)" UUID_STORAGE="$(uuidgen)"
do_mkimage DEVICE_BOARDS=$($SCRIPTS/uboot_helper "$PROJECT" "$DEVICE")
if [ "$BOOTLOADER" = "u-boot" -a -z "$UBOOT_SYSTEM" -a -n "$DEVICE" -a -n "$DEVICE_BOARDS" ]; then
for UBOOT_SYSTEM in $DEVICE_BOARDS; do
# re-install u-boot package
rm $STAMPS_INSTALL/u-boot/install_target
UBOOT_SYSTEM="$UBOOT_SYSTEM" $SCRIPTS/install u-boot
# re-run bootloader/release
if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
echo "Running $FOUND_PATH"
. $FOUND_PATH
fi
do_mkimage "$IMAGE_NAME-$UBOOT_SYSTEM"
done
else
do_mkimage
fi
fi fi
# cleanup release dir # cleanup release dir