summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
79bad97)
This change generalizes the *_setup_EULA*.sh scripts to work with custom layouts.
The 50_setup.sh of the machine template just needs to call
find_and_ack_eula <layerfolder> [<EULA_FILENAME_relative_to_layerfolder>]
The EULA_FILENAME is optional.
Also an optional EULA_FLAG_NAME can be exported which will be used
for the layer.conf.
If no EULA_FLAG_NAME is set, we'll default to the current
ACCEPT_EULA_$MACHINE.
Change-Id: I03a4551e1cf088dce0b13aa5e38f606d67e0fb29
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
# 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')"
1)
echo "" >> $BUILDDIR/conf/local.conf
echo "# EULA" >> $BUILDDIR/conf/local.conf
1)
echo "" >> $BUILDDIR/conf/local.conf
echo "# EULA" >> $BUILDDIR/conf/local.conf
- echo "ACCEPT_EULA_$MACHINE = \"1\"" >> $BUILDDIR/conf/local.conf
+ if test x"" = x"$EULA_FLAG_NAME"; then
+ echo "ACCEPT_EULA_$MACHINE = \"1\"" >> $BUILDDIR/conf/local.conf
+ else
+ echo "$EULA_FLAG_NAME = \"1\"" >> $BUILDDIR/conf/local.conf
+ fi
--- /dev/null
+find_and_ack_eula $METADIR/meta-fsl-arm EULA
+export EULA_FLAG_NAME="ACCEPT_FSL_EULA"