u-boot-dey: use global variables to generalize install scripts

Create global variables:
  DEFAULT_IMAGE_NAME
  GRAPHICAL_IMAGES

to have them substituted on the U-Boot install scripts for better
generalization.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2021-05-28 12:35:47 +02:00
parent c2c3cfb7cd
commit 96bc57c7f0
25 changed files with 70 additions and 76 deletions

View File

@ -40,3 +40,6 @@ BOOT_SCRIPTS = "boot.scr:boot.scr"
# Flash image types # Flash image types
IMAGE_FSTYPES ?= "tar.bz2 ubifs boot.ubifs recovery.ubifs" IMAGE_FSTYPES ?= "tar.bz2 ubifs boot.ubifs recovery.ubifs"
# Default image for install scripts
DEFAULT_IMAGE_NAME ?= "core-image-base"

View File

@ -73,3 +73,9 @@ MACHINE_EXTRA_RDEPENDS += " \
MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_EXTRA_RRECOMMENDS += " \
${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "cryptoauthlib", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "cryptoauthlib", "", d)} \
" "
# Default image name (for install scripts)
DEFAULT_IMAGE_NAME ??= "dey-image-qt"
# List of graphical images names (for install scripts)
GRAPHICAL_IMAGES ?= "dey-image-qt dey-image-webkit"

View File

@ -164,19 +164,20 @@ do_deploy_append() {
unset i unset i
fi fi
# DEY firmware install script # DEY firmware install scripts
sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt ${WORKDIR}/install_linux_fw_usb.txt
sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_sd.txt sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_sd.txt ${WORKDIR}/install_linux_fw_usb.txt
sed -i -e 's,##GRAPHICAL_IMAGES##,${GRAPHICAL_IMAGES},g' ${WORKDIR}/install_linux_fw_sd.txt ${WORKDIR}/install_linux_fw_usb.txt
sed -i -e 's,##DEFAULT_IMAGE_NAME##,${DEFAULT_IMAGE_NAME},g' ${WORKDIR}/install_linux_fw_sd.txt ${WORKDIR}/install_linux_fw_usb.txt
mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_sd.txt ${DEPLOYDIR}/install_linux_fw_sd.scr mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_sd.txt ${DEPLOYDIR}/install_linux_fw_sd.scr
sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_usb.txt
sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_usb.txt
mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_usb.txt ${DEPLOYDIR}/install_linux_fw_usb.scr mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_usb.txt ${DEPLOYDIR}/install_linux_fw_usb.scr
if [ "${@oe.utils.conditional('UBOOT_HAS_FASTBOOT', 'true', 'true', '', d)}" = "true" ]; then if [ "${@oe.utils.conditional('UBOOT_HAS_FASTBOOT', 'true', 'true', '', d)}" = "true" ]; then
# DEY firmware install uuu script # DEY firmware install uuu script
sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_uuu.sh sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_uuu.sh
sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_uuu.sh sed -i -e 's,##MACHINE##,${MACHINE},g' ${WORKDIR}/install_linux_fw_uuu.sh
sed -i -e 's,##GRAPHICAL_IMAGES##,${GRAPHICAL_IMAGES},g' ${WORKDIR}/install_linux_fw_uuu.sh
sed -i -e 's,##DEFAULT_IMAGE_NAME##,${DEFAULT_IMAGE_NAME},g' ${WORKDIR}/install_linux_fw_uuu.sh
install -m 775 ${WORKDIR}/install_linux_fw_uuu.sh ${DEPLOYDIR}/ install -m 775 ${WORKDIR}/install_linux_fw_uuu.sh ${DEPLOYDIR}/
fi fi

View File

@ -52,9 +52,9 @@ fi;
setenv INSTALL_MMCDEV 1 setenv INSTALL_MMCDEV 1
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -52,9 +52,9 @@ fi;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -63,9 +63,9 @@ fi;
setenv INSTALL_MMCDEV 1 setenv INSTALL_MMCDEV 1
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -63,9 +63,9 @@ fi;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -55,14 +55,10 @@ fi;
setenv INSTALL_MMCDEV 0 setenv INSTALL_MMCDEV 0
if test ! -n "${image-name}"; then if test -z "${image-name}"; then
if test "${board_name}" == "ccimx6ulstarter"; then setenv image-name ##DEFAULT_IMAGE_NAME##
setenv image-name core-image-base
else
setenv image-name dey-image-qt
fi
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -55,14 +55,10 @@ fi;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test ! -n "${image-name}"; then if test -z "${image-name}"; then
if test "${board_name}" == "ccimx6ulstarter"; then setenv image-name ##DEFAULT_IMAGE_NAME##
setenv image-name core-image-base
else
setenv image-name dey-image-qt
fi
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -32,7 +32,7 @@ show_usage()
echo " -h Show this help." echo " -h Show this help."
echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', "
echo " 'dey-image-webkit', 'core-image-base'..." echo " 'dey-image-webkit', 'core-image-base'..."
echo " Defaults to 'dey-image-qt' if not provided." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
echo " -n No wait. Skips 10 seconds delay to stop script." echo " -n No wait. Skips 10 seconds delay to stop script."
echo " -u <u-boot-filename> U-Boot filename." echo " -u <u-boot-filename> U-Boot filename."
echo " Auto-determined by variant if not provided." echo " Auto-determined by variant if not provided."
@ -128,9 +128,9 @@ fi
# Determine linux, recovery, and rootfs image filenames to update # Determine linux, recovery, and rootfs image filenames to update
if [ -z "${IMAGE_NAME}" ]; then if [ -z "${IMAGE_NAME}" ]; then
IMAGE_NAME="dey-image-qt" IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if [ "${IMAGE_NAME}" = "${g}" ]; then if [ "${IMAGE_NAME}" = "${g}" ]; then
BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"

View File

@ -55,14 +55,10 @@ fi;
setenv INSTALL_MMCDEV 0 setenv INSTALL_MMCDEV 0
if test ! -n "${image-name}"; then if test -z "${image-name}"; then
if test "${board_name}" == "ccimx6ulstarter"; then setenv image-name ##DEFAULT_IMAGE_NAME##
setenv image-name core-image-base
else
setenv image-name dey-image-qt
fi
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -55,14 +55,10 @@ fi;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test ! -n "${image-name}"; then if test -z "${image-name}"; then
if test "${board_name}" == "ccimx6ulstarter"; then setenv image-name ##DEFAULT_IMAGE_NAME##
setenv image-name core-image-base
else
setenv image-name dey-image-qt
fi
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -32,7 +32,7 @@ show_usage()
echo " -h Show this help." echo " -h Show this help."
echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', "
echo " 'dey-image-webkit', 'core-image-base'..." echo " 'dey-image-webkit', 'core-image-base'..."
echo " Defaults to 'core-image-base' if not provided." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
echo " -n No wait. Skips 10 seconds delay to stop script." echo " -n No wait. Skips 10 seconds delay to stop script."
echo " -u <u-boot-filename> U-Boot filename." echo " -u <u-boot-filename> U-Boot filename."
echo " Auto-determined by variant if not provided." echo " Auto-determined by variant if not provided."
@ -128,9 +128,9 @@ fi
# Determine linux, recovery, and rootfs image filenames to update # Determine linux, recovery, and rootfs image filenames to update
if [ -z "${IMAGE_NAME}" ]; then if [ -z "${IMAGE_NAME}" ]; then
IMAGE_NAME="core-image-base" IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if [ "${IMAGE_NAME}" = "${g}" ]; then if [ "${IMAGE_NAME}" = "${g}" ]; then
BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"

View File

@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
setenv INSTALL_MMCDEV 1 setenv INSTALL_MMCDEV 1
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -32,7 +32,7 @@ show_usage()
echo " -h Show this help." echo " -h Show this help."
echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', "
echo " 'dey-image-webkit', 'core-image-base'..." echo " 'dey-image-webkit', 'core-image-base'..."
echo " Defaults to 'dey-image-qt' if not provided." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
echo " -n No wait. Skips 10 seconds delay to stop script." echo " -n No wait. Skips 10 seconds delay to stop script."
echo " -u <u-boot-filename> U-Boot filename." echo " -u <u-boot-filename> U-Boot filename."
echo " Auto-determined by variant if not provided." echo " Auto-determined by variant if not provided."
@ -86,9 +86,9 @@ fi
# Determine linux, recovery, and rootfs image filenames to update # Determine linux, recovery, and rootfs image filenames to update
if [ -z "${IMAGE_NAME}" ]; then if [ -z "${IMAGE_NAME}" ]; then
IMAGE_NAME="dey-image-qt" IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if [ "${IMAGE_NAME}" = "${g}" ]; then if [ "${IMAGE_NAME}" = "${g}" ]; then
BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"

View File

@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
setenv INSTALL_MMCDEV 1 setenv INSTALL_MMCDEV 1
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -23,9 +23,9 @@ setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -32,7 +32,7 @@ show_usage()
echo " -h Show this help." echo " -h Show this help."
echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', "
echo " 'dey-image-webkit', 'core-image-base'..." echo " 'dey-image-webkit', 'core-image-base'..."
echo " Defaults to 'dey-image-qt' if not provided." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
echo " -n No wait. Skips 10 seconds delay to stop script." echo " -n No wait. Skips 10 seconds delay to stop script."
echo " -u <u-boot-filename> U-Boot filename." echo " -u <u-boot-filename> U-Boot filename."
echo " Auto-determined by variant if not provided." echo " Auto-determined by variant if not provided."
@ -86,9 +86,9 @@ fi
# Determine linux, recovery, and rootfs image filenames to update # Determine linux, recovery, and rootfs image filenames to update
if [ -z "${IMAGE_NAME}" ]; then if [ -z "${IMAGE_NAME}" ]; then
IMAGE_NAME="dey-image-qt" IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if [ "${IMAGE_NAME}" = "${g}" ]; then if [ "${IMAGE_NAME}" = "${g}" ]; then
BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"

View File

@ -94,9 +94,9 @@ fi;
setenv INSTALL_MMCDEV 1 setenv INSTALL_MMCDEV 1
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -92,9 +92,9 @@ fi;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -32,7 +32,7 @@ show_usage()
echo " -h Show this help." echo " -h Show this help."
echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', "
echo " 'dey-image-webkit', 'core-image-base'..." echo " 'dey-image-webkit', 'core-image-base'..."
echo " Defaults to 'dey-image-qt' if not provided." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
echo " -n No wait. Skips 10 seconds delay to stop script." echo " -n No wait. Skips 10 seconds delay to stop script."
echo " -u <u-boot-filename> U-Boot filename." echo " -u <u-boot-filename> U-Boot filename."
echo " Auto-determined by variant if not provided." echo " Auto-determined by variant if not provided."
@ -148,9 +148,9 @@ fi
# Determine linux, recovery, and rootfs image filenames to update # Determine linux, recovery, and rootfs image filenames to update
if [ -z "${IMAGE_NAME}" ]; then if [ -z "${IMAGE_NAME}" ]; then
IMAGE_NAME="dey-image-qt" IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if [ "${IMAGE_NAME}" = "${g}" ]; then if [ "${IMAGE_NAME}" = "${g}" ]; then
BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"

View File

@ -94,9 +94,9 @@ fi;
setenv INSTALL_MMCDEV 1 setenv INSTALL_MMCDEV 1
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -94,9 +94,9 @@ fi;
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then
setenv image-name dey-image-qt setenv image-name ##DEFAULT_IMAGE_NAME##
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if test "${image-name}" = "${g}"; then if test "${image-name}" = "${g}"; then
BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##"

View File

@ -32,7 +32,7 @@ show_usage()
echo " -h Show this help." echo " -h Show this help."
echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " -i <dey-image-name> Image name that prefixes the image filenames, such as 'dey-image-qt', "
echo " 'dey-image-webkit', 'core-image-base'..." echo " 'dey-image-webkit', 'core-image-base'..."
echo " Defaults to 'dey-image-qt' if not provided." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided."
echo " -n No wait. Skips 10 seconds delay to stop script." echo " -n No wait. Skips 10 seconds delay to stop script."
echo " -u <u-boot-filename> U-Boot filename." echo " -u <u-boot-filename> U-Boot filename."
echo " Auto-determined by variant if not provided." echo " Auto-determined by variant if not provided."
@ -148,9 +148,9 @@ fi
# Determine linux, recovery, and rootfs image filenames to update # Determine linux, recovery, and rootfs image filenames to update
if [ -z "${IMAGE_NAME}" ]; then if [ -z "${IMAGE_NAME}" ]; then
IMAGE_NAME="dey-image-qt" IMAGE_NAME="##DEFAULT_IMAGE_NAME##"
fi fi
GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit" GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##"
for g in ${GRAPHICAL_IMAGES}; do for g in ${GRAPHICAL_IMAGES}; do
if [ "${IMAGE_NAME}" = "${g}" ]; then if [ "${IMAGE_NAME}" = "${g}" ]; then
BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"