aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2013-01-17 12:22:22 -0700
committerJohn Rigby <john.rigby@linaro.org>2013-01-17 12:46:05 -0700
commitbe94abea4a1ad39479f2afa02af0f9b196113ae6 (patch)
tree8c787020bfe82ee4fa9e7c2eab82dc949ea87311 /scripts
parentc28de1bb98086f4e734842eb927cf356e9882d5f (diff)
make boot wrapper optional
Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/package_kernel26
1 files changed, 16 insertions, 10 deletions
diff --git a/scripts/package_kernel b/scripts/package_kernel
index 90782c1..6a94240 100755
--- a/scripts/package_kernel
+++ b/scripts/package_kernel
@@ -176,13 +176,15 @@ setup_kernel_git()
git remote add -t $kernel_branch \
kernel_remote \
$kernel_repo
- boot_wrapper_desc="Boot Wrapper"
- rm -rf ../boot-wrapper
- cd ..
- git clone $boot_wrapper_repo boot-wrapper
- cd boot-wrapper
- git branch -r
- git checkout origin/$boot_wrapper_branch
+ test "$boot_wrapper_repo" && {
+ boot_wrapper_desc="Boot Wrapper"
+ rm -rf ../boot-wrapper
+ cd ..
+ git clone $boot_wrapper_repo boot-wrapper
+ cd boot-wrapper
+ git branch -r
+ git checkout origin/$boot_wrapper_branch
+ }
cd ../linux
linaro_ubuntu_packaging_desc="Packaging template"
git remote add -t $linaro_ubuntu_packaging_branch \
@@ -204,9 +206,13 @@ setup_kernel_git()
git clean -d -f -x
test -d debian && git rm -r debian
test -d debian.linaro && git rm -r debian.linaro
- mkdir -p linaro
- cp -a ../boot-wrapper/ linaro
- git add linaro/boot-wrapper/
+ test "$boot_wrapper_repo" && {
+ test -d linaro/boot-wrapper && rm -rf linaro/boot-wrapper
+ mkdir -p linaro
+ cp -a ../boot-wrapper/ linaro
+ rm -rf linaro/boot-wrapper/.git
+ git add linaro/boot-wrapper/
+ }
git checkout remotes/linaro_ubuntu_packaging_remote/$linaro_ubuntu_packaging_branch \
-- \
debian \