Messages in this thread Patch in this message | | | Subject | Re: [GIT PULL] UML changes for 3.2 | From | Paul Bolle <> | Date | Thu, 03 Nov 2011 22:01:12 +0100 |
| |
On Thu, 2011-11-03 at 21:41 +0100, Paul Bolle wrote: > 1) Note that running make update-po-config seems to do what it's > supposed to do. But it also prints this warning > arch/um/Kconfig.common:66:warning: environment variable SUBARCH undefined > > (I haven't checked if it's new.) It seems harmless. I don't know what > should be done to make it go away.
And this (combined) patch kills that warning too.
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 82d2eb2..9dc2737 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -84,16 +84,15 @@ 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 \ + env SUBARCH= $(obj)/kxgettext $$i \ >> $(obj)/config.pot; \ 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 2) Should I submit one (or two?) patch(es) to fix these minor issues?
Paul Bolle
| |