update to_build_host a bit

[next-scripts] / fetch_trees

diff --git a/fetch_trees b/fetch_trees
index e8c91f7a2b6ee621beee83f2d7194ac787af42be..2db70cdb77e15bf0ba00ff54dda4a7bbf0447c24 100755 (executable)
--- a/fetch_trees
+++ b/fetch_trees
@@ -37,73 +37,23 @@ fetch_git()
 }
 
 fetch_mmotm()
-{
-       (
-               if ! cd ../mmotm; then
-                       printf 'Cannot chdir to ../mmotm\n' 1>&2
-                       return
-               fi
-               if ! rsync -az --partial --exclude '.git*' \
-                               --exclude broken-out.tar.gz --delete \
-                               ozlabs.org::akpm/mmotm/. .; then
-                       git reset --hard
-                       printf 'Fetcing mmotm failed\n' 1>&2
-                       return
-               fi
-               git add -A .
-               if [ "$(git status --porcelain)" ]; then
-                       git commit -m "$(head -n 1 .DATE)"
-               fi
-       )
-}
-
-fetch_quilt()
-{
-       (
-               url=$(get_field "$1" 4)
-               url=${url%/}    # strip trailing / if necessary
-
-               if ! cd ../quilt; then
-                       printf 'Cannot chdir to ../quilt\n' 1>&2
-                       return
-               fi
-               if ! [ -d "$1" ] && ! mkdir "$1"; then
-                       printf 'Cannot create quilt directory for %s\n' "$1" 1>&2
-                       return
-               fi
-               if ! cd "$1"; then
-                       printf 'Cannot chdir to quilt directory for %s\n' "$1" 1>&2
-                       return
-               fi
-               if ! wget -N -nv --no-cache "$url/series"; then
-                       printf 'Wget of %s series file failed\n' "$1" 1>&2
-                       cd ..
-                       rm -rf "$1"
-                       git checkout "$1"
-                       return
-               fi
-               find . -type f | sed 's,^./,,;/^series$/d' | sort >.series.old
-               if grep -q NEXT_PATCHES series; then
-                       sed -n '/NEXT_PATCHES_START/,/NEXT_PATCHES_END/p' series
-               else
-                       cat series
-               fi |
-                       sed -e 's/[ \t]*#.*$//' -e '/^[ \t]*$/d' |
-                       sort >.series.next
-               if [ -s .series.next ]; then
-                       if ! wget -N -nv --no-cache -B "$url/" -i .series.next; then
-                               printf 'Wget of series %s failed\n' "$1" 1>&2
-                               cd ..
-                               rm -rf "$1"
-                               git checkout "$1"
-                               return
-                       fi
-               fi
-               comm -23 .series.old .series.next | xargs -r rm -f
-               rm -f .series.old .series.next
-               setfattr -x user.xdg.origin.url ./* >/dev/null 2>&1
-       )
-}
+(
+       if ! cd ../mmotm; then
+               printf 'Cannot chdir to ../mmotm\n' 1>&2
+               return
+       fi
+       if ! rsync -az --partial --exclude '.git*' \
+                       --exclude broken-out.tar.gz --delete \
+                       gandalf.ozlabs.org::akpm/mmotm/. .; then
+               git reset --hard
+               printf 'Fetcing mmotm failed\n' 1>&2
+               return
+       fi
+       git add -A .
+       if [ "$(git status --porcelain)" ]; then
+               git commit -m "$(head -n 1 .DATE)"
+       fi
+)
 
 trees="$*"
 if ! [ "$trees" ]; then
@@ -133,13 +83,4 @@ for name in $trees; do
        fi
 done
 
-if ! cd ../quilt; then
-       printf 'hmmm, what happened to the quilt directory?\n' 1>&2
-       exit 1
-fi
-git add -A .
-if [ "$(git status --porcelain)" ]; then
-       git commit -v -a -m "$(date '+%F-%H:%M')" -e
-fi
-
 exit 0