diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-25 23:42:04 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-25 23:42:04 +0800 |
| commit | fb4a1697ac3d0520b40d3f333292a2074d333d0c (patch) | |
| tree | b8ff2ff0dc4bb837edf1f5b3871d4efaff36b644 | |
| parent | 6e079131958380d9a07eea60f604b9b3b559e9a4 (diff) | |
| parent | e7ac23beaa9f0a7c1641fad8f1f5d2ac807fd917 (diff) | |
Merge branch 'master' of ssh://git.linaro.org/people/yongqin.liu/public/android
| -rwxr-xr-x | host-tools/refactory_system_img.sh | 6 | ||||
| -rwxr-xr-x | scripts-common/sync-common.sh | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/host-tools/refactory_system_img.sh b/host-tools/refactory_system_img.sh index 8c09dbe..a01b245 100755 --- a/host-tools/refactory_system_img.sh +++ b/host-tools/refactory_system_img.sh @@ -46,8 +46,8 @@ sudo umount "${d_raw}" rmdir "${d_raw}" rm "${f_raw_img}" -sed -i /ro.setupwizard.enterprise_mode=1/d "${d_system}/build.prop" -sed -i /ro.setupwizard.network_required=true/d "${d_system}/build.prop" +#sed -i /ro.setupwizard.enterprise_mode=1/d "${d_system}/build.prop" +sed -i 's/ro.setupwizard.network_required=true/ro.setupwizard.network_required=false/' "${d_system}/build.prop" ${f_make_ext4fs} -s -T -1 -S ${f_file_contexts} -l "${system_size}" -J -a system "${f_system_img_new}" "${d_system}" -rm -fr "${d_system}" +rm -fr "${d_system}" ${f_file_contexts} diff --git a/scripts-common/sync-common.sh b/scripts-common/sync-common.sh index 96e79b3..0df99c7 100755 --- a/scripts-common/sync-common.sh +++ b/scripts-common/sync-common.sh @@ -93,7 +93,8 @@ juno_mali_binary(){ if [ -f ./${b_name} ]; then return fi - curl --fail --silent --show-error -b license_accepted_51722ba4ccc270bcd54cb360cb242798=yes http://snapshots.linaro.org/android/binaries/arm/20141112/vendor.tar.bz2 >${b_name} + #curl --fail --silent --show-error -b license_accepted_51722ba4ccc270bcd54cb360cb242798=yes http://snapshots.linaro.org/android/binaries/arm/20141112/vendor.tar.bz2 >${b_name} + curl --fail --silent --show-error -b license_accepted_51722ba4ccc270bcd54cb360cb242798=yes http://snapshots.linaro.org/android/binaries/arm/20150612/vendor.tar.bz2 >${b_name} tar jxvf ${b_name} } |