[Buildroot] [PATCH v7 05/18] core: make staging *-config scripts relocatable
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Mar 9 23:24:38 UTC 2016
Samuel, All,
On 2016-03-09 23:58 +0100, Samuel Martin spake thusly:
> This change adjusts the _CONFIG_SCRIPTS hook to set add {exec_,}prefix computed
> relatively to the script location.
>
> This patch hook only fixes *-config scripts located in the staging area,
> the target ones are already removed. A follow-up change will fix those
> from the HOST_DIR location.
>
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
>
> ---
> changes v6->v7:
> - none
>
> changes v5->v6:
> - new patch
> ---
> package/pkg-generic.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 3904c09..ffa21ee 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -240,7 +240,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
> $(call MESSAGE,"Fixing package configuration files") ;\
> $(SED) "s,$(BASE_DIR), at BASE_DIR@,g" \
> -e "s,$(STAGING_DIR), at STAGING_DIR@,g" \
> - -e "s,^\(exec_\)\?prefix=.*,\1prefix=@STAGING_DIR@/usr,g" \
> + -e "s,^\(exec_\)\?prefix=.*,\1prefix=\`dirname \$$0\`/../../usr,g" \
I'd prefer we use the $() form when calling subshells:
-e "s,^\(exec_\)\?prefix=.*,\1prefix=$$(dirname \$$0)/../../usr,g"
I know we switched to using `` in some locations, but that was because
those locations may be called with various levels of $(eval), and that
would cause $$() to be evaluated too early in some situations.
However, here we are in a real rule, so there's no such ambiguity.
But I won't block it just for that. I you agree with my proposed change,
that's OK; if you don't, that's OK too:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> -e "s,-I/usr/,-I at STAGING_DIR@/usr/,g" \
> -e "s,-L/usr/,-L at STAGING_DIR@/usr/,g" \
> -e "s, at STAGING_DIR@,$(STAGING_DIR),g" \
> --
> 2.7.2
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list