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

build.sh: enable zip installer generation by default 

For automated builds in the buildserver we want the installer ZIP file
to be generated.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2017-02-01 20:07:12 +01:00
parent aaf2524a08
commit 1c61048b95
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/build-github.sh
View File

@ -32,6 +32,10 @@ INHERIT += \"rm_work\"
RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\" RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\"
" "
ZIP_INSTALLER_CFG="
DEY_IMAGE_INSTALLER = \"1\"
"
X11_REMOVAL_CFG=" X11_REMOVAL_CFG="
DISTRO_FEATURES_remove = \"x11\" DISTRO_FEATURES_remove = \"x11\"
" "
@ -169,6 +173,7 @@ for platform in ${DY_PLATFORMS}; do
-e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \ -e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \
conf/local.conf conf/local.conf
printf "${RM_WORK_CFG}" >> conf/local.conf printf "${RM_WORK_CFG}" >> conf/local.conf
printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf
# Remove 'x11' distro feature if building framebuffer images # Remove 'x11' distro feature if building framebuffer images
if [ "${DY_FB_IMAGE}" = "true" ]; then if [ "${DY_FB_IMAGE}" = "true" ]; then
printf "${X11_REMOVAL_CFG}" >> conf/local.conf printf "${X11_REMOVAL_CFG}" >> conf/local.conf

5
sdk/build.sh
View File

@ -45,6 +45,10 @@ INHERIT += \"rm_work\"
RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\" RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\"
" "
ZIP_INSTALLER_CFG="
DEY_IMAGE_INSTALLER = \"1\"
"
X11_REMOVAL_CFG=" X11_REMOVAL_CFG="
DISTRO_FEATURES_remove = \"x11\" DISTRO_FEATURES_remove = \"x11\"
" "
@ -243,6 +247,7 @@ for platform in ${DY_PLATFORMS}; do
if [ "${DY_RM_WORK}" = "true" ]; then if [ "${DY_RM_WORK}" = "true" ]; then
printf "${RM_WORK_CFG}" >> conf/local.conf printf "${RM_WORK_CFG}" >> conf/local.conf
fi fi
printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf
# Remove 'x11' distro feature if building framebuffer images # Remove 'x11' distro feature if building framebuffer images
if [ "${DY_FB_IMAGE}" = "true" ]; then if [ "${DY_FB_IMAGE}" = "true" ]; then
printf "${X11_REMOVAL_CFG}" >> conf/local.conf printf "${X11_REMOVAL_CFG}" >> conf/local.conf