From: maximilian attems Date: Mon, 26 Apr 2004 11:18:36 +0000 Subject: [Kernel-janitors] [PATCH] update Documentation/SubmittingPatches to Message-Id: <20040426111835.GD1251@sputnik.stro.at> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============71230243570660468==" List-Id: To: kernel-janitors@vger.kernel.org --===============71230243570660468== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, 26 Apr 2004, Coywolf Qi Hunt wrote: > >>======================================================================== > >>--- linux-2.6.5/arch/i386/boot/setup.S.orig Sat Mar 6 23:49:33 2004 > >>+++ linux-2.6.5/arch/i386/boot/setup.S Sun Mar 7 07:23:10 2004 > >> > > > >you didn't read the faq ;) > > > I was misled by Documentation/SubmittingPatches. > Patch: remove the bootsect_helper code and a comment fix also. update Documentation/SubmittingPatches to current patch level, change references from 2.4 to 2.6 and more important suggest the users home dir for his patching and source building (fhs compliance). change tar.gz in bz2 use. please speak up if you prefer variable names MYTREE versus SRCTREE, tried to be consistent in choice. a++ maks --- linux-2.6.6/Documentation/SubmittingPatches 2004-04-26 11:16:30.000000000 +0200 +++ linux-2.6.6-maks/Documentation/SubmittingPatches 2004-04-26 13:14:41.000000000 +0200 @@ -35,25 +35,28 @@ not in any lower subdirectory. To create a patch for a single file, it is often sufficient to do: - SRCTREE= /devel/linux-2.4 + SRCTREE= ~/src/linux-2.6.x + MYTREE= ~/src/linux-2.6.x-foo MYFILE= drivers/net/mydriver.c - cd $SRCTREE - cp $MYFILE $MYFILE.orig + cd ~/src + cp -a $SRCTREE $MYTREE + cd $MYTREE vi $MYFILE # make your change - diff -up $MYFILE.orig $MYFILE > /tmp/patch + cd .. + diff -up $SRCTREE/$MYFILE $MYTREE/$MYFILE > /tmp/patch To create a patch for multiple files, you should unpack a "vanilla", or unmodified kernel source tree, and generate a diff against your own source tree. For example: - MYSRC= /devel/linux-2.4 + MYTREE= ~/src/linux-2.6.x-foo - tar xvfz linux-2.4.0-test11.tar.gz - mv linux linux-vanilla + cd ~/src + tar xvfj linux-2.6.6.bz2 + mv linux-2.6.6 linux-vanilla wget http://www.moses.uklinux.net/patches/dontdiff - diff -uprN -X dontdiff linux-vanilla $MYSRC > /tmp/patch - rm -f dontdiff + diff -uprN -X dontdiff linux-vanilla $MYTREE > /tmp/patch "dontdiff" is a list of files which are generated by the kernel during the build process, and should be ignored in any diff(1)-generated --===============71230243570660468== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============71230243570660468==--