From bbe014e058c5f8552b2ff7ece3e17111e37df3c3 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 6 Jul 2022 10:34:24 +0200 Subject: [PATCH] mkproject: fix STM EULA path and enabling Building some packages from the ccmp15 requires the acceptance of the STM EULA. Add the acceptance lines to the config template and fix the path to the EULA en the mkproject script. Signed-off-by: Javier Viguera --- sdk/config/ccmp15-dvk/local.conf.sample | 5 +++++ sdk/mkproject.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sdk/config/ccmp15-dvk/local.conf.sample b/sdk/config/ccmp15-dvk/local.conf.sample index 2c7c8a10c..669b6bbcf 100644 --- a/sdk/config/ccmp15-dvk/local.conf.sample +++ b/sdk/config/ccmp15-dvk/local.conf.sample @@ -287,5 +287,10 @@ CONF_VERSION = "2" # PRSERV_HOST = "localhost:0" +# +# Some packages are covered by STM EULA +# +#ACCEPT_EULA_ccmp15-dvk = "1" + # Enable STM specific features DEY_BUILD_PLAFORM = "STM" diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh index ae5e71816..f554657cf 100755 --- a/sdk/mkproject.sh +++ b/sdk/mkproject.sh @@ -98,7 +98,7 @@ do_license() { local SOC_VENDOR="STM" MKP_LICENSE_FILES=" \ ${MKP_LICENSE_FILES} \ - ${MKP_SCRIPTPATH}/sources/meta-st-stm32/EULA \ + ${MKP_SCRIPTPATH}/sources/meta-st-stm32mp/conf/eula/ST_EULA_SLA \ " else local SOC_VENDOR="NXP" @@ -117,7 +117,7 @@ do_license() { | | | * Digi's end user license agreement | | * Digi's third party and open source license notice | - | * ${SOC_VENDOR} Semiconductors' software license agreement | + | * ${SOC_VENDOR} Semiconductors' software license agreement | | | | To have the right to use those binaries in your images you need to read and | | accept the licenses. | @@ -155,8 +155,8 @@ do_mkproject() { sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \ ${MKP_PROJECTPATH}/conf/local.conf fi - # At this point the user has accepted all the licenses, so enable the FSL EULA - sed -i -e "s,^#ACCEPT_FSL_EULA,ACCEPT_FSL_EULA,g" ${MKP_PROJECTPATH}/conf/local.conf + # At this point the user has accepted all the licenses, so enable the vendor EULA + sed -i -e "s,^#\(ACCEPT.*EULA\),\1,g" ${MKP_PROJECTPATH}/conf/local.conf # Create dey-setup-environment script printf "${MKP_SETUP_ENVIRONMENT}" "${MKP_SCRIPTPATH}" > ${MKP_PROJECTPATH}/dey-setup-environment chmod +x ${MKP_PROJECTPATH}/dey-setup-environment