diff options
author | Yongqin Liu <yongqin.liu@linaro.org> | 2016-12-12 21:18:23 +0800 |
---|---|---|
committer | Yongqin Liu <yongqin.liu@linaro.org> | 2016-12-12 21:18:23 +0800 |
commit | 7b7ecd762f77a1480c699e14aa7fd1f1db31079d (patch) | |
tree | c869c581cf7e540ab50d4d5ef0ce889a2cabfb08 | |
parent | 37e521bee8a951d9ef4ecab7bb3631aaa7ed9d02 (diff) |
changes for brillobrillo
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | build.sh | 188 | ||||
-rw-r--r-- | host-tools/nfs.txt | 28 | ||||
-rw-r--r-- | liuyq-patches/liuyq.xml | 38 | ||||
-rwxr-xr-x | scripts-common/sync-common.sh | 2 | ||||
-rwxr-xr-x | sync-aosp.sh | 22 | ||||
-rwxr-xr-x | sync-brillo.sh (renamed from sync-nougat-private.sh) | 38 | ||||
-rwxr-xr-x | sync-for-memory.sh | 23 | ||||
-rwxr-xr-x | sync-lollipop-linaro.sh | 12 | ||||
-rwxr-xr-x | sync-lollipop-local-normal.sh | 31 | ||||
-rwxr-xr-x | sync-lollipop-local-private.sh | 33 | ||||
-rwxr-xr-x | sync-master.sh | 26 |
12 files changed, 53 insertions, 389 deletions
@@ -42,3 +42,4 @@ linaro-hikey-20160226-67c37b1a.tgz platform_testing/ Android.bp bootstrap.bash +product @@ -1,24 +1,12 @@ #!/bin/bash -CPUS=$(grep processor /proc/cpuinfo |wc -l) -#CPUS=1 -ROOT_DIR=$(cd $(dirname $0); pwd) - -targets="selinuxtarballs" -#targets="boottarball" -variant="userdebug" - -#export INCLUDE_STLPORT_FOR_MASTER=true -#export INCLUDE_LAVA_HACK_FOR_MASTER=true -#export TARGET_GCC_VERSION_EXP=5.3-linaro -#export USE_CLANG_PLATFORM_BUILD=false -export WITH_DEXPREOPT=true -#export MALLOC_IMPL=dlmalloc -#export MALLOC_IMPL_MUSL=true +CPUS=$(grep processor /proc/cpuinfo |wc -l) +targets="droid" function build(){ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ export PATH=${JAVA_HOME}/bin:$PATH + local variant=eng product="${1}" if [ -z "${product}" ]; then return @@ -32,172 +20,4 @@ function build(){ date +%Y-%m-%d-%H-%M >>time.log } -function build_hikey(){ - #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 - targets="droid" - 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 - build hikey - targets="selinuxtarballs" -} - -function build_manta(){ - #export WITH_DEXPREOPT=true - export TARGET_PREBUILT_KERNEL=device/samsung/manta/kernel - targets="droidcore" - build aosp_manta - unset TARGET_PREBUILT_KERNEL - targets="selinuxtarballs" -} - -function clean_for_manta(){ - rm -fr out/target/product/manta/obj/ETC - rm -fr out/target/product/manta/boot.img - rm -fr out/target/product/manta/root - rm -fr out/target/product/manta/ramdisk* - rm -fr out/target/product/manta/obj/EXECUTABLES/init_intermediates -} - -function build_flounder(){ - export TARGET_PREBUILT_KERNEL=device/htc/flounder-kernel/Image.gz-dtb - targets="droidcore" - build aosp_flounder - unset TARGET_PREBUILT_KERNEL - targets="selinuxtarballs" -} - -function build_flo(){ - export TARGET_PREBUILT_KERNEL=device/asus/flo-kernel/kernel - targets="droidcore" - build aosp_flo - unset TARGET_PREBUILT_KERNEL - targets="selinuxtarballs" -} - -function build_vexpress(){ - export TARGET_UEFI_TOOLS=arm-eabi- - build vexpress - unset TARGET_UEFI_TOOLS -} - -function build_tools_ddmlib(){ - export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/ - export PATH=${JAVA_HOME}/bin:$PATH - export ANDROID_HOME=/backup/soft/adt-bundle-linux/sdk/ - cd tools - ./gradlew prepareRepo copyGradleProperty - if [ $? -ne 0 ]; then - echo "Failed to run:./gradlew prepareRepo copyGradleProperty" - return - fi - ./gradlew assemble - if [ $? -ne 0 ]; then - ./gradlew clean assemble - if [ $? -ne 0 ]; then - echo "Failed to run:./gradlew clean assemble" - return - fi - fi - ./gradlew :base:ddmlib:build - unset JAVA_HOME -} - -function build_x15(){ - CROSS_COMPILE="/SATA3/nougat/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-none-eabi-" - #local gcc_path="/SATA3/nougat/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" - #CROSS_COMPILE="arm-linux-androideabi-" - #export ARCH=arm - local kernel_dir=${ROOT_DIR}/kernel/ti/x15 - local uboot_dir=${ROOT_DIR}/ti/u-boot - local output_dir=${ROOT_DIR}/out/target/product/am57xevm/ - - # compile u-boot - if false; then - cd ${uboot_dir} - make am57xx_evm_nodt_defconfig - make -j${CPUS} - cd ${ROOT_DIR}/ - fi - - # compile kernel - if false; then - cd ${kernel_dir} - KERNEL_OUT=${output_dir}/obj/kernel - rm -fr "${KERNEL_OUT}" && mkdir -p "${KERNEL_OUT}" - make distclean - ./ti_config_fragments/defconfig_builder.sh -t ti_sdk_am57x_android_release - mv -v arch/arm/configs/ti_sdk_am57x_android_release_defconfig ${KERNEL_OUT}/ti_sdk_am57x_android_release_defconfig - make -j1 O=${KERNEL_OUT} ARCH=arm KCONFIG_ALLCONFIG=${KERNEL_OUT}/ti_sdk_am57x_android_release_defconfig alldefconfig - if [ $? -ne 0 ]; then - echo "Failed to generate .config" - exit - fi - make -j${CPUS} O=${KERNEL_OUT} ARCH=arm CROSS_COMPILE="${CROSS_COMPILE}" zImage - if [ $? -ne 0 ]; then - echo "Failed to compile kernel" - exit - fi - - make O=${KERNEL_OUT} ARCH=arm CROSS_COMPILE="${CROSS_COMPILE}" am57xx-evm-reva3.dtb - if [ $? -ne 0 ]; then - echo "Failed to compile dtb" - exit - fi - cd ${ROOT_DIR}/ - - cp -fv ${KERNEL_OUT}/arch/arm/boot/zImage device/ti/am57xevm/kernel - fi - - - export TARGET_BUILD_KERNEL=true - # compile android - targets="droidcore" - build full_am57xevm - targets="selinuxtarballs" - - # compile pvrsrvkm.ko - if false; then - local eurasiacon_dir=${ROOT_DIR}/device/ti/proprietary-open/jacinto6/sgx_src/eurasia_km/eurasiacon - local src_dir=${eurasiacon_dir}/build/linux2/omap_android - #local pvrsrvkm_f=${eurasiacon_dir}/binary2_omap_android_release/target/pvrsrvkm.ko - local pvrsrvkm_f=${ROOT_DIR}/out/target/product/am57xevm/target/kbuild/pvrsrvkm.ko - - make V=1 -j${CPUS} \ - ARCH=arm \ - TARGET_DEVICE="am57xevm" \ - TARGET_PRODUCT="am57xevm" \ - BUILD=release \ - KERNELDIR=/SATA3/nougat/out/target/product/am57xevm/obj/kernel/ \ - KERNEL_CROSS_COMPILE=/SATA3/nougat/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- \ - CROSS_COMPILE=/SATA3/nougat//prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- \ - ANDROID_ROOT=/SATA3/nougat \ - OUT=/SATA3/nougat/out/target/product/am57xevm \ - -C ${src_dir} - build - - - - mkdir -p ${output_dir}/system/lib/modules - cp ${pvrsrvkm_f} ${output_dir}/system/lib/modules - fi - - if false; then - cp -uvf ${uboot_dir}/u-boot.img ${uboot_dir}/MLO ${output_dir} - cp -uvf ${kernel_dir}/arch/arm/boot/zImage ${kernel_dir}/arch/arm/boot/dts/am57xx-evm-reva3.dtb ${output_dir} - fi -} - -#build_vexpress -#build fvp -# clean_for manta && build_manta -#build_tools_ddmlib -#build juno -#build_hikey -build_x15 -#build_flounder -#build_flo +build dragonboard diff --git a/host-tools/nfs.txt b/host-tools/nfs.txt new file mode 100644 index 0000000..3e4ab54 --- /dev/null +++ b/host-tools/nfs.txt @@ -0,0 +1,28 @@ + + +sudo apt-get install nfs-kernel-server nfs-common + +19:48:49 liuyq: nougat$ cat /etc/exports +# /etc/exports: the access control list for filesystems which may be exported +# to NFS clients. See exports(5). +# +# Example for NFSv2 and NFSv3: +# /srv/homes hostname1(rw,sync,no_subtree_check) hostname2(ro,sync,no_subtree_check) +# +# Example for NFSv4: +# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check) +# /srv/nfs4/homes gss/krb5i(rw,sync,no_subtree_check) +# +/SATA3/aosp-mirror *(insecure,rw,sync,no_subtree_check,no_root_squash) +19:48:55 liuyq: nougat$ + +Path could not be ended with / + +sudo /etc/init.d/nfs-kernel-server restart +sudo exportfs -r +sudo mount -o nolock -t nfs 192.168.0.102:/SATA3/aosp-mirror /SATA3/aosp-mirror/ + +19:49:59 liuyq: nougat$ showmount -e 192.168.0.102 +Export list for 192.168.0.102: +/SATA3/aosp-mirror * +19:50:29 liuyq: nougat$ diff --git a/liuyq-patches/liuyq.xml b/liuyq-patches/liuyq.xml deleted file mode 100644 index 81676c4..0000000 --- a/liuyq-patches/liuyq.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest> - <remote name="github4liuyq" fetch="https://github.com/" /> - <remote name="local" fetch="file:////SATA3/aosp-mirror/hikey/" /> - - <project path="packages/apps/AndroidTerm" name="platform/external/AndroidTerm" revision="linaro-master" remote="linaro-android"/> - <project path="packages/inputmethods/hackerskeyboard" name="liuyq/hackerskeyboard" revision="master" remote="github4liuyq"/> - <project path="external/lzo" name="liuyq/lzo.git" revision="master" remote="github4liuyq"/> - <project path="external/btrfs-progs" name="liuyq/btrfs-progs" revision="android-btrfs" remote="github4liuyq"/> - <!-- https://android-git.linaro.org/git/platform/external/iozone.git --> - <project path="external/iozone" name="platform/external/iozone.git" revision="iozone3_434" remote="linaro-android"/> - <project path="packages/apps/0xbench" name="platform/packages/apps/0xbench.git" revision="linaro-master" remote="linaro-android"/> - <!-- https://git.linaro.org/people/satish.patel/android-bonnie.git --> - <project path="external/bonnie" name="people/satish.patel/android-bonnie.git" revision="master" remote="linaro-other"/> - -<!-- - <project path="external/opencv-upstream" name="Itseez/opencv" revision="master" remote="github4liuyq" /> - <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" remote="linaro-android"/> - <project path="external/opencv-upstream" name="liuyq/opencv" revision="master" remote="github4liuyq" /> ---> - <project path="android-tools/apks" name="liuyq/apks" revision="master" remote="github4liuyq" /> - <!-- - https://code.videolan.org/videolan/vlc-android.git - <project path="android-tools/apks" name="liuyq/apks" revision="master" remote="github4liuyq" /> - - <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.1-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.1-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.2-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.2-linaro" /> - --> - <!-- - <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.3-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.3-linaro" /> - --> - <!-- https://github.com/96boards-hikey/edk2.git --> -</manifest> diff --git a/scripts-common/sync-common.sh b/scripts-common/sync-common.sh index fcfd1bd..9f15843 100755 --- a/scripts-common/sync-common.sh +++ b/scripts-common/sync-common.sh @@ -55,7 +55,7 @@ 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" -p linux; do + while ! repo init -u $MIRROR -m ${base_manifest} -b ${branch} --no-repo-verify --repo-url=${repo_url} --depth=1 -g "bdk,dragonboard" -p linux; do sleep 30 done } diff --git a/sync-aosp.sh b/sync-aosp.sh deleted file mode 100755 index 2754f87..0000000 --- a/sync-aosp.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env sh - -export BASE=`pwd` -#mirror="http://android.git.linaro.org/git/platform/manifest.git" -mirror="git://android.git.linaro.org/platform/manifest.git" -repo_url="git://android.git.linaro.org/tools/repo" -base_manifest="default.xml" -branch="master" - -sync(){ - - while ! repo init -u ${mirror} -m ${base_manifest} -b ${branch} --no-repo-verify --repo-url=${repo_url}; do - sleep 30 - done - - #Syncronize and check out - while ! repo sync -j 16; do - sleep 30 - done -} - -sync diff --git a/sync-nougat-private.sh b/sync-brillo.sh index 955c4ae..a465c38 100755 --- a/sync-nougat-private.sh +++ b/sync-brillo.sh @@ -4,33 +4,33 @@ export BASE=$(cd $(dirname $0);pwd) source ${BASE}/scripts-common/sync-common.sh if [ -d /SATA3/aosp-mirror/platform/manifest.git ]; then - export MIRROR="/SATA3/aosp-mirror/platform/manifest.git" + export MIRROR="/SATA3/aosp-mirror/brillo/manifest.git" elif [ -d /home/yongqin.liu/aosp-mirror/platform/manifest.git ]; then - export MIRROR="/home/yongqin.liu/aosp-mirror/platform/manifest.git" + export MIRROR="/home/yongqin.liu/aosp-mirror/brillo/manifest.git" else echo "Please specify value for MIRROR" exit 1 fi -branch="android-7.1.0_r7" +branch="brillo-m10-release" LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" LOCAL_MANIFEST_BRANCH="linaro-nougat" main "$@" -${BASE}/sync-projects.sh \ - system/gatekeeper \ - build \ - bionic \ - android-patchsets \ - device/linaro/hikey \ - kernel/linaro/hisilicon/ \ - frameworks/base \ - frameworks/av \ +#${BASE}/sync-projects.sh \ +# system/gatekeeper \ +# build \ +# bionic \ +# android-patchsets \ +# device/linaro/hikey \ +# kernel/linaro/hisilicon/ \ +# frameworks/base \ +# frameworks/av \ -${BASE}/sync-projects.sh \ - kernel/ti/x15/ \ +#${BASE}/sync-projects.sh \ +# kernel/ti/x15/ \ # ti/u-boot/ \ # art \ @@ -39,14 +39,14 @@ ${BASE}/sync-projects.sh \ #export http_proxy=192.168.0.102:37586 #export https_proxy=192.168.0.102:37586 -func_apply_patch NOUGAT-MLCR-PATCHSET -func_apply_patch NOUGAT-BOOTTIME-OPTIMIZATIONS +#func_apply_patch NOUGAT-MLCR-PATCHSET +#func_apply_patch NOUGAT-BOOTTIME-OPTIMIZATIONS #func_apply_patch juno-m-workarounds #func_apply_patch marshmallow-gcc5-patchset #func_apply_patch marshmallow-gcc6-patchset -func_apply_patch hikey-n-workarounds -func_apply_patch hikey-optee-n -func_apply_patch x15-n-workarounds +#func_apply_patch hikey-n-workarounds +#func_apply_patch hikey-optee-n +#func_apply_patch x15-n-workarounds #func_apply_patch nexus9-workarounds #func_apply_patch get-hikey-blobs diff --git a/sync-for-memory.sh b/sync-for-memory.sh deleted file mode 100755 index b86667f..0000000 --- a/sync-for-memory.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -export BASE=$(cd $(dirname $0);pwd) - -source ${BASE}/scripts-common/sync-common.sh - -export MIRROR="http://android.git.linaro.org/git/platform/manifest.git" -branch="android-6.0.1_r3" - -LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" -LOCAL_MANIFEST_BRANCH="linaro-marshmallow" - -main "$@" - -${BASE}/sync-projects.sh build \ - bionic \ - art \ - android-patchsets \ - -./android-patchsets/marshmallow-gcc5-patchset -./android-patchsets/marshmallow-ram-patchset - -#./build.sh -exit diff --git a/sync-lollipop-linaro.sh b/sync-lollipop-linaro.sh deleted file mode 100755 index a0795c7..0000000 --- a/sync-lollipop-linaro.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -export BASE=$(cd $(dirname $0);pwd) - -source ${BASE}/scripts-common/sync-common.sh - -export MIRROR="http://android.git.linaro.org/git/platform/manifest.git" -branch="android-5.1.1_r24" - -LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" -LOCAL_MANIFEST_BRANCH="linaro-lollipop" - -main "$@" diff --git a/sync-lollipop-local-normal.sh b/sync-lollipop-local-normal.sh deleted file mode 100755 index 7eec604..0000000 --- a/sync-lollipop-local-normal.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -export BASE=$(cd $(dirname $0);pwd) - -source ${BASE}/scripts-common/sync-common.sh - -export MIRROR="/SATA3/aosp-mirror/platform/manifest.git" -branch="android-5.1.1_r24" -LOCAL_MANIFEST="git://android.git.linaro.org/platform/manifest.git" -LOCAL_MANIFEST_BRANCH="linaro-lollipop" - -main "$@" - -${BASE}/sync-projects.sh build \ - bionic \ - -# art \ -# external/opencv-upstream \ -# external/zlib \ -# external/chromium_org - -./android-patchsets/LOLLIPOP-STABLE-PATCHSET -./android-patchsets/nexus9-workarounds -./android-patchsets/hikey-lcr-board-workaround - - -cp host-tools/LOLLIPOP-LIUYQ-PATCHSET ./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET -./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET - -./build.sh -#adb reboot bootloader -#ANDROID_PRODUCT_OUT=out/target/product/flounder/ fastboot -w flashall diff --git a/sync-lollipop-local-private.sh b/sync-lollipop-local-private.sh deleted file mode 100755 index 9b79050..0000000 --- a/sync-lollipop-local-private.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -export BASE=$(cd $(dirname $0);pwd) - -source ${BASE}/scripts-common/sync-common.sh - -export MIRROR="/SATA3/aosp-mirror/platform/manifest.git" -branch="android-5.1.1_r24" -LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" -LOCAL_MANIFEST_BRANCH="linaro-lollipop" - -main "$@" - -${BASE}/sync-projects.sh build \ - bionic \ - android-patchsets \ - -# art \ -# external/opencv-upstream \ -# external/zlib \ -# external/chromium_org - -./android-patchsets/LOLLIPOP-MLCR-PATCHSET -./android-patchsets/LOLLIPOP-CHROMIUM-PATCHSET -./android-patchsets/nexus9-workarounds -./android-patchsets/hikey-lcr-board-workaround - - -cp host-tools/LOLLIPOP-LIUYQ-PATCHSET ./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET -./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET - -#./build.sh -#adb reboot bootloader -#ANDROID_PRODUCT_OUT=out/target/product/flounder/ fastboot -w flashall diff --git a/sync-master.sh b/sync-master.sh deleted file mode 100755 index 50f6049..0000000 --- a/sync-master.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -export BASE=$(cd $(dirname $0);pwd) - -source ${BASE}/scripts-common/sync-common.sh - -if [ -d /SATA3/aosp-mirror/platform/manifest.git ]; then - export MIRROR="/SATA3/aosp-mirror/platform/manifest.git" -elif [ -d /home/yongqin.liu/aosp-mirror/platform/manifest.git ]; then - export MIRROR="/home/yongqin.liu/aosp-mirror/platform/manifest.git" -else - echo "Please specify value for MIRROR" -fi -branch="master" - -LOCAL_MANIFEST=http://android.git.linaro.org/git/platform/manifest.git -LOCAL_MANIFEST_BRANCH=linaro-master - -#cp -uvf android-tools/kernel.xml .repo/local_manifests/kernel.xml -main "$@" - -func_apply_patch hikey-optee -#func_apply_patch hikey-optee-kernel-4.4 -#apply_patch nexus9-workarounds -func_apply_patch get-hikey-blobs - -#./build.sh |