aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2012-12-13 19:58:44 -0700
committerJohn Rigby <john.rigby@linaro.org>2012-12-13 19:58:44 -0700
commit087a44e3762b2c0162331522e38360b1da899a44 (patch)
tree56fd9feae3b02bc8533006679cd5d8158cd11004
parentf3c1c59a272afef15f791b3ec52a9336bb7c90c6 (diff)
Revert "use prepend-path for custom toolchains"
This reverts commit c1e7750f17c3406c9c49ff8402ade48f115fc063.
-rwxr-xr-xscripts/package_kernel17
1 files changed, 12 insertions, 5 deletions
diff --git a/scripts/package_kernel b/scripts/package_kernel
index 0a272a8..4c46c34 100755
--- a/scripts/package_kernel
+++ b/scripts/package_kernel
@@ -346,6 +346,15 @@ __END__
true
}
+install_custom_toolchain()
+{
+ export debuild_prepend_path="--prepend-path $HOME/tc/bin"
+ test -d ~/tc/bin && return 0
+ mkdir -p ~/tc
+ tar --strip-components=1 -C ~/tc -xf gcc-linaro-aarch64*.tar.*
+ true
+}
+
test_build_source_pkg()
{
mkdir -p test_build
@@ -355,7 +364,7 @@ test_build_source_pkg()
test "$use_ccache" = "true" && {
sed -i -e 's/CC.*=.*CROSS_COMPILE.gcc/CC = ccache $(CROSS_COMPILE)gcc/' Makefile
}
- time debuild --prepend-path="$debuild_prepend_path" --no-lintian -j4 -us -uc -b -a$DEBARCH
+ time debuild $debuild_prepend_path --no-lintian -j4 -us -uc -b -a$DEBARCH
cd ..
ln *.deb *.changes ../../out
}
@@ -576,10 +585,6 @@ while (( $# > 0 )) ; do
job_flavour=${2/.cfg/}
shift
;;
- --prepend-path)
- debuild_prepend_path=$2
- shift
- ;;
+([[:alpha:]_])*([[:word:]])=+([-[:word:]:/.]))
eval "export $1"
;;
@@ -621,6 +626,8 @@ test "$do_publish_release_tag" == "true" && {
}
test "$do_test_build_source_pkg" == "true" && {
+ test -f gcc-linaro-aarch64*.tar.* && install_custom_toolchain
+ test -d ~/tc/bin && install_custom_toolchain
cd kernel_build
test_build_source_pkg
cd ..