From 1a36cbee70204a1604e8dee1de90d8b624354296 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 18 Aug 2016 17:47:49 +0200 Subject: [PATCH] build-github.sh: define default bitbake targets per platform Instead of having one default image target for all platforms allow to define this per platform. This is needed because for example for the 'ccimx6ulstarter' we want to define a default command line image instead of a QT-based one. Signed-off-by: Javier Viguera --- sdk/build-github.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sdk/build-github.sh b/sdk/build-github.sh index bbe509e71..95aa7ef40 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -16,13 +16,13 @@ # Parameters set by Jenkins: # DY_PLATFORMS: Platforms to build # DY_REVISION: Revision of the manifest repository (for 'repo init') -# DY_TARGET: Target image (the default is 'dey-image-qt') +# DY_TARGET: Target image (the default is platform dependent) # #=============================================================================== set -e -AVAILABLE_PLATFORMS="ccardimx28js ccimx6sbc" +AVAILABLE_PLATFORMS="ccardimx28js ccimx6sbc ccimx6ulstarter" MANIFEST_URL="https://github.com/digi-embedded/dey-manifest.git" @@ -98,7 +98,16 @@ purge_sstate() { # Set default values if not provided by Jenkins [ -z "${DY_PLATFORMS}" ] && DY_PLATFORMS="$(echo ${AVAILABLE_PLATFORMS})" -[ -z "${DY_TARGET}" ] && DY_TARGET="dey-image-qt" + +# Per-platform data +while read _pl _tgt; do + [ -n "${DY_TARGET}" ] && _tgt="${DY_TARGET}" || true + eval "${_pl}_tgt=\"${_tgt}\"" +done<<-_EOF_ + ccardimx28js dey-image-qt + ccimx6sbc dey-image-qt + ccimx6ulstarter core-image-base +_EOF_ YOCTO_IMGS_DIR="${WORKSPACE}/images" YOCTO_INST_DIR="${WORKSPACE}/dey.$(echo ${DY_REVISION} | tr '/' '_')" @@ -133,6 +142,7 @@ fi # Create projects and build rm -rf ${YOCTO_IMGS_DIR} ${YOCTO_PROJ_DIR} for platform in ${DY_PLATFORMS}; do + eval platform_targets="\${${platform}_tgt}" _this_prj_dir="${YOCTO_PROJ_DIR}/${platform}" _this_img_dir="${YOCTO_IMGS_DIR}/${platform}" mkdir -p ${_this_img_dir} ${_this_prj_dir} @@ -151,8 +161,8 @@ for platform in ${DY_PLATFORMS}; do if [ "${DY_FB_IMAGE}" = "true" ]; then printf "${X11_REMOVAL_CFG}" >> conf/local.conf fi - for target in ${DY_TARGET}; do - printf "\n[INFO] Building the $target target.\n" + for target in ${platform_targets}; do + printf "\n[INFO] Building the ${target} target.\n" time bitbake ${target} done purge_sstate