From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.12] helo=sc8-sf-mx2.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1DJnK6-0000RW-T6 for user-mode-linux-devel@lists.sourceforge.net; Thu, 07 Apr 2005 23:50:34 -0700 Received: from smtp005.mail.ukl.yahoo.com ([217.12.11.36]) by sc8-sf-mx2.sourceforge.net with smtp (Exim 4.41) id 1DJnK2-0002Sw-4k for user-mode-linux-devel@lists.sourceforge.net; Thu, 07 Apr 2005 23:50:34 -0700 From: Blaisorblade Subject: Re: [uml-devel] [patch] Fix broken compiling under 2.6.12-rc2 with sed 3.02 References: <200504080126.49602.rob@landley.net> In-Reply-To: <200504080126.49602.rob@landley.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200504080856.35818.blaisorblade@yahoo.it> Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Fri, 8 Apr 2005 08:56:31 +0200 To: user-mode-linux-devel@lists.sourceforge.net Cc: Rob Landley , Ian McDonald On Friday 08 April 2005 07:26, Rob Landley wrote: > Old versions of sed from 1998 (predating the first release of gcc 2.95, but > still in use by debian stable) don't understand the single-line version of > the sed append command. Since newer versions of sed still understand > the... ahem, "vintage" form of the command, change it to use that. > > Signed-off-by: Rob Landley > Acked-by: Ian McDonald > > --- linux-2.6.11.old/arch/um/kernel/Makefile 2005-04-08 01:06:15.000000000 > -0400 Note that your mailer wrapper the patch (only the first line), the saved file is wrapped like above. And Kmail doesn't mangle inline patches on saving (I've tested it multiple times). If you can't fix this, next time use attachments (with display as inline) with "7bit" encoding (i.e. not encoded). > +++ linux-2.6.11/arch/um/kernel/Makefile 2005-04-08 01:08:44.000000000 > -0400 @@ -53,6 +53,7 @@ > cmd_quote2 = sed -e '/CONFIG/{' \ > -e 's/"CONFIG"\;/""/' \ > -e 'r $(obj)/config.tmp' \ > - -e 'a""\;' \ > + -e 'a \' \ > + -e '""\;' \ > -e '}' \ > $< > $@ Ok, it's the same I diffed, I'm using your log and queueing for the next merge. It'll be in -bs3. -- Paolo Giarrusso, aka Blaisorblade Linux registered user n. 292729 http://www.user-mode-linux.org/~blaisorblade ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel