From d2fb3a7f2f13a132e5a12dabf3d2b6642cc6b812 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 26 Oct 2016 12:20:45 +0200 Subject: Generalize EULA functions and apply to imx6qsabrelite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 [] 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 --- templates/base/99_setup_EULAconf.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'templates/base/99_setup_EULAconf.sh') diff --git a/templates/base/99_setup_EULAconf.sh b/templates/base/99_setup_EULAconf.sh index fe65f4ea6..351401d11 100644 --- a/templates/base/99_setup_EULAconf.sh +++ b/templates/base/99_setup_EULAconf.sh @@ -2,7 +2,11 @@ case "$EULA_ACCEPT" in 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 ;; *) ;; -- cgit 1.2.3-korg