diff for duplicates of <20050428223414.GA22785@kroah.com> diff --git a/a/1.txt b/N1/1.txt index d731489..38b6d15 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,118 +76,3 @@ somewhere and have others use them. I suggest using something like: Examples of the output of this script can be seen at: http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ - - --------------- next part -------------- -#!/bin/bash -# -# Copyright 2005 Greg Kroah-Hartman <gregkh@suse.de> -# -# Released under the GPL v2 only. -# -# Horrible hack of a script to let kernel maintainers, who use quilt -# export a series of patches in a form that is rolled up, and in-order -# for others to pick up and use. Examples of this is for the -mm releases. -# - -# Here are the things you should modify: - -# AUTHOR is your name, it will be pre-appended to all patches -AUTHOR=gregkh - -# KERNEL is the base kernel version your quilt series is against. You need to -# have this kernel tree already uncompressed and waiting in the TMP directory -KERNEL=2.6.12-rc3 - -# TMP is where you want everything to happen. You need to have a base kernel -# version (specified by KERNEL) in here, all unpacked. This is also where the -# end result files will be placed. -TMP=~/linux/tmp - -# PATCH_DIR is the location of your quilt patches. There should be a file in -# here called "series" and a bunch of patches in subdirectories below that (the -# subdirs are how you divide stuff up by TREES) -PATCH_DIR=~/linux/patches - -# TREES is a list of the different sets of kernel patches you wish to produce. -# If you only have one set of patches, this can be a single value. The strings -# here need to have a subdirectory in the PATCH_DIR to get the patches from. -TREES="driver i2c pci usb" - - -# Don't touch anything below here, unless you really want to... - -do_it() { - NEW=$BASE-$TREE - CLEAN_TREE="$BASE$OLD_TREE" - BASENAME=`echo "$AUTHOR" "$SERIES" "$TREE" | \ - awk '{ printf("%s-%02d-%s\n", $1, $2, $3, $4);}'` - TMPDIR=$TMP/$BASENAME - - echo "Building series file for $TREE" - chmod 644 $PATCH_DIR/$TREE/*.patch - mkdir $TMPDIR - touch $TMPDIR/series - count=1 - for x in `grep "$TREE\/" $PATCH_DIR/series` - do - file=`basename $x` - name=`echo "$AUTHOR" "$TREE" "$count" "$file" | \ - awk '{ printf("%s-%s-%03d_%s\n", $1, $2, $3, $4);}'` - cp $PATCH_DIR/$x $TMPDIR/$name - echo "$name" >> $TMPDIR/series - let count++ - done - - echo "Creating $NEW kernel tree" - cp -alp $CLEAN_TREE $NEW - - # apply quilt series - cd $NEW - QUILT_PATCHES=$TMPDIR QUILT_SERIES=$TMPDIR/series quilt push -aq --quiltrc - rm $TMPDIR/series - cd .. - - # TODO put "changelog" in patch. - echo "diffing $CLEAN_TREE and $NEW" - diff -Naur -X ../dontdiff $CLEAN_TREE $NEW > $BASENAME-$KERNEL.patch - - echo "cleaning up quilt remnants $NEW" - rm -rf $NEW/.pc - - echo "Patch is at $BASENAME-$KERNEL.patch" - echo "Dir of patches is at $TMPDIR" - echo "" - let SERIES++ -} - -BASE=linux-$KERNEL -# make sure we have a base tree to diff off of. -if [ ! -d "$TMP/$BASE" ] ; then - echo "I need $TMP/$BASE present in order to work properly." - exit 1 -fi - -# make sure everything is readable by world for when we upload the patches -find $PATCH_DIR -type f | xargs chmod 644 - -# initialize some variables -SERIES=1 -OLD_TREE="" - -# do the work -cd $TMP - -for TREE in $TREES -do - do_it - if [ "X$OLD_TREE" != "X" ] ; then - echo "Cleaning up $BASE$OLD_TREE" - rm -rf $BASE$OLD_TREE - fi - OLD_TREE="-$TREE" -done -if [ "X$OLD_TREE" != "X" ] ; then - echo "Cleaning up $BASE$OLD_TREE" - rm -rf $BASE$OLD_TREE -fi diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..f644f01 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,2 @@ +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename=make_patchsets diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..44ece2b --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,112 @@ +#!/bin/bash +# +# Copyright 2005 Greg Kroah-Hartman <gregkh@suse.de> +# +# Released under the GPL v2 only. +# +# Horrible hack of a script to let kernel maintainers, who use quilt +# export a series of patches in a form that is rolled up, and in-order +# for others to pick up and use. Examples of this is for the -mm releases. +# + +# Here are the things you should modify: + +# AUTHOR is your name, it will be pre-appended to all patches +AUTHOR=gregkh + +# KERNEL is the base kernel version your quilt series is against. You need to +# have this kernel tree already uncompressed and waiting in the TMP directory +KERNEL=2.6.12-rc3 + +# TMP is where you want everything to happen. You need to have a base kernel +# version (specified by KERNEL) in here, all unpacked. This is also where the +# end result files will be placed. +TMP=~/linux/tmp + +# PATCH_DIR is the location of your quilt patches. There should be a file in +# here called "series" and a bunch of patches in subdirectories below that (the +# subdirs are how you divide stuff up by TREES) +PATCH_DIR=~/linux/patches + +# TREES is a list of the different sets of kernel patches you wish to produce. +# If you only have one set of patches, this can be a single value. The strings +# here need to have a subdirectory in the PATCH_DIR to get the patches from. +TREES="driver i2c pci usb" + + +# Don't touch anything below here, unless you really want to... + +do_it() { + NEW=$BASE-$TREE + CLEAN_TREE="$BASE$OLD_TREE" + BASENAME=`echo "$AUTHOR" "$SERIES" "$TREE" | \ + awk '{ printf("%s-%02d-%s\n", $1, $2, $3, $4);}'` + TMPDIR=$TMP/$BASENAME + + echo "Building series file for $TREE" + chmod 644 $PATCH_DIR/$TREE/*.patch + mkdir $TMPDIR + touch $TMPDIR/series + count=1 + for x in `grep "$TREE\/" $PATCH_DIR/series` + do + file=`basename $x` + name=`echo "$AUTHOR" "$TREE" "$count" "$file" | \ + awk '{ printf("%s-%s-%03d_%s\n", $1, $2, $3, $4);}'` + cp $PATCH_DIR/$x $TMPDIR/$name + echo "$name" >> $TMPDIR/series + let count++ + done + + echo "Creating $NEW kernel tree" + cp -alp $CLEAN_TREE $NEW + + # apply quilt series + cd $NEW + QUILT_PATCHES=$TMPDIR QUILT_SERIES=$TMPDIR/series quilt push -aq --quiltrc + rm $TMPDIR/series + cd .. + + # TODO put "changelog" in patch. + echo "diffing $CLEAN_TREE and $NEW" + diff -Naur -X ../dontdiff $CLEAN_TREE $NEW > $BASENAME-$KERNEL.patch + + echo "cleaning up quilt remnants $NEW" + rm -rf $NEW/.pc + + echo "Patch is at $BASENAME-$KERNEL.patch" + echo "Dir of patches is at $TMPDIR" + echo "" + let SERIES++ +} + +BASE=linux-$KERNEL +# make sure we have a base tree to diff off of. +if [ ! -d "$TMP/$BASE" ] ; then + echo "I need $TMP/$BASE present in order to work properly." + exit 1 +fi + +# make sure everything is readable by world for when we upload the patches +find $PATCH_DIR -type f | xargs chmod 644 + +# initialize some variables +SERIES=1 +OLD_TREE="" + +# do the work +cd $TMP + +for TREE in $TREES +do + do_it + if [ "X$OLD_TREE" != "X" ] ; then + echo "Cleaning up $BASE$OLD_TREE" + rm -rf $BASE$OLD_TREE + fi + OLD_TREE="-$TREE" +done +if [ "X$OLD_TREE" != "X" ] ; then + echo "Cleaning up $BASE$OLD_TREE" + rm -rf $BASE$OLD_TREE +fi diff --git a/a/content_digest b/N1/content_digest index 35ac6e3..8a9b598 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0kernel maintainer's HOWTO for quilt and -mm\0" - "Date\0Thu, 19 May 2005 06:25:55 +0000\0" + "Date\0Thu, 28 Apr 2005 15:34:14 -0700\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Andrew Morton <akpm@osdl.org>\0" - "\00:1\0" + "\01:1\0" "b\0" "Kernel Developer's guide to using quilt so everyone else benefits.\n" "\n" @@ -82,10 +82,10 @@ "\trsync -avP -e ssh --delete tmp/gregkh-* gregkh@some_public_box:/pub/linux/kernel/people/gregkh/gregkh-2.6/\n" "\n" "Examples of the output of this script can be seen at:\n" - "\thttp://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/\n" - "\n" - "\n" - "-------------- next part --------------\n" + "\thttp://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/" + "\01:2\0" + "fn\0make_patchsets\0" + "b\0" "#!/bin/bash\n" "#\n" "# Copyright 2005 Greg Kroah-Hartman <gregkh@suse.de>\n" @@ -199,4 +199,4 @@ "\trm -rf $BASE$OLD_TREE\n" fi -e8f14b4de89b27fcf5c7ec788e1165d992e41ff74d3c59653d507b96bf52b197 +88ff37fe801abada8259a061c3d7e429db488c264fbb814c376e3dd8ecec904f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.