Re: [uml-devel] Broken compiling under 2.6.12-rc2 on my machine

[Blaisorblade <blaisorblade@yahoo.it>]

[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]

On Friday 08 April 2005 01:21, Ian McDonald wrote:
> OK.
>
> Tested this change to arch/um/kernel/Makefile:
> cmd_quote2 = sed -e '/CONFIG/{'          \
>                  -e 's/"CONFIG"\;/""/'        \
>                  -e 'r $(obj)/config.tmp'     \
>                  -e 'a \'                   \
>                  -e '""\;'                  \
>                  -e '}'                       \
>                  $< > $@
>
> and can report that it fixes my problems.
>
> I can also report that vacopy patch works (which is also in 2.6.11.7 I
> notice but I haven't tested yet - I will post a note when I have but
> that may be next week) and syscall patch works (which is not yet in
> 2.6.11.x).
Test it from -bs3, please.
> Paolo I agree from my angle that this should go forwards as a confirmed
> patch.
Please make sure that the attached patch produces the same makefile as the 
manual change you did (yes, I'm a bit overzealous maybe, but copy and paste 
isn't perfect from mailers, patches are much better).

For me, I tested it on my Gentoo and produces the same output as the unpatched 
code.

Ah, Rob, I've re-read the code and re-understood pipes are not enough, and we 
must keep the temp step. Sorry (even if I blamed both, so I hope I've not 
been impolite).
-- 
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade

[-- Attachment #2: uml-workaround-sed-behaviour.patch --]
[-- Type: text/x-diff, Size: 1028 bytes --]


From: Rob Landley <rob@landley.net>

It is apparent that the sed 3.02 (from august 1998) is still used on Debian Woody, and
it is stricter on input expressions for the "a" command. So change the code to
make it work - it's not a big change.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 linux-2.6.11-paolo/arch/um/kernel/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/um/kernel/Makefile~uml-workaround-sed-behaviour arch/um/kernel/Makefile
--- linux-2.6.11/arch/um/kernel/Makefile~uml-workaround-sed-behaviour	2005-04-08 07:00:07.000000000 +0200
+++ linux-2.6.11-paolo/arch/um/kernel/Makefile	2005-04-08 07:05:40.000000000 +0200
@@ -53,6 +53,7 @@ quiet_cmd_quote2 = QUOTE   $@
       cmd_quote2 = sed -e '/CONFIG/{'          \
 		  -e 's/"CONFIG"\;/""/'        \
 		  -e 'r $(obj)/config.tmp'     \
-		  -e 'a""\;'                   \
+		  -e 'a \'                     \
+		  -e '""\;'                    \
 		  -e '}'                       \
 		  $< > $@
_