Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2022-07-06 10:34:24 +02:00
parent 153048c2a7
commit bbe014e058
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/config/ccmp15-dvk/local.conf.sample
View File

@ -287,5 +287,10 @@ CONF_VERSION = "2"
# #
PRSERV_HOST = "localhost:0" PRSERV_HOST = "localhost:0"
#
# Some packages are covered by STM EULA
#
#ACCEPT_EULA_ccmp15-dvk = "1"
# Enable STM specific features # Enable STM specific features
DEY_BUILD_PLAFORM = "STM" DEY_BUILD_PLAFORM = "STM"

8
sdk/mkproject.sh
View File

@ -98,7 +98,7 @@ do_license() {
local SOC_VENDOR="STM" local SOC_VENDOR="STM"
MKP_LICENSE_FILES=" \ MKP_LICENSE_FILES=" \
${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 else
local SOC_VENDOR="NXP" local SOC_VENDOR="NXP"
@ -117,7 +117,7 @@ do_license() {
| | | |
| * Digi's end user license agreement | | * Digi's end user license agreement |
| * Digi's third party and open source license notice | | * 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 | | To have the right to use those binaries in your images you need to read and |
| accept the licenses. | | accept the licenses. |
@ -155,8 +155,8 @@ do_mkproject() {
sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \ sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \
${MKP_PROJECTPATH}/conf/local.conf ${MKP_PROJECTPATH}/conf/local.conf
fi fi
# At this point the user has accepted all the licenses, so enable the FSL EULA # At this point the user has accepted all the licenses, so enable the vendor EULA
sed -i -e "s,^#ACCEPT_FSL_EULA,ACCEPT_FSL_EULA,g" ${MKP_PROJECTPATH}/conf/local.conf sed -i -e "s,^#\(ACCEPT.*EULA\),\1,g" ${MKP_PROJECTPATH}/conf/local.conf
# Create dey-setup-environment script # Create dey-setup-environment script
printf "${MKP_SETUP_ENVIRONMENT}" "${MKP_SCRIPTPATH}" > ${MKP_PROJECTPATH}/dey-setup-environment printf "${MKP_SETUP_ENVIRONMENT}" "${MKP_SCRIPTPATH}" > ${MKP_PROJECTPATH}/dey-setup-environment
chmod +x ${MKP_PROJECTPATH}/dey-setup-environment chmod +x ${MKP_PROJECTPATH}/dey-setup-environment