summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2016-07-08 18:25:05 +0000
committerStephane Desneux <stephane.desneux@iot.bzh>2016-07-08 18:28:17 +0000
commit7918af5e635629a70ddb97a3ecfb94e8c7548d0c (patch)
tree949143fa92ea185dbf2d2dd41a0501050fb1d079
parent30862c32cb5b1fef1f678791220de68d5ef50a0c (diff)
aglsetup script: fix interactive execution of the script generated from fragments
This fixes the problem with Qualcomm boards where EULA approval is required. See: https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-July/002279.html Change-Id: Ifad216bf559a246d6883e7c2828dacd7bd225075 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
-rwxr-xr-xscripts/.aglsetup_genconfig.bash2
-rw-r--r--templates/base/01_setup_EULAfunc.sh5
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 6be95d0fa..c6e5a36a1 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -340,7 +340,7 @@ EOF
append_fragment $BUILDDIR/conf/setup.sh "" "echo '--- end of setup script'"
infon " Executing setup script ... "
- execute_setup $BUILDDIR/conf/setup.sh >$BUILDDIR/conf/setup.log 2>&1 \
+ execute_setup $BUILDDIR/conf/setup.sh 2>&1 | tee $BUILDDIR/conf/setup.log \
&& {
info "OK"
[[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log
diff --git a/templates/base/01_setup_EULAfunc.sh b/templates/base/01_setup_EULAfunc.sh
index 7b1ca870d..28d7d926a 100644
--- a/templates/base/01_setup_EULAfunc.sh
+++ b/templates/base/01_setup_EULAfunc.sh
@@ -24,8 +24,7 @@ The BSP for $MACHINE depends on packages and firmware which are covered by an
End User License Agreement (EULA). To have the right to use these binaries
in your images, you need to read and accept the following...
-The firmware package can contains several types
-of firmware (depending on BSP):
+The firmware package can contains several types of firmware (depending on BSP):
* bootloaders: the first stage bootloaders are proprietary for this
board, they are included in this firmware package.
@@ -40,7 +39,7 @@ EOF
echo
REPLY=
while [ -z "$REPLY" ]; do
- echo -n "Do you read the EULA ? (y/n) "
+ echo -n "Do you want to read the EULA ? (y/n) "
read REPLY
case "$REPLY" in
y|Y)