Skip to contentSkip to conversation

kconfig: fix broken target update-po-config

PATCH In review Massimo Maiurana 2 participants 2 messages Apr 23, 2008 – Apr 25, 2008 Kconfig

lore
Share & tools
lore

Massimo Maiurana

author
#0 lore raw

PATCH 1/1 kconfig: fix broken target update-po-config

In the latest kernel "make update-po-config" fails because it tries to open arch/Kconfig/Kconfig, since the ls command doesn't distinguish between files and directories.

trivial patch below.

Signed-off-by Massimo Maiurana <[email protected]>

---

scripts/kconfig/Makefile 2008-04-23 18:32:13.000000000 +0200 renamed from scripts/kconfig/Makefile 2008-04-17 12:51:55.000000000 +0200 +1 -1
diff -u linux/scripts/kconfig/Makefile linux.new/scripts/kconfig/Makefile
@@ -36,7 +36,7 @@
            --output $(obj)/config.pot
        $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
        $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-       $(Q)(for i in `ls arch/`;                        \
+       $(Q)(for i in `find ./arch -maxdepth 1 -mindepth 1 -type d | cut -c 8-`; \
            do                                           \
                echo "  GEN $$i";                        \
                $(obj)/kxgettext arch/$$i/Kconfig        \
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 5 lines · Massimo Maiurana

In the latest kernel "make update-po-config" fails because it tries to open arch/Kconfig/Kconfig, since the ls command doesn't distinguish between files and directories.

trivial patch below.

Thanks.

Your patch was MIME damaged so when looking closer at it I decided for a simpler approach:

scripts/kconfig/Makefile +2 -2
index 32e8c5a..fa1a7d5 100644
@@ -36,10 +36,10 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
 	    --output $(obj)/config.pot
 	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
 	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-	$(Q)(for i in `ls arch/`;                        \
+	$(Q)(for i in `ls arch/*/Kconfig`;               \
 	    do                                           \
 		echo "  GEN $$i";                        \
-		$(obj)/kxgettext arch/$$i/Kconfig        \
+		$(obj)/kxgettext $$i                     \
 		     >> $(obj)/config.pot;               \
 	    done )
 	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

Sam