From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Mar 2014 05:59:40 +0000 (+1100)
Subject: move mmotm to here as well
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=45c2cd7265f811768f6eda00b80bc0c2dfa933e5;p=next-scripts

move mmotm to here as well

and tidy up some of its import
---

diff --git a/backup_next b/backup_next
index 1834e7d..70abf7f 100755
--- 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 b3db1a3..6eb01c8 100755
--- 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 7f2c0cf..7416311 100755
--- 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 5421bb7..5237cf2 100755
--- 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