From: Greg Kroah-Hartman Date: Thu, 16 Feb 2012 17:05:56 +0000 (-0800) Subject: update some scripts X-Git-Tag: v3.0.22~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1582f8c5bb371815a3b731c7511b974bd7a2c6f6;p=thirdparty%2Fkernel%2Fstable-queue.git update some scripts --- diff --git a/scripts/added-to-stable b/scripts/added-to-stable index 3d2ec302954..b5fe361edee 100755 --- a/scripts/added-to-stable +++ b/scripts/added-to-stable @@ -1,20 +1,11 @@ #!/bin/bash -#. patchfns 2>/dev/null || -#. /usr/lib/patch-scripts/patchfns 2>/dev/null || -#. $PATCHSCRIPTS_LIBDIR/patchfns 2>/dev/null || -#{ -# echo "Impossible to find my library 'patchfns'." -# echo "Check your install, or go to the right directory" -# exit 1 -#} - -KERNEL_MINOR_VERSION='31' +KERNEL_MINOR_VERSION='34' KERNEL="2.6.$KERNEL_MINOR_VERSION" -EMAIL_ADDRESS='' +EMAIL_ADDRESS='' -STABLE='' +STABLE='' STABLE_COMMITS='' extract_addr() @@ -88,7 +79,7 @@ author() author=$(echo "$author" | tr ' ' '\n' | grep -v "$first_author" | sort | uniq) author="$first_author $author" - eval $1=$(echo "$author" | sed -e 's/ /,/g') + eval $1=$(echo $author | sed -e 's/ /,/g') if [ x"$3" != x ] then eval $3=$first_author @@ -109,8 +100,9 @@ reply() # exit 1 # fi echo "PATCH=$PATCH" - TITLE=`grep "Subject:" $PATCH` -# TITLE=$(head -n 2 $PATCH | tail -n 1) +# SUBJECT=`grep "Subject:" $PATCH` + SUBJECT=`grep "Subject:" $PATCH | sed s/Subject\:\ //` +# SUBJECT=$(head -n 2 $PATCH | tail -n 1) MESSAGE_ID=`grep -i "^Message-ID:" $PATCH | cut -f 2 -d ' ' | cut -f 2 -d '<' | cut -f 1 -d '>'` author AUTHOR $1 FIRST_AUTHOR echo "author said $AUTHOR" @@ -133,7 +125,7 @@ reply() cc="-cc $cc" fi - SUBJECT="patch $PATCH added to $KERNEL-stable tree" +# SUBJECT="patch $PATCH added to $KERNEL-stable tree" CHARSET=$(guess-charset "$PATCH") if test "x$CHARSET" = "ANSI_X3.4-1968"; then @@ -150,17 +142,19 @@ reply() ( echo - echo -n "This is a note to let you know that we have just queued up the " - echo "patch titled" + echo "This is a note to let you know that I've just added the patch titled" echo - echo " $TITLE" + echo " $SUBJECT" echo - echo "to the $KERNEL-stable tree. Its filename is" + echo "to the $KERNEL-stable tree which can be found at:" + echo " http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary" echo - echo " $PATCH" + echo "The filename of the patch is:" + echo " " `basename "$PATCH"` + echo "and it can be found in the queue-$KERNEL subdirectory." echo - echo "A git repo of this tree can be found at " - echo " http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary" + echo "If you, or anyone else, feels it should not be added to the stable tree," + echo "please let know about it." echo echo cat $PATCH @@ -175,15 +169,14 @@ reply() makemail -to "$AUTHOR" \ -from="$FROM" \ -cc="$STABLE, $STABLE_COMMITS" \ - -subject="$SUBJECT" \ + -subject="Patch \"$SUBJECT\" has been added to the $KERNEL-stable tree" \ -date="$(date -R)" \ -reply_to="$MESSAGE_ID" \ -message_id="$ID" \ "$CHARCMD" \ | \ - # talk to the suse network instead of localhost (due to the way suse.de now handles email...) - # smtpsend -server=$SMTP_SERVER $to -from=$FROM - msmtp $to + ~/bin/msmtp-enqueue.sh -a coco "$to" + #msmtp $to } for patch_file in $* diff --git a/scripts/bad_stable b/scripts/bad_stable index b22be636152..1f8548b771a 100755 --- a/scripts/bad_stable +++ b/scripts/bad_stable @@ -1,7 +1,7 @@ #!/bin/bash -STABLE_VERSION="3.1" -EMAIL_ADDRESS='' +STABLE_VERSION="" +EMAIL_ADDRESS='' extract_addr() { @@ -154,17 +154,22 @@ reply() makemail -to "$AUTHOR" \ -from="$FROM" \ -cc="$STABLE" \ - -subject="patch \"$SUBJECT\" failed to apply to $STABLE_VERSION-stable tree" \ + -subject="FAILED: patch \"$SUBJECT\" failed to apply to $STABLE_VERSION-stable tree" \ -date="$(date -R)" \ -message_id="$ID" \ "$CHARCMD" | \ - # talk to the suse network instead of localhost (due to the way suse.de now handles email...) - #msmtp $to -# ~/bin/msmtp-enqueue.sh -a suse $to - ~/bin/msmtp-enqueue.sh -a coco $to + ~/bin/msmtp-enqueue.sh -a coco $to } +STABLE_VERSION="$1" +shift +if [ "${STABLE_VERSION}" == "" ] ; then + echo "Must provide kernel version to be told is bad\n" + exit; +fi + +echo "STABLE_VERSION = ${STABLE_VERSION}" for git_id in $* do diff --git a/scripts/dorelease b/scripts/dorelease index 87340416538..085c6f17993 100755 --- a/scripts/dorelease +++ b/scripts/dorelease @@ -25,6 +25,9 @@ MINOR=${REL_ARRAY[2]} LONGTERM=0 # see if this is a "longterm" kernel or not +if [ $MINOR == "27" ]; then + LONGTERM=1 +fi if [ $MINOR == "32" ]; then LONGTERM=1 fi @@ -105,15 +108,18 @@ fi echo "# " HOST="gregkh@geb.kernel.org" +SCRIPT="${RELDIR}/upload_v${RELEASE}" +touch ${SCRIPT} + if [ $LONGTERM -eq 1 ]; then echo "# This is a longterm release" echo "# finalize the release:" echo "cd ${RELDIR}" - echo "kup --host=${HOST} put --tar --prefix=linux-${RELEASE}/ /pub/scm/linux/kernel/git/stable/linux-stable.git v${RELEASE} linux-${RELEASE}.tar.asc /pub/linux/kernel/v${VER}/longterm/linux-${RELEASE}.tar.gz" - echo "kup --host=${HOST} put ChangeLog-${RELEASE} ChangeLog-${RELEASE}.asc /pub/linux/kernel/v${VER}/longterm/" - echo "kup --host=${HOST} put patch-${RELEASE} patch-${RELEASE}.asc /pub/linux/kernel/v${VER}/longterm/patch-${RELEASE}.gz" + echo "kup --host=${HOST} put --tar --prefix=linux-${RELEASE}/ /pub/scm/linux/kernel/git/stable/linux-stable.git v${RELEASE} linux-${RELEASE}.tar.asc /pub/linux/kernel/v${VER}/longterm/v${BASE}/linux-${RELEASE}.tar.gz" | tee -a ${SCRIPT} + echo "kup --host=${HOST} put ChangeLog-${RELEASE} ChangeLog-${RELEASE}.asc /pub/linux/kernel/v${VER}/longterm/v${BASE}/" | tee -a ${SCRIPT} + echo "kup --host=${HOST} put patch-${RELEASE} patch-${RELEASE}.asc /pub/linux/kernel/v${VER}/longterm/v${BASE}/patch-${RELEASE}.gz" | tee -a ${SCRIPT} if [ $INCREMENTAL -ne 0 ]; then - echo "kup --host=${HOST} put patch-${LAST_REL}-${REL} patch-${LAST_REL}-${REL}.asc /pub/linux/kernel/v${VER}/longterm/incr/patch-${LAST_REL}-${REL}.gz" + echo "kup --host=${HOST} put patch-${LAST_REL}-${REL} patch-${LAST_REL}-${REL}.asc /pub/linux/kernel/v${VER}/longterm/v${BASE}/incr/patch-${LAST_REL}-${REL}.gz" | tee -a ${SCRIPT} fi # echo "mv $RELDIR/linux-${RELEASE}.tar.gz ~/v2.6/longterm/v${BASE}/" # echo "mv $RELDIR/ChangeLog-${RELEASE} ~/v2.6/longterm/v${BASE}/" @@ -126,11 +132,11 @@ else echo "# This is a stable release" echo "# finalize it:" echo "cd ${RELDIR}" - echo "kup --host=${HOST} put --tar --prefix=linux-${RELEASE}/ /pub/scm/linux/kernel/git/stable/linux-stable.git v${RELEASE} linux-${RELEASE}.tar.asc /pub/linux/kernel/v${VER}/linux-${RELEASE}.tar.gz" - echo "kup --host=${HOST} put ChangeLog-${RELEASE} ChangeLog-${RELEASE}.asc /pub/linux/kernel/v${VER}/" - echo "kup --host=${HOST} put patch-${RELEASE} patch-${RELEASE}.asc /pub/linux/kernel/v${VER}/patch-${RELEASE}.gz" + echo "kup --host=${HOST} put --tar --prefix=linux-${RELEASE}/ /pub/scm/linux/kernel/git/stable/linux-stable.git v${RELEASE} linux-${RELEASE}.tar.asc /pub/linux/kernel/v${VER}/linux-${RELEASE}.tar.gz" | tee -a ${SCRIPT} + echo "kup --host=${HOST} put ChangeLog-${RELEASE} ChangeLog-${RELEASE}.asc /pub/linux/kernel/v${VER}/" | tee -a ${SCRIPT} + echo "kup --host=${HOST} put patch-${RELEASE} patch-${RELEASE}.asc /pub/linux/kernel/v${VER}/patch-${RELEASE}.gz" | tee -a ${SCRIPT} if [ $INCREMENTAL -ne 0 ]; then - echo "kup --host=${HOST} put patch-${LAST_REL}-${REL} patch-${LAST_REL}-${REL}.asc /pub/linux/kernel/v${VER}/incr/patch-${LAST_REL}-${REL}.gz" + echo "kup --host=${HOST} put patch-${LAST_REL}-${REL} patch-${LAST_REL}-${REL}.asc /pub/linux/kernel/v${VER}/incr/patch-${LAST_REL}-${REL}.gz" | tee -a ${SCRIPT} fi # echo "mv $RELDIR/patch-${LAST_REL}-${REL}.gz ~" # echo "mv $RELDIR/diffstat-${LAST_REL}-${REL} ~" diff --git a/scripts/makemail b/scripts/makemail index 447de1ac43b..9bddc96e056 100755 --- a/scripts/makemail +++ b/scripts/makemail @@ -24,7 +24,7 @@ GetOptions(\%options, "cc=s", "subject=s", "date=s", - "reply_to=s", + "reply_to:s", "message_id=s", "charset=s" ); @@ -45,7 +45,9 @@ if (defined($options{"date"})) { print("Date: " . $options{"date"} . "\n"); } if (defined($options{"reply_to"})) { - print("In-Reply-To: <" . $options{"reply_to"} . ">\n"); + if ($options{"reply_to"} ne "") { + print("In-Reply-To: <" . $options{"reply_to"} . ">\n"); + } } if (defined($options{"message_id"})) { print("Message-ID: <" . $options{"message_id"} . ">\n");