From b0daebcb4ffd3677b126ad55124ca7640cbdb7fc Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Date: Wed, 3 Oct 2012 11:40:06 +0300
Subject: Handle seed tarballs w/o top-level directory of seed name.

This allows to just rename seed tarballs for testing/debugging.
---
 build-scripts/helpers | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'build-scripts/helpers')

diff --git a/build-scripts/helpers b/build-scripts/helpers
index 4f3536c..6399d95 100644
--- a/build-scripts/helpers
+++ b/build-scripts/helpers
@@ -46,11 +46,21 @@ repo-sync-from-mirror () {
 repo-sync-from-seed () {
     setup-repo-vars
 
+    local seed_name=$(basename $REPO_SEED_URL .tar.gz)
+    mkdir -p $seed_name
+
     export TIMEFORMAT="TIME: Seed download and uncompress: %lR"
-    time curl --silent --show-error "$REPO_SEED_URL" | gzip -d -c | tar x
+    time curl --silent --show-error "$REPO_SEED_URL" | gzip -d -c | tar -C $seed_name -x
     unset TIMEFORMAT
 
-    repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR --reference=$PWD/$(basename $REPO_SEED_URL .tar.gz)
+    # Handle old seed format
+    if [ -d $seed_name/$seed_name ]; then
+        mv $seed_name ${seed_name}_
+        mv ${seed_name}_/$seed_name .
+        rmdir ${seed_name}_
+    fi
+
+    repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR --reference=$PWD/$seed_name
     mkdir -p out
     cp .repo/manifest.xml out/source-manifest.xml
 
-- 
cgit v1.2.3