Skip to contentSkip to conversation

Makefile: do not purge locale-archive from target

PATCH New Sven Neumann 2 participants 4 messages Jun 18, 2014 – Jul 15, 2014 Kbuild

lore
Share & tools
lore

Sven Neumann

author
#0 lore raw

PATCH 1/1 Makefile: do not purge locale-archive from target

The rules to purge unwanted locales from the target also removed the locale-archive file from /usr/lib/locale which contains the locale definitions explicitly generated for the target.

Signed-off-by Sven Neumann <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 14fca2b..d7590ef 100644
@@ -516,7 +516,7 @@ LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
 
 define TARGET_PURGE_LOCALES
 	rm -f $(LOCALE_WHITELIST)
-	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done
+	for i in $(LOCALE_NOPURGE) locale-archive; do echo $$i >> $(LOCALE_WHITELIST); done
 
 	for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/man /usr/share/man /usr/lib/locale)); \
 	do \
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 Makefile: do not purge locale-archive from target

Dear Sven Neumann,

Quoted 14 lines · Sven Neumann

The rules to purge unwanted locales from the target also removed the locale-archive file from /usr/lib/locale which contains the locale definitions explicitly generated for the target.

Signed-off-by Sven Neumann <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +0 -0
index 14fca2b..d7590ef 100644

Makefile LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST)) · line 519

Quoted 5 lines
Makefile +1 -1
@@ -516,7 +516,7 @@ LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
 
 define TARGET_PURGE_LOCALES
 	rm -f $(LOCALE_WHITELIST)
-	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done
+	for i in $(LOCALE_NOPURGE) locale-archive; do echo $$i >> $(LOCALE_WHITELIST); done

Hum, right, but isn't 'locale-archive' an archive of many locales? Shouldn't we get rid of the locales we don't want from this archive?

Which toolchain have you used to get a locale-archive file?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 Makefile: do not purge locale-archive from target

Hi,

Quoted 16 lines · Thomas Petazzoni
Quoted 15 lines · Sven Neumann

The rules to purge unwanted locales from the target also removed the locale-archive file from /usr/lib/locale which contains the locale definitions explicitly generated for the target.

Signed-off-by Sven Neumann <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +0 -0
index 14fca2b..d7590ef 100644
@@ -516,7 +516,7 @@ LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
Quoted 7 lines

Makefile LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST)) · line 519

Quoted 4 lines
Makefile +1 -1
 define TARGET_PURGE_LOCALES
 	rm -f $(LOCALE_WHITELIST)
-	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done
+	for i in $(LOCALE_NOPURGE) locale-archive; do echo $$i >> $(LOCALE_WHITELIST); done

Hum, right, but isn't 'locale-archive' an archive of many locales? Shouldn't we get rid of the locales we don't want from this archive?

Well, as far as I can see only the locales selected by BR2_GENERATE_LOCALE should have been generated into the archive. So I don't think it makes sense to purge locales from this archive. It would be possible to do this though using "locale-def --delete-from-archiv".

Quoted 1 line

Which toolchain have you used to get a locale-archive file?

glibc 2.18

Greetings,
Sven

Signature · 19 lines
Sven Neumann
Senior System Architect

Lautsprecher Teufel GmbH
Gewerbehof B?lowbogen, Aufgang D1
B?lowstr. 66
10783 Berlin
Germany

Direkt   +49 (0) 30 / 300 930-153
Telefon  +49 (0) 30 / 300 930-0

neumann at teufel.de

Registernummer HRB 20271 beim Amtsgericht Berlin-Charlottenburg
Gesch?ftsf?hrer: J?rgen Schneider, Edgar van Velzen
Umsatzsteuer-ID: DE136745959

www.teufel.de - www.teufelaudio.com - www.raumfeld.com
Applied
#3 lore raw

PATCH 1/1 Makefile: do not purge locale-archive from target

In reply to Sven Neumann

Dear Sven Neumann,

Quoted 8 lines · Sven Neumann

The rules to purge unwanted locales from the target also removed the locale-archive file from /usr/lib/locale which contains the locale definitions explicitly generated for the target.

Signed-off-by Sven Neumann <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com