Skip to content

Commit

Permalink
Correct Makefile rule for generating custom keymap
Browse files Browse the repository at this point in the history
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 af8b128, 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>
  • Loading branch information
Maarten Bressers authored and Linus Torvalds committed Oct 8, 2007
1 parent d39d5ed commit e2a57a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/char/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ $(obj)/defkeymap.o: $(obj)/defkeymap.c

ifdef GENERATE_KEYMAP

$(obj)/defkeymap.c $(obj)/%.c: $(src)/%.map
$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
loadkeys --mktable $< > $@.tmp
sed -e 's/^static *//' $@.tmp > $@
rm $@.tmp
Expand Down

0 comments on commit e2a57a8

Please sign in to comment.