Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix cyclone5 build by supplying patched image class
[AGL/meta-agl.git]
/
templates
/
base
/
01_setup_EULAfunc.sh
diff --git
a/templates/base/01_setup_EULAfunc.sh
b/templates/base/01_setup_EULAfunc.sh
index
7b1ca87
..
5ea2941
100644
(file)
--- a/
templates/base/01_setup_EULAfunc.sh
+++ b/
templates/base/01_setup_EULAfunc.sh
@@
-8,7
+8,13
@@
find_and_ack_eula() {
# If the env variable EULA_$MACHINE is set it is used by default,
# without prompting the user.
# FIXME: there is a potential issue if the same $MACHINE is set in more than one layer.. but we should assert that earlier
# If the env variable EULA_$MACHINE is set it is used by default,
# without prompting the user.
# FIXME: there is a potential issue if the same $MACHINE is set in more than one layer.. but we should assert that earlier
- EULA=$(find $1 -print | grep "conf/eula/$MACHINE" | grep -v scripts | grep -v openembedded-core || true)
+ # $1 is layer directory
+ # $2 is location of EULA file relative to layer directory
+ if test x"" == x"$2"; then
+ EULA=$(find $1 -print | grep "conf/eula/$MACHINE" | grep -v scripts | grep -v openembedded-core || true)
+ else
+ EULA=$1/$2
+ fi
if [ -n "$EULA" ]; then
# remove '-' since we are constructing a bash variable name here
EULA_MACHINE="EULA_$(echo $MACHINE | sed 's/-//g')"
if [ -n "$EULA" ]; then
# remove '-' since we are constructing a bash variable name here
EULA_MACHINE="EULA_$(echo $MACHINE | sed 's/-//g')"
@@
-24,8
+30,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...
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.
* bootloaders: the first stage bootloaders are proprietary for this
board, they are included in this firmware package.
@@
-40,7
+45,7
@@
EOF
echo
REPLY=
while [ -z "$REPLY" ]; do
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)
read REPLY
case "$REPLY" in
y|Y)