36b59c001c
There is a wide variety of tracing options through the various shell
scripts. Some use "set -eux", others explicity set xtrace and others
do nothing. There is a "-x" option to bin/disk-image-create but it
doesn't flow down to the many scripts it calls.
This adds a global integer variable set by disk-image-create
DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and
turn on tracing. Any other tracing methods are rolled into this. So
the standard header is
---
if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
---
Multiple -x options can be specified to dib-create-image, which
increases the value of DIB_DEBUG_TRACE. If script authors feel their
script should only trace at higher levels, they should modify the
"-gt" value. If they feel it should trace by default, they can modify
the default value also.
Changes to pachset 16 : scripts which currently trace themselves by
default have retained this behaviour with DIB_DEBUG_TRACE defaulting
to "1". This was done by running [1] on patch set 15. See the thread
beginning at [2]
dib-lint is also updated to look for the variable being matched.
[1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd
[2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html
Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
38 lines
916 B
Bash
Executable File
38 lines
916 B
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
function post_process()
|
|
{
|
|
mkimage -A $1 -O linux -T kernel -C none -a $UBOOT_KERNEL_ADDR -e $UBOOT_KERNEL_EP -n "Kernel" -d $KERNEL uImage
|
|
mv uImage $KERNEL
|
|
mkimage -A $1 -O linux -T ramdisk -a 0 -n "RAMdisk" -C gzip -d $RAMDISK uInitrd
|
|
mv uInitrd $RAMDISK
|
|
}
|
|
|
|
UBOOT_KERNEL_ADDR=${UBOOT_KERNEL_ADDR:-0x80000}
|
|
UBOOT_KERNEL_EP=${UBOOT_KERNEL_EP:-0x80000}
|
|
[ -n "$TARGET_ROOT" ]
|
|
|
|
# Check if RAMDISK is being built.
|
|
if [ -f "$TARGET_ROOT/tmp/ramdisk" ] ; then
|
|
KERNEL="$TARGET_ROOT/tmp/kernel"
|
|
RAMDISK="$TARGET_ROOT/tmp/ramdisk"
|
|
else
|
|
source "$_LIB/img-functions"
|
|
# Dig up the initrd and kernel to use.
|
|
select_boot_kernel_initrd "$TARGET_ROOT"
|
|
KERNEL="$TARGET_ROOT/boot/$KERNEL"
|
|
RAMDISK="$TARGET_ROOT/boot/$RAMDISK"
|
|
fi
|
|
|
|
case "$ARCH" in
|
|
arm*)
|
|
post_process arm
|
|
;;
|
|
esac
|