Commit e2a57a815933b2d2e375f9de6be223098024ab90

Authored by Maarten Bressers
Committed by Linus Torvalds
1 parent d39d5ed97e

Correct Makefile rule for generating custom keymap

When building a custom keymap, after setting GENERATE_KEYMAP := 1 in
drivers/char/Makefile, the kernel build fails like this:

    CC      drivers/char/vt.o
  make[2]: *** No rule to make target `drivers/char/%.map', needed by `drivers/char/defkeymap.c'.  Stop.
  make[1]: *** [drivers/char] Error 2
  make: *** [drivers] Error 2

This was caused by commit af8b128719f5248e542036ea994610a29d0642a6, which
deleted a necessary colon from the Makefile rule that generates the keymap,
since that rule contains both a target and a target-pattern.  The following
patch puts the colon back:

Signed-off-by: Maarten Bressers <mbres@gentoo.org>
Cc: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/char/Makefile
... ... @@ -129,7 +129,7 @@
129 129  
130 130 ifdef GENERATE_KEYMAP
131 131  
132   -$(obj)/defkeymap.c $(obj)/%.c: $(src)/%.map
  132 +$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
133 133 loadkeys --mktable $< > $@.tmp
134 134 sed -e 's/^static *//' $@.tmp > $@
135 135 rm $@.tmp