scripts/tag_stable: add script

[thirdparty/kernel/stable-queue.git] / scripts / quilt-mail

diff --git a/scripts/quilt-mail b/scripts/quilt-mail
index f7bb03473dcb930fe8b956738999bdaddca0a66f..17c4166fb56bf5bbffc714b24b116fd5f025c016 100755 (executable)
--- a/scripts/quilt-mail
+++ b/scripts/quilt-mail
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# locations of some things that you might want to override if you are a
+# different developer than gregkh
+STABLE_QUEUE="/home/gregkh/linux/stable/stable-queue/"
+TMP_DIR="/home/gregkh/linux/tmp/"
+
+
 SCRIPT_NAME=`basename ${0}`
 MBOX="$1"
 if [ "${MBOX}" == "" ] ; then
@@ -9,8 +15,11 @@ if [ "${MBOX}" == "" ] ; then
        exit
 fi
 
-FULL_VERSION=`ketchup -m`
+FULL_VERSION=`kv`
 BASE_VERSION=${FULL_VERSION/-rc?/}
+VERSION=`basename \`pwd\``
+ROOT_VERSION=${VERSION/\.y/}
+ROOT_VERSION=${ROOT_VERSION/linux-/}
 DATE=`date -u --date="2 days"`
 
 if [ ${FULL_VERSION} == ${BASE_VERSION} ] ; then
@@ -18,14 +27,46 @@ if [ ${FULL_VERSION} == ${BASE_VERSION} ] ; then
        exit
 fi
 
-if [ ! -f "diffstat" ] ; then
-       echo "You forgot to create the 'diffstat' file, please do that first."
-       exit
-fi
 
-echo "Creating the mailbox for kernel release ${FULL_VERSION}"
+# create a directory for everything to live in
+TMP_DIR=`mktemp -d ${TMP_DIR}/stable-${ROOT_VERSION}-XXXX` || exit 1
+
+# Generate the Makefile diff, with just the version number change in it
+# relies on filterdiff from the wonderful patchutils package
+git diff Makefile | filterdiff --hunks 1 > ${TMP_DIR}/Makefile.patch
+
+
+# make a git tree to create the log file in the format that Linus likes.
+echo "Creating a git tree of the commits..."
+ORIGINAL_DIR=`pwd`
+TMP_TREE=`mktemp -d ${TMP_DIR}/stable-${ROOT_VERSION}-XXXX` || exit 1
+TMP_LOG=`mktemp ${TMP_DIR}/stable-log-XXXX` || exit 1
+git clone -s . ${TMP_TREE}
+cd ${TMP_TREE}
+git checkout -b temp_branch
+git quiltimport --patches=${STABLE_QUEUE}/queue-${ROOT_VERSION}
+
+# Apply the Makefile patch and commit it
+patch -p1 < ${TMP_DIR}/Makefile.patch
+git commit -a -m "Linux ${FULL_VERSION}"
+
+# Generate the diffstat and patch
+git diff ${VERSION}..HEAD > ${TMP_DIR}/patch-${FULL_VERSION}
+git diff --stat ${VERSION}..HEAD > ${TMP_DIR}/diffstat
+
+# sign the patch
+gpg -a -b ${TMP_DIR}/patch-${FULL_VERSION}
+
+# generate the log file
+git log --abbrev=12 --format="%aN <%aE>%n    %s%n" ${VERSION}..HEAD > ${TMP_LOG}
+
+# clean up the git tree by deleting it
+cd ${ORIGINAL_DIR}
+rm -rf ${TMP_TREE}
+
 
-TMPFILE=`mktemp stable_header.XXXXXX` || exit 1
+echo "Creating the mailbox for kernel release ${FULL_VERSION}"
+TMPFILE=`mktemp ${TMP_DIR}/stable_header.XXXXXX` || exit 1
 NUM_PATCHES=`quilt series | wc -l`
 
 (
@@ -46,25 +87,60 @@ echo ""
 echo "greg k-h"
 echo ""
 echo "-------------"
-cat diffstat
+echo "Pseudo-Shortlog of commits:"
+echo ""
+cat ${TMP_LOG}
+#stable-shortlog
+echo ""
+echo "-------------"
+echo ""
+echo "Diffstat:"
+echo ""
+
+cat ${TMP_DIR}/diffstat
 ) > ${TMPFILE}
 
-FROM="Greg KH <gregkh@linuxfoundation.org>"
-TO="linux-kernel@vger.kernel.org, stable@vger.kernel.org"
-CC="torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk"
+FROM="Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
+TO="linux-kernel@vger.kernel.org"
+#CC="torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk"
+#CC="alan@lxorguk.ukuu.org.uk"
+CC="stable@vger.kernel.org"
 SUBJECT="${BASE_VERSION}-stable review"
 
-quilt mail --mbox ${MBOX}      \
+quilt mail --mbox ${TMP_DIR}/${MBOX}   \
        -m "$(cat ${TMPFILE})"  \
        --sender "${FROM}"      \
        --from "${FROM}"        \
        --to "${TO}"            \
        --cc "${CC}"            \
-       --prefix ""             \
+       --prefix "PATCH ${ROOT_VERSION}"        \
        --subject "${SUBJECT}"
 
-rm ${TMPFILE}
-echo "mbox is now in ${MBOX}"
+rm ${TMPFILE} ${TMP_LOG}
+
+echo "mbox is now in ${TMP_DIR}/${MBOX}"
+
+#echo "Add:"
+#echo "Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org"
+#echo "to the first email."
 
 #q mail --mbox x -m "$(cat ../stable-queue/00)" --sender gregkh@lf.org --from gregkh@lf.org --to foo@foo --subject "This is the subject"
 
+cd ${TMP_DIR}
+${STABLE_QUEUE}../mbox2send ${ROOT_VERSION} ${MBOX}
+#< ${MBOX}.new formail -ds sh -c 'cat > msg.$FILENO'
+splitmbox.py ${MBOX}.new .
+
+# Add Linus and Andrew to the first email only:
+#sed -i -e "s/Cc: alan@lxorguk\.ukuu\.org\.uk/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, alan@lxorguk\.ukuu\.org\.uk/" ${TMP_DIR}/msg.000
+sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
+
+
+# Create a script to upload the patch to kernel.org and to send the patches out
+echo "#!/bin/bash" > ${TMP_DIR}/send_it_off
+echo "kup --host=gregkh@geb.kernel.org put patch-${FULL_VERSION} patch-${FULL_VERSION}.asc /pub/linux/kernel/v3.0/stable-review/patch-${FULL_VERSION}.gz" >> ${TMP_DIR}/send_it_off
+echo "git send-email msg.*" >> ${TMP_DIR}/send_it_off
+chmod 755 ${TMP_DIR}/send_it_off
+
+echo "cd ${TMP_DIR}"
+echo "./send_it_off"