some updates

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

6 files changed, 40 insertions, 27 deletions

diff --git a/android-tools/x15/flash.sh b/android-tools/x15/flash.sh
index 61fdb40..e129f5d 100755
--- a/android-tools/x15/flash.sh
+++ b/android-tools/x15/flash.sh
@@ -31,9 +31,10 @@ function flash_image(){
     sleep 5
 }
 
-#fastboot erase environment
-#flash_image xloader ${img_dir}/MLO
-#flash_image bootloader ${img_dir}/u-boot.img
+fastboot erase environment
+fastboot oem format
+flash_image xloader ${img_dir}/MLO
+flash_image bootloader ${img_dir}/u-boot.img
 #flash_image environment ${img_dir}/am57xx-evm-reva3.dtb
 #flash_image recovery ${img_dir}/recovery.img
 #flash_image boot ${img_dir}/boot.img
diff --git a/build.sh b/build.sh
index e603cea..e8b33a9 100755
--- a/build.sh
+++ b/build.sh
@@ -35,6 +35,8 @@ function build(){
     date +%Y-%m-%d-%H-%M >>time.log
     (time LANG=C make ${targets} -j${CPUS} ) 2>&1 |tee build-${product}.log
     date +%Y-%m-%d-%H-%M >>time.log
+    mkdir -p .repo/pinned-manifest
+    repo manifest -r -o .repo/pinned-manifest/$(date +%Y-%m-%d-%H-%M)-pinned.xml
 }
 
 function build_juno(){
@@ -104,8 +106,8 @@ function setup_for_clang_upstream() {
 }
 
 function build_hikey(){
-    rm -fr out/target/product/hikey/obj/kernel/
-    rm -fr out/dist out/target/product/hikey/optee/ optee/optee_os/out/
+    #rm -fr out/target/product/hikey/obj/kernel/
+    #rm -fr out/dist out/target/product/hikey/optee/ optee/optee_os/out/
     export BUILD_CLANG_MASTER=true
     export BUILD_CLANG_MASTER=false
     if ${BUILD_CLANG_MASTER}; then
@@ -119,14 +121,14 @@ function build_hikey(){
     cd ${ROOT_DIR}
     #https://github.com/96boards/documentation/wiki/HiKeyGettingStarted#section-2 -O hikey-vendor.tar.bz2
     #wget http://builds.96boards.org/snapshots/hikey/linaro/binaries/20150706/vendor.tar.bz2 -O hikey-vendor.tar.bz2
-    export TARGET_SYSTEMIMAGES_USE_SQUASHFS=true
+    #export TARGET_SYSTEMIMAGES_USE_SQUASHFS=true
 #    export TARGET_USERDATAIMAGE_4GB=true
 #    export TARGET_USERDATAIMAGE_TYPE=f2fs
     export TARGET_BUILD_KERNEL=true
 #    export TARGET_KERNEL_USE_4_1=true
     export TARGET_BOOTIMAGE_USE_FAT=true
-    #export KERNEL_BUILD_WITH_CLANG=true
-    #export CLANG_TRIPLE=aarch64-linux-gnu-
+    export KERNEL_BUILD_WITH_CLANG=true
+    export CLANG_TRIPLE=aarch64-linux-gnu-
     #export LLVM_PREBUILTS_VERSION=clang-4679922
     ## settings for optee
     export TARGET_TEE_IS_OPTEE=true
@@ -141,6 +143,7 @@ function build_hikey(){
     if false; then
         ## lkft cts patch https://android-review.linaro.org/#/c/18007/
         ## ./96boards-hikey-aosp-master.yaml
+        :
         make -j"${CPUs}" vts cts
         # make -j8 vts showcommands dist TARGET_PRODUCT=aosp_arm64 WITH_DEXPREOPT=false TARGET_BUILD_VARIANT=userdebug
     fi
@@ -314,8 +317,8 @@ build_project() {
 # clean_for manta && build_manta
 #build_tools_ddmlib
 #build juno
-build_hikey
-#build_x15
 #build_x20
 #build_db410c
 #build_flo
+#build_hikey
+build_x15
diff --git a/host-tools/lava_submit_jobs2.py b/host-tools/lava_submit_jobs2.py
index 2685bba..0f4c281 100755
--- a/host-tools/lava_submit_jobs2.py
+++ b/host-tools/lava_submit_jobs2.py
@@ -7,10 +7,10 @@ from lava_tool.authtoken import AuthenticatingServerProxy, KeyringAuthBackend
 
 # lava-tool auth-add https://yongqin.liu@validation.linaro.org/RPC2/
 
-TOKEN = ""
-SERVER_URL="https://yongqin.liu:%s@lkft.validation.linaro.org/RPC2/" % TOKEN
 
 def submit_yaml_job(job_yaml_str, server_url):
+    #TOKEN = ""
+    #SERVER_URL="https://yongqin.liu:%s@lkft.validation.linaro.org/RPC2/" % TOKEN
     # server = xmlrpclib.ServerProxy(SERVER_URL)
     server = AuthenticatingServerProxy(server_url, auth_backend=KeyringAuthBackend())
     try:
diff --git a/host-tools/lava_submit_jobs2.sh b/host-tools/lava_submit_jobs2.sh
index 4b36700..aacad3c 100755
--- a/host-tools/lava_submit_jobs2.sh
+++ b/host-tools/lava_submit_jobs2.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
-TOKEN=""
-SERVER_URL="https://yongqin.liu:${TOKEN}@lkft.validation.linaro.org/RPC2/"
-AP_SSID="LAVATEST"
-AP_KEY="NepjqGbq"
+
+parent_dir=$(cd $(dirname $0); pwd)
+
+TOKEN="${TOKEN}"
+#SERVER_URL="https://yongqin.liu:${TOKEN}@lkft.validation.linaro.org/RPC2/"
+SERVER_URL="https://yongqin.liu:${TOKEN}@lkft-staging.validation.linaro.org/RPC2/"
+AP_SSID="${AP_SSID}"
+AP_KEY="${AP_KEY}"
 function submit_one_job(){
     local job_file="${1}"
     local build_number="${2}"
@@ -29,7 +33,7 @@ function submit_one_job(){
     #lava-tool submit-job "${SERVER_URL}" "${job_file}"
     #/development/srv/test-plans/android/submit.py "${job_file}"
     #/development/android/master/host-tools/lava_submit_jobs2.py "${job_file}" "${SERVER_URL}"
-    /data/master/host-tools/lava_submit_jobs2.py "${job_file}" "${SERVER_URL}"
+    ${parent_dir}/lava_submit_jobs2.py "${job_file}" "${SERVER_URL}"
     if [ $? -ne 0 ]; then
         echo "Failed mit job file to servier: ${SERVER_URL}"
         echo "Failed job file is: ${job_file}"
@@ -39,17 +43,19 @@ function submit_one_job(){
 }
 
 function main(){
-    local build_number="73"
-    local build_name="android-lcr-reference-hikey-o"
-    local img_ext=".img.xz"
+    local build_number="76"
+    local build_name="android-lcr-reference-x15-o"
+    #local img_ext=".img.xz"
+    local img_ext=".img"
 #    local template_dir="/development/srv/test-plans/android/xtest/"
 #    local template_dir="/development/srv/test-plans/android/cts/"
-    #local template_dir="/development/srv/test-plans/android/hikey-v2/"
-    local template_dir="/SATA3/srv/test-plans/android/hikey-v2/"
+    #local template_dir="/SATA3/srv/test-plans/android/hikey-v2/"
+    #local template_dir="/SATA3/srv/test-plans/android/x15-v2/"
+    local template_dir="/development/srv/test-plans/android/x15-v2/"
 
     #for f in $(ls ${template_dir}/*); do
     #for f in $(ls ${template_dir}/template*); do
-    for f in $(ls ${template_dir}/template-cts-*.yaml); do
+    for f in $(ls ${template_dir}/template-*.yaml); do
         f_basename=$(basename $f)
         job_file="/tmp/${f_basename}"
         cp -vf "${f}" ${job_file}
diff --git a/scripts-common/sync-common.sh b/scripts-common/sync-common.sh
index 268085a..b30e915 100755
--- a/scripts-common/sync-common.sh
+++ b/scripts-common/sync-common.sh
@@ -55,7 +55,8 @@ function parseArgs(){
 
 sync_init(){
     #while ! repo init -u $MIRROR -m ${base_manifest} -b ${branch} --no-repo-verify --repo-url=${repo_url} -g "default,-device,-non-default,hikey,flounder,-darwin,-mips,-x86" --depth=1 -p linux; do
-    while ! repo init -u $MIRROR -m ${base_manifest} -b ${branch} --no-repo-verify --repo-url=${repo_url} --depth=1 -g "default,device,-notdefault,-darwin,-mips,-x86,-juno" -p linux; do
+    #while ! repo init -u $MIRROR -m ${base_manifest} -b ${branch} --no-repo-verify --repo-url=${repo_url} --depth=1 -g "default,device,-notdefault,-darwin,-mips,-x86,-juno" -p linux; do
+    while ! repo init -u $MIRROR -m ${base_manifest} -b ${branch} --no-repo-verify --repo-url=${repo_url} --depth=1 -g "default,device,-notdefault,-darwin,-mips,-x86,-juno"; do
         sleep 30
     done
 }
diff --git a/sync-master.sh b/sync-master.sh
index 4d8e30d..fa133a2 100755
--- a/sync-master.sh
+++ b/sync-master.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# repo sync -c -j24 -m manifest.xml
+
 export BASE=$(cd $(dirname $0);pwd)
 
 source ${BASE}/scripts-common/sync-common.sh
@@ -26,6 +28,7 @@ main "$@"
 if true; then
 ${BASE}/sync-projects.sh  \
                           android-patchsets \
+                          android-build-configs \
                           device/linaro/hikey \
                           kernel/linaro/hisilicon/ \
                           frameworks/base \
@@ -55,9 +58,8 @@ fi
 func_apply_patch MASTER-RLCR-PATCHSET
 func_apply_patch hikey-master-workarounds
 func_apply_patch hikey-optee-master
-#func_apply_patch hikey-optee-4.9
-func_apply_patch hikey-optee-4.14
-#func_apply_patch hikey-clang-4.9
+func_apply_patch hikey-optee-4.9
+#func_apply_patch hikey-optee-4.14
 #func_apply_patch MASTER-CLANG-PATCHSET
 func_apply_patch x15-p-workarounds
 #func_apply_patch NOUGAT-BOOTTIME-OPTIMIZATIONS-HIKEY