move mmotm to here as well

and tidy up some of its import

diff --git a/backup_next b/backup_next
index 1834e7d3c5e8ba33e5bc22d3adb7151b3703cda1..70abf7fd7752db0996a55f546dc0ae408fab5039 100755 (executable)
--- a/backup_next
+++ b/backup_next
@@ -4,6 +4,7 @@ host="fs"
 [ "$1" ] && host="$1"
 
 rsync -avHP --exclude gitk.cache --exclude next-2'*'/ \
+       --include mmotm/.git --include mmotm/.git/'**' --exclude mmotm/'**' \
        --include next/.git --include next/.git/'**' --exclude next/'**' \
        --include quilt/.git --include quilt/.git/'**' --exclude quilt/'**' \
        --include next-fixes/.git --include next-fixes/.git/'**' --exclude next-fixes/'**' \

diff --git a/fetch_trees b/fetch_trees
index b3db1a34b2737922dbcb551d20ea650d20df7fdd..6eb01c8418e90494a6627dc976fb13247c577610 100755 (executable)
--- a/fetch_trees
+++ b/fetch_trees
@@ -24,11 +24,19 @@ for name in $trees; do
        fi
 
        if [ "$type" = "mmotm" ]; then
-               cd ../../mmotm/text || {
-                       echo "Cannot chdir to ../../mmotm/text" 1>&2
+               cd ../mmotm || {
+                       echo "Cannot chdir to ../mmotm" 1>&2
                        continue
                }
                rsync -avHP --exclude .git --exclude broken-out.tar.gz --delete ozlabs.org:~akpm/public_html/mmotm/. .
+               # we only use the fist lines of {origin,linux-next}.patch
+               [ -f broken-out/origin.patch ] &&
+                       sed -i 1q broken-out/origin.patch
+               [ -f broken-out/linux-next.patch ] &&
+                       sed -i 1q broken-out/linux-next.patch
+               git add -A .
+               [ "$(git status --porcelain)" ] &&
+                                git commit -m "$(head -n 1 .DATE)"
                cd "$origwd"
                continue
        fi

diff --git a/import-akpm b/import-akpm
index 7f2c0cf3a7a8cc6c08a18c2fe05b018b90439225..7416311d7449ff9aef4b54fc65baa295055775c9 100755 (executable)
--- a/import-akpm
+++ b/import-akpm
@@ -14,14 +14,17 @@ execute()
        [ ${PIPESTATUS[0]} -eq 0 ] || $SHELL -i || exit 1
 }
 
-mmotm="../../mmotm/text"
+mmotm="../mmotm"
 sfile="$mmotm/series"
 cpwd=$(pwd)
 
 [ -f "$mmotm/broken-out/origin.patch" ] &&
        base=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/origin.patch")
-[ "$base" ] ||
-       base=$(git describe --abbrev=0 origin/master)
+[ "$base" ] || {
+       base=$(tail -n 1 "$mmotm/.DATE")
+       base=${base#v}
+       base="v${base}"
+}
 nbase=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/linux-next.patch")
 git rev-parse --verify "$base" >/dev/null || {
        log "Unknown origin BASE $base"

diff --git a/to_ozlabs b/to_ozlabs
index 5421bb7edfc6d7cb6d5883c3c09eef9a5f3ba5af..5237cf2f65351a2b22e906469c7b4963c15ee6ac 100755 (executable)
--- a/to_ozlabs
+++ b/to_ozlabs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GIT_REPOS="next next-history.git quilt next-fixes tools etc"
+GIT_REPOS="next next-history.git quilt next-fixes tools etc mmotm"
 
 cd ~/kernels/next