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

meta-digi: cosmetic, no functional change 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit b52786156a43eb7b3c51a114797be5bf2896f313)
This commit is contained in:
Javier Viguera 2015-09-28 17:50:59 +02:00
parent f20b82c7cd
commit ad0d0b7bfc
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/layer.conf
View File

@ -9,10 +9,8 @@ BBFILE_COLLECTIONS += "digi-arm"
BBFILE_PATTERN_digi-arm := "^${LAYERDIR}/" BBFILE_PATTERN_digi-arm := "^${LAYERDIR}/"
BBFILE_PRIORITY_digi-arm = "5" BBFILE_PRIORITY_digi-arm = "5"
# This is Digi's General license agreement. # Digi's General and Open Source license agreements
DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA" DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
# This is Digi's Open Source license agreement.
DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA" DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
DIGI_LOG_GIT ?= "git://log-sln-git.digi.com/" DIGI_LOG_GIT ?= "git://log-sln-git.digi.com/"

10
meta-digi-dey/conf/layer.conf
View File

@ -14,6 +14,10 @@ BBFILE_COLLECTIONS += "dey"
BBFILE_PATTERN_dey := "^${LAYERDIR}/" BBFILE_PATTERN_dey := "^${LAYERDIR}/"
BBFILE_PRIORITY_dey = "6" BBFILE_PRIORITY_dey = "6"
# Digi's General and Open Source license agreements
DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
# Digi mirror for packages vanished upstream # Digi mirror for packages vanished upstream
DIGI_MIRROR ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/mirror/" DIGI_MIRROR ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/mirror/"
MIRRORS += "\ MIRRORS += "\
@ -21,9 +25,3 @@ ftp://.*/.* ${DIGI_MIRROR} \n \
http://.*/.* ${DIGI_MIRROR} \n \ http://.*/.* ${DIGI_MIRROR} \n \
https://.*/.* ${DIGI_MIRROR} \n \ https://.*/.* ${DIGI_MIRROR} \n \
" "
# This is Digi's General license agreement.
DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA"
# This is Digi's Open Source license agreement.
DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"

2
sdk/mkproject.sh
View File

@ -114,7 +114,7 @@ do_mkproject() {
if [ -z "${MKP_OLD_PROJECT}" ]; then if [ -z "${MKP_OLD_PROJECT}" ]; then
# Customize project # Customize project
chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf
sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
if [ -n "${MKP_VARIANT+x}" ]; then if [ -n "${MKP_VARIANT+x}" ]; then
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