Merge lp:~stevanr/linaro-android-build-tools/drop-eula-generation into lp:linaro-android-build-tools

[Stevan Radaković]

Remove EULA/OPEN-EULA support.

[Georgy Redkozubov (gesha)]

Stevan, there will be problem with toolchain builds because they don't have build-info.txt support, i.e. toolchain build doesn't generate BUILD-INFO.txt.
I guess we need to add 'open' BUILD-INFO.txt to build script directory and just copy it to the artifacts location.

[lp:~stevanr/linaro-android-build-tools/drop-eula-generation]

599. By Stevan Radaković on 2013-04-22

Add open BUILD-INFO for toolchain builds.

[Georgy Redkozubov (gesha)]

I think it's better to say:
# Add BUILD-INFO.txt support
instead of
# Add open BUILD-INFO to replace OPEN-EULA

And copy BUILD-INFO_toolchain.txt to ../out/BUILD-INFO.txt

review: Needs Fixing

[lp:~stevanr/linaro-android-build-tools/drop-eula-generation]

600. By Stevan Radaković on 2013-04-22

Fix dumb errors.

[Georgy Redkozubov (gesha)]

Looks good

review: Approve

=== added file 'build-scripts/BUILD-INFO_toolchain.txt'
--- build-scripts/BUILD-INFO_toolchain.txt	1970-01-01 00:00:00 +0000
+++ build-scripts/BUILD-INFO_toolchain.txt	2013-04-22 11:42:27 +0000
@@ -0,0 +1,7 @@
+Format-Version: 0.1
+
+
+Files-Pattern: *
+Build-Name: toolchain
+License-Type: open
+

=== modified file 'build-scripts/build-android'
--- build-scripts/build-android	2013-01-25 11:31:16 +0000
+++ build-scripts/build-android	2013-04-22 11:42:27 +0000
@@ -160,16 +160,3 @@
 if  [ -f  out/kernel_config ]; then
     (cd out/; ${BUILD_SCRIPT_ROOT}/create-user-kernel-script)
 fi
-
-# add EULA support
-(
- if [[ "$JOB_NAME" =~ .*blob.* && ("$JOB_NAME" =~ .*origen.* || "$JOB_NAME" =~ .*snowball.*) ]]
- then
-     eula="EULA.txt"
- else
-     eula="OPEN-EULA.txt"
- fi
- touch out/OPEN-EULA.txt
- cd out/target/product/*/
- touch $eula
-) || true

=== modified file 'build-scripts/build-android-toolchain'
--- build-scripts/build-android-toolchain	2012-08-02 10:26:24 +0000
+++ build-scripts/build-android-toolchain	2013-04-22 11:42:27 +0000
@@ -65,5 +65,5 @@
 $MAKE $MAKE_OPTS install prefix=$PWD/../out/cross/$TOOLCHAIN_PREFIX
 tar -cj -C ../out/cross -f ../out/android-toolchain-eabi-$GCC_VERSION-$BUILD_NUMBER-$BUILD_ID-linux-x64.tar.bz2 .
 
-# add EULA support
-touch ../out/OPEN-EULA.txt
+# Add BUILD-INFO.txt support
+cp ${BUILD_SCRIPT_ROOT}/BUILD-INFO_toolchain.txt ../out/BUILD-INFO.txt

=== modified file 'build-scripts/build-android-toolchain-linaro'
--- build-scripts/build-android-toolchain-linaro	2012-08-02 10:26:24 +0000
+++ build-scripts/build-android-toolchain-linaro	2013-04-22 11:42:27 +0000
@@ -113,5 +113,5 @@
     $i -v
 done
 
-# add EULA suport
-touch ../out/OPEN-EULA.txt
+# Add BUILD-INFO.txt support
+cp ${BUILD_SCRIPT_ROOT}/BUILD-INFO_toolchain.txt ../out/BUILD-INFO.txt

=== modified file 'utils/mangle-jobs/builders.xml'
--- utils/mangle-jobs/builders.xml	2013-04-18 13:01:57 +0000
+++ utils/mangle-jobs/builders.xml	2013-04-22 11:42:27 +0000
@@ -5,7 +5,7 @@
 bzr get lp:linaro-android-build-tools build-tools
 sudo -H -E build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "$CONFIG"
 
-time build-tools/utils/new-publish/publish -p2 $JOB_NAME/$BUILD_NUMBER "build/out/target/*/*/*.img,build/out/target/*/*/*.img.bz2,build/out/target/*/*/*.tar.bz2,build/out/target/*/*/MD5SUMS,build/out/*.tar.bz2,build/out/*.xml,build/out/*_config,build/out/lava-job-info,build/out/linaro_kernel_build_cmds.sh,build/out/linaro_android_build_cmds.sh,build/out/*EULA*,build/out/target/product/*/*EULA*,build/out/target/product/*/howto/*EULA*,build/out/BUILD-INFO.txt,build/out/*/BUILD-INFO.txt,build/out/*/*/BUILD-INFO.txt,build/out/*/*/*/BUILD-INFO.txt,build/out/target/product/*/howto/HOWTO_*.txt,build/out/target/product/*/HOWTO_*.txt"
+time build-tools/utils/new-publish/publish -p2 $JOB_NAME/$BUILD_NUMBER "build/out/target/*/*/*.img,build/out/target/*/*/*.img.bz2,build/out/target/*/*/*.tar.bz2,build/out/target/*/*/MD5SUMS,build/out/*.tar.bz2,build/out/*.xml,build/out/*_config,build/out/lava-job-info,build/out/linaro_kernel_build_cmds.sh,build/out/linaro_android_build_cmds.sh,build/out/BUILD-INFO.txt,build/out/*/BUILD-INFO.txt,build/out/*/*/BUILD-INFO.txt,build/out/*/*/*/BUILD-INFO.txt,build/out/target/product/*/howto/HOWTO_*.txt,build/out/target/product/*/HOWTO_*.txt"
 
 build-tools/node/lava-submit "$CONFIG"
 

=== modified file 'utils/mangle-jobs/push-artifacts-set.mangle'
--- utils/mangle-jobs/push-artifacts-set.mangle	2013-04-17 16:53:28 +0000
+++ utils/mangle-jobs/push-artifacts-set.mangle	2013-04-22 11:42:27 +0000
@@ -10,9 +10,6 @@
     "build/out/lava-job-info," \
     "build/out/linaro_kernel_build_cmds.sh," \
     "build/out/linaro_android_build_cmds.sh," \
-    "build/out/*EULA*," \
-    "build/out/target/product/*/*EULA*," \
-    "build/out/target/product/*/howto/*EULA*," \
     "build/out/**/BUILD-INFO.txt," \
     "build/out/target/product/*/HOWTO_*.txt" \
     "build/out/target/product/*/howto/HOWTO_*.txt"