Skip to content

Commit 9a61100

Browse files
committed
build.sh: log fit creation also to build.log and return error there
1 parent 046bd27 commit 9a61100

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,6 @@ function build {
813813
export DTC_FLAGS="-@"
814814
make ${MAKEFLAGS} ${CFLAGS} ${OWNCONFIGS} 2>&3
815815
ret=$?
816-
exec 3>&-
817816

818817
if [[ $ret == 0 ]]; then
819818
if [[ -z "${uimagearch}" ]];then uimagearch=arm;fi
@@ -867,8 +866,9 @@ function build {
867866
# mkimage -A ${uimagearch} -O linux -T kernel -C none -a $LADDR -e $ENTRY -n "Linux Kernel $kernver$gitbranch" -d $IMAGE ./uImage_nodt
868867
if [[ -e ${baseboard}.its ]];then #"$board" == "bpi-r64" || "$board" == "bpi-r3" ]];then
869868
mkimage -A ${uimagearch} -O linux -T kernel -C none -a $LADDR -e $ENTRY -n "Linux Kernel $kernver$gitbranch" -d $IMAGE ./uImage_nodt
870-
sed "s/%version%/$kernver$gitbranch/" ${baseboard}.its > ${baseboard}.its.tmp
871-
mkimage -f ${baseboard}.its.tmp ${baseboard}.itb
869+
sed "s/%version%/$kernver$gitbranch/" ${baseboard}.its > ${baseboard}.its.tmp 2>&3
870+
mkimage -f ${baseboard}.its.tmp ${baseboard}.itb 2>&3
871+
ret=$?
872872
cp ${baseboard}.itb ${baseboard}-$kernver$gitbranch.itb
873873
rm ${baseboard}.its.tmp
874874
else
@@ -895,6 +895,7 @@ function build {
895895
fi
896896
fi
897897
fi
898+
exec 3>&-
898899
else
899900
echo "No Configfile found, Please Configure Kernel"
900901
fi

0 commit comments

Comments
 (0)