4 files changed, 12 insertions, 65 deletions
diff --git a/jjb/common/include-agl-bitbake-image.sh b/jjb/common/include-agl-bitbake-image.sh
index 40634445..dd65a6b6 100644
--- a/jjb/common/include-agl-bitbake-image.sh
+++ b/jjb/common/include-agl-bitbake-image.sh
@@ -15,6 +15,6 @@ cat conf/local.conf
 # finally, build the agl-demo-platform (we retry to catch the tar-native bug)
 ( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ;  bitbake -v -v $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 1 ) 
 
-bitbake --dump-signature=none $TARGETIMAGE
-cp locked-sigs.inc tmp/deploy/images/
+#bitbake --dump-signature $TARGETIMAGE
+#cp locked-sigs.inc tmp/deploy/images/
 du -hs tmp/deploy/*
diff --git a/jjb/common/include-agl-run-ycl-ci.sh b/jjb/common/include-agl-run-ycl-ci.sh
index 932e47fa..bdadbb6d 100644
--- a/jjb/common/include-agl-run-ycl-ci.sh
+++ b/jjb/common/include-agl-run-ycl-ci.sh
@@ -7,6 +7,9 @@
 
 pushd .
 
+external/poky/scripts/install-buildtools
+source external/poky/buildtools/environment-setup-x86_64-pokysdk-linux
+
 # meta-agl
 pushd meta-agl
   if test -x scripts/ci-yocto-check-layer.sh ; then
diff --git a/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh b/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh
index 5707b9c6..ce6584d3 100644
--- a/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh
+++ b/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh
@@ -4,66 +4,3 @@
 ################################################################################
 ## bitbake the image
 ################################################################################
-
-#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then
-#bitbake wic-tools
-#fi
-
-echo "#### $MYPROJECT ###"
-
-if test x"meta-agl-devel" = x"$MYPROJECT" ; then 
-
-if test x"qemux86-64" = x"$MACHINE" ; then
-
-
-TARGETIMAGE="agl-image-boot-basesystem"
-TARGETFEATURES="agl-basesystem agl-ci"
-
-echo "#### DO CI FOR $MYPROJECT , $TARGETFEATURES and $TARGETIMAGE"
-
-pushd $REPODIR
-
-SETUP_OPTS="--topic change-${GERRIT_CHANGE_NUMBER}-${GERRIT_PATCHSET_NUMBER}"
-
-# source the env
-source meta-agl/scripts/aglsetup.sh ${SETUP_OPTS} -m ${MACHINE} -b output-meta-agl-devel -f ${TARGETFEATURES}
-
-# link the shared downloads and sstate-cache
-ln -sf ../../downloads
-ln -sf ../../sstate-cache
-
-echo "" >> conf/local.conf
-echo "### ADDED BY AUTOBUILDER ###" >> conf/local.conf
-echo "" >> conf/local.conf
-
-# save some pre-build env needed to uniquely identify the source
-MANIFEST_R=repo-manifest-r.txt
-repo manifest -r > ${MANIFEST_R}
-sha1sum ${MANIFEST_R} | awk '{print $1}' > ${MANIFEST_R}.sha1
-
-cat <<EOF > pre-build-env.txt
-TARGETBRANCH=${TARGETBRANCH}
-TARGETIMAGE=${TARGETIMAGE}
-TARGETFEATURES=${TARGETFEATURES}
-TARGETMACHINE=${TARGETMACHINE}
-TARGETPROJECT=${TARGETPROJECT}
-MACHINE=${MACHINE}
-GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-EOF
-
-
-# finally, build the agl-demo-platform (we retry to catch the tar-native bug)
-( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ;  bitbake -v -v $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 1 ) 
-
-
-
-du -hs tmp/deploy/*
-
-popd
-
-fi
-# / qemux86-64
-
-fi
-# / meta-agl-devel
-\ No newline at end of file
diff --git a/jjb/common/include-agl-source-aglsetup.sh b/jjb/common/include-agl-source-aglsetup.sh
index 44b6ae6c..3f6b4c9f 100644
--- a/jjb/common/include-agl-source-aglsetup.sh
+++ b/jjb/common/include-agl-source-aglsetup.sh
@@ -6,6 +6,10 @@
 ################################################################################
 SETUP_OPTS=""
 
+external/poky/scripts/install-buildtools
+source external/poky/buildtools/environment-setup-x86_64-pokysdk-linux
+
+
 # check aglsetup version
 source meta-agl/scripts/aglsetup.sh --version >/dev/null 2>&1 || AGLSETUP_VERSION=1.0.0
 
@@ -41,3 +45,6 @@ MACHINE=${MACHINE}
 GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
 GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
 EOF
+
+
+