[Buildroot] [PATCH 1/1] support/scripts: handle paths with regex characters in per-package

[Buildroot] [PATCH 1/1] support/scripts: handle paths with regex characters in per-package

[ckhardin]

From: Charles Hardin <ckhardin@gmail.com>

Some constraints on a setup ended up with a plus sign in the path
for historical reasons and would then fail to match on the comparison
of the host/lib dir match. So, the =~ for bash can be augmented
with a double quote expansion to preserve the literal value of
the characters in the variable.

Example Path: /home/vagrant/test+buildroot/per-package

Signed-off-by: Charles Hardin <ckhardin@gmail.com>
---
 support/scripts/check-host-rpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath
index 9a3866982b..b27cb883f3 100755
--- a/support/scripts/check-host-rpath
+++ b/support/scripts/check-host-rpath
@@ -98,7 +98,7 @@ check_elf_has_rpath() {
 	    # PER_PACKAGE_DIR and therefore ${perpackagedir} points to
 	    # a non-existent directory, and this check will always be
 	    # false.
-            [[ ${dir} =~ ${perpackagedir}/[^/]+/host/lib ]] && return 0
+            [[ ${dir} =~ "${perpackagedir}/"[^/]+/host/lib ]] && return 0
         done
     done < <( readelf -d "${file}"                                              \
               |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
-- 
2.30.1 (Apple Git-130)

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] support/scripts: handle paths with regex characters in per-package

[Yann E. MORIN]

Charles, All,

On 2022-06-03 20:23 -0700, ckhardin@gmail.com spake thusly:
> From: Charles Hardin <ckhardin@gmail.com>
> 
> Some constraints on a setup ended up with a plus sign in the path
> for historical reasons and would then fail to match on the comparison
> of the host/lib dir match. So, the =~ for bash can be augmented
> with a double quote expansion to preserve the literal value of
> the characters in the variable.
> 
> Example Path: /home/vagrant/test+buildroot/per-package
> 
> Signed-off-by: Charles Hardin <ckhardin@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  support/scripts/check-host-rpath | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath
> index 9a3866982b..b27cb883f3 100755
> --- a/support/scripts/check-host-rpath
> +++ b/support/scripts/check-host-rpath
> @@ -98,7 +98,7 @@ check_elf_has_rpath() {
>  	    # PER_PACKAGE_DIR and therefore ${perpackagedir} points to
>  	    # a non-existent directory, and this check will always be
>  	    # false.
> -            [[ ${dir} =~ ${perpackagedir}/[^/]+/host/lib ]] && return 0
> +            [[ ${dir} =~ "${perpackagedir}/"[^/]+/host/lib ]] && return 0
>          done
>      done < <( readelf -d "${file}"                                              \
>                |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
> -- 
> 2.30.1 (Apple Git-130)
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] support/scripts: handle paths with regex characters in per-package

[Peter Korsgaard]

>>>>> "ckhardin" == ckhardin  <ckhardin@gmail.com> writes:

 > From: Charles Hardin <ckhardin@gmail.com>
 > Some constraints on a setup ended up with a plus sign in the path
 > for historical reasons and would then fail to match on the comparison
 > of the host/lib dir match. So, the =~ for bash can be augmented
 > with a double quote expansion to preserve the literal value of
 > the characters in the variable.

 > Example Path: /home/vagrant/test+buildroot/per-package

 > Signed-off-by: Charles Hardin <ckhardin@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot