kbuild: Modversions fix

We're still using the old genksyms binary, that's why we have to
postprocess the output to convert it into a linker script - that
postprocessing got confused by "__verify_write".

Kick out the grep, do it all and correctly within sed.

Bug reported by Thomas Molina.

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 9628a6416d252b881d1f1e639db246eb9e943302..80aba4ee3b17df116fff9c5dbf1a3a75148ea498 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -94,8 +94,7 @@ define rule_vcc_o_c
        else                                                                  \
                $(CPP) -D__GENKSYMS__ $(c_flags) $<                           \
                | $(GENKSYMS) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)         \
-               | grep __ver                                                  \
-               | sed 's/\#define __ver_\([^    ]*\)[   ]*\([^  ]*\)/__crc_\1 = 0x\2 ;/g' \
+               | sed -n 's/\#define __ver_\(\w*\)\W*\(\w*\)/__crc_\1 = 0x\2 ;/gp' \
                > $(@D)/.tmp_$(@F:.o=.ver);                                   \
                                                                              \
                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                    \