Skip to contentSkip to conversation

kconfig: fix target update-po-config in Makefile

PATCH In review Massimo Maiurana 2 participants 2 messages Feb 2, 2008 Kconfig

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: fix target update-po-config in Makefile

Due to recent changes in arch/cris, "make update-po-config" fails because it can't include arch/cris/arch as it is a symlink generated at build time.
Patch below fixes this by creating, and then removing at the end, a symlink to arch/cris/arch-v10 (should it point to arch-v32? arch-v10 contains more help messages).

---

scripts/kconfig/Makefile +2 -1
diff -Nru linux/scripts/kconfig/Makefile linux.new/scripts/kconfig/Makefile
@@ -35,13 +35,14 @@
 	    --output $(obj)/config.pot
 	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
 	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
+	$(Q)ln -fs arch-v10 arch/cris/arch
 	(for i in `ls arch/`;                            \
 	do                                               \
 	    $(obj)/kxgettext arch/$$i/Kconfig;           \
 	done ) >> $(obj)/config.pot
 	msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
 	    --output $(obj)/linux.pot
-	$(Q)rm -f arch/um/Kconfig.arch
+	$(Q)rm -f arch/um/Kconfig.arch arch/cris/arch
 	$(Q)rm -f $(obj)/config.pot
 
 PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
Signature · 6 lines
       Massimo Maiurana         massimo<at>ragusa.linux.it
       http://massimo.solira.org       GPG keyID #7044D601

Articolo 11 - L'Italia ripudia la guerra come strumento di offesa
alla libertà degli altri popoli e come mezzo di risoluzione delle
controversie internazionali....
#1 lore raw
Quoted 8 lines · Massimo Maiurana

Due to recent changes in arch/cris, "make update-po-config" fails because it can't include arch/cris/arch as it is a symlink generated at build time.
Patch below fixes this by creating, and then removing at the end, a symlink to arch/cris/arch-v10 (should it point to arch-v32? arch-v10 contains more help messages).

Hi Massimo.
This is fixed by the cris people recently and will hit mainline soon.

See: http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc8/2.6.24-rc8-mm1/broken-out/cris-avoid-using-arch-links-in-kconfig.patch

So until then we will live with a broken update-po-config.

Sam