Commit fa0ad657 authored by Paul Bolle's avatar Paul Bolle Committed by Michal Marek
Browse files

kconfig: adapt update-po-config to new UML layout 



Commit 5c48b108 ("um: take arch/um/sys-x86 to arch/x86/um") broke the
make target update-po-config, as its symlink trick (again) fails.
(Previous breakage was fixed with commit bdc69ca4 ("kconfig: change
update-po-config to reflect new layout of arch/um").)

The new UML layout allows to drop the symlick trick entirely. And if,
one day, another architecture supports UML too, that should now work
without again breaking this make target.

Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 44656fa0

scripts/kconfig/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	    --directory=$(srctree) --directory=$(objtree)           \

	    --output $(obj)/config.pot

	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot

	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig

	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \

	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \

	    $(srctree)/arch/*/um/Kconfig`;               \

	    do                                           \

		echo "  GEN $$i";                        \

		$(obj)/kxgettext $$i                     \
@@ -69,7 +69,6 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	    done )

	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

	    --output $(obj)/linux.pot

	$(Q)rm -f $(srctree)/arch/um/Kconfig

	$(Q)rm -f $(obj)/config.pot



PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig

CRA Git | Maintained and supported by SUSTech CRA and CCSE