* [Buildroot] [PATCH] Makefile: fix locale purge when BR2_PER_PACKAGE_DIRECTORIES=y
@ 2020-03-16 15:46 Thomas Petazzoni
2020-03-17 20:49 ` Yann E. MORIN
2020-03-27 7:19 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-03-16 15:46 UTC (permalink / raw)
To: buildroot
With BR2_PER_PACKAGE_DIRECTORIES=y, we have the following code in the
main Makefile:
target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize
@$(call MESSAGE,"Finalizing target directory")
$(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR))
$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
The per-package-rsync call creates the global $(TARGET_DIR) from the
per-package $(TARGET_DIR). Then, we call the TARGET_FINALIZE_HOOKS.
One of the TARGET_FINALIZE_HOOKS, PURGE_LOCALES, remove locales that
are not desired by the user. It does so using a loop with the
$(wildcard ...) function.
However, the $(wildcard ...) function is expanded at the moment the
rule is evaluated. And with per-package directory, at the time the
rule is evaluated, the global $(TARGET_DIR) is empty, so $(wildcard
...) will return nothing. It is indeed only after the call to
per-package-rsync that the TARGET_DIR will be populated.
This commit fixes that by moving away from $(wildcard ...) and use a
shell test instead, since we are anyway in big block of shell code.
With this, locales are properly purged again when
BR2_PER_PACKAGE_DIRECTORIES=y.
Fixes: c4e6d5c8be6ada8e7c60950e3b499c55d48761cb ("core: implement per-package SDK and target")
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 074d08c04a..cc65d7ca09 100644
--- a/Makefile
+++ b/Makefile
@@ -698,8 +698,9 @@ define PURGE_LOCALES
rm -f $(LOCALE_WHITELIST)
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/lib/locale)); \
+ for dir in $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/lib/locale); \
do \
+ if [ ! -d $$dir ] ; then continue ; fi ; \
for langdir in $$dir/*; \
do \
if [ -e "$${langdir}" ]; \
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] Makefile: fix locale purge when BR2_PER_PACKAGE_DIRECTORIES=y
2020-03-16 15:46 [Buildroot] [PATCH] Makefile: fix locale purge when BR2_PER_PACKAGE_DIRECTORIES=y Thomas Petazzoni
@ 2020-03-17 20:49 ` Yann E. MORIN
2020-03-27 7:19 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-03-17 20:49 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2020-03-16 16:46 +0100, Thomas Petazzoni spake thusly:
> With BR2_PER_PACKAGE_DIRECTORIES=y, we have the following code in the
> main Makefile:
>
> target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize
> @$(call MESSAGE,"Finalizing target directory")
> $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR))
> $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
>
> The per-package-rsync call creates the global $(TARGET_DIR) from the
> per-package $(TARGET_DIR). Then, we call the TARGET_FINALIZE_HOOKS.
>
> One of the TARGET_FINALIZE_HOOKS, PURGE_LOCALES, remove locales that
> are not desired by the user. It does so using a loop with the
> $(wildcard ...) function.
>
> However, the $(wildcard ...) function is expanded at the moment the
> rule is evaluated. And with per-package directory, at the time the
> rule is evaluated, the global $(TARGET_DIR) is empty, so $(wildcard
> ...) will return nothing. It is indeed only after the call to
> per-package-rsync that the TARGET_DIR will be populated.
>
> This commit fixes that by moving away from $(wildcard ...) and use a
> shell test instead, since we are anyway in big block of shell code.
>
> With this, locales are properly purged again when
> BR2_PER_PACKAGE_DIRECTORIES=y.
>
> Fixes: c4e6d5c8be6ada8e7c60950e3b499c55d48761cb ("core: implement per-package SDK and target")
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, with a small code-style fix, see below...
> ---
> Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 074d08c04a..cc65d7ca09 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -698,8 +698,9 @@ define PURGE_LOCALES
> rm -f $(LOCALE_WHITELIST)
> 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/lib/locale)); \
> + for dir in $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/lib/locale); \
> do \
> + if [ ! -d $$dir ] ; then continue ; fi ; \
The code around does not have a space in front of the semicolon, so I
removed it here too.
THan I pushed to master, thanks!
Regards,
Yann E. MORIN.
> for langdir in $$dir/*; \
> do \
> if [ -e "$${langdir}" ]; \
> --
> 2.24.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] Makefile: fix locale purge when BR2_PER_PACKAGE_DIRECTORIES=y
2020-03-16 15:46 [Buildroot] [PATCH] Makefile: fix locale purge when BR2_PER_PACKAGE_DIRECTORIES=y Thomas Petazzoni
2020-03-17 20:49 ` Yann E. MORIN
@ 2020-03-27 7:19 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-03-27 7:19 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> With BR2_PER_PACKAGE_DIRECTORIES=y, we have the following code in the
> main Makefile:
> target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize
> @$(call MESSAGE,"Finalizing target directory")
> $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR))
> $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
> The per-package-rsync call creates the global $(TARGET_DIR) from the
> per-package $(TARGET_DIR). Then, we call the TARGET_FINALIZE_HOOKS.
> One of the TARGET_FINALIZE_HOOKS, PURGE_LOCALES, remove locales that
> are not desired by the user. It does so using a loop with the
> $(wildcard ...) function.
> However, the $(wildcard ...) function is expanded at the moment the
> rule is evaluated. And with per-package directory, at the time the
> rule is evaluated, the global $(TARGET_DIR) is empty, so $(wildcard
> ...) will return nothing. It is indeed only after the call to
> per-package-rsync that the TARGET_DIR will be populated.
> This commit fixes that by moving away from $(wildcard ...) and use a
> shell test instead, since we are anyway in big block of shell code.
> With this, locales are properly purged again when
> BR2_PER_PACKAGE_DIRECTORIES=y.
> Fixes: c4e6d5c8be6ada8e7c60950e3b499c55d48761cb ("core: implement per-package SDK and target")
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Committed to 2020.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-27 7:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-16 15:46 [Buildroot] [PATCH] Makefile: fix locale purge when BR2_PER_PACKAGE_DIRECTORIES=y Thomas Petazzoni
2020-03-17 20:49 ` Yann E. MORIN
2020-03-27 7:19 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox