Broken generation of locales

When setting BR2_GENERATE_LOCALE, for instance like that:
BR2_GENERATE_LOCALE="fr_FR en_US es_ES es_ES.ISO-8859-1 hu_HU"

nothing is generated.

next patch fixes that issue:

Makefile +0 -0

index 7997e3b..98afd7e 100644

Dear Thierry Bultel,

Quoted 12 lines · Thierry Bultel

When setting BR2_GENERATE_LOCALE, for instance like that:
BR2_GENERATE_LOCALE="fr_FR en_US es_ES es_ES.ISO-8859-1 hu_HU"

nothing is generated.

next patch fixes that issue:

Makefile +0 -0

index 7997e3b..98afd7e 100644

Makefile ifneq ($(GENERATE_LOCALE),) · line 550

Quoted 10 lines

Makefile +2 -2

@@ -543,8 +543,8 @@ ifneq ($(GENERATE_LOCALE),)
   target-generatelocales: host-localedef
          $(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
          $(Q)for locale in $(GENERATE_LOCALE) ; do \
-               inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \
-               charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
+               inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
+               charmap=`echo $${locale} | cut -s -f2 -d'.'` ; \
                  if test -z "$${charmap}" ; then \
                          charmap="UTF-8" ; \
                  fi ; \

This exactly reverts commit 8e2696eab6a781727c09408528678d4d29edd7a3 which was merged in August. I've added Arnout in Cc so that you can discuss the issue together and decide who wins :-)

Thanks,

Thomas

Hi Thomas,

This does not exactly revert the named commit, that added 's' for both inputfile and charmap.

I pretend that the 's' option is mandatory for charmap only, else inputfile is always empty:

inputfile:

thierry at thierry-desktop:~$ echo fr_FR | cut -f1 -d '.' fr_FR
thierry at thierry-desktop:~$ echo fr_FR | cut -f1 -d '.' -s thierry at thierry-desktop:~$

charmap:

thierry at thierry-desktop:~$ echo fr_FR.utf8 | cut -f2 -d '.' utf8
thierry at thierry-desktop:~$ echo fr_FR.utf8 | cut -f2 -d '.' -s utf8

Note that you've caused Thomas's confusion by unnecessarily moving the
-s option in the charmap line.

Dear Arnout Vandecappelle,

Quoted 2 lines · Arnout Vandecappelle

Note that you've caused Thomas's confusion by unnecessarily moving the
-s option in the charmap line.

Ah, yes. Thierry, can you resend a proper patch (i.e without moving the -s option in the charmap line, and with a proper description and Signed-off-by line) ?