[Buildroot] [PATCH next v4 2/6] support/scripts/check-host-rpath: split condition on two statements
Yann E. MORIN
yann.morin.1998 at free.fr
Thu Nov 15 20:58:30 UTC 2018
Thomas, All,
On 2018-11-14 11:55 +0100, Thomas Petazzoni spake thusly:
> Inside the check_elf_has_rpath(), we check if the host binary has a
> correct RPATH, which should be either an absolute path to
> $(HOST_DIR)/lib, or a relative path using $ORIGIN. Those two
> conditions are checked in a single statements, but as we are going to
> add a third condition, let's split this up a bit:
>
> - If we have a RPATH to $(HOST_DIR)/lib -> we're good, return 0
> - If we have a RPATH to $ORIGIN/../lib -> we're good, return 0
> - Otherwise, we will exit the loop, and return 1
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> ---
> support/scripts/check-host-rpath | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath
> index 169628decb..6c5767da05 100755
> --- a/support/scripts/check-host-rpath
> +++ b/support/scripts/check-host-rpath
> @@ -63,7 +63,8 @@ check_elf_has_rpath() {
> for dir in ${rpath//:/ }; do
> # Remove duplicate and trailing '/' for proper match
> dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )"
> - [ "${dir}" = "${hostdir}/lib" -o "${dir}" = "\$ORIGIN/../lib" ] && return 0
> + [ "${dir}" = "${hostdir}/lib" ] && return 0
> + [ "${dir}" = "\$ORIGIN/../lib" ] && return 0
> done
> done < <( readelf -d "${file}" \
> |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
> --
> 2.19.1
>
--
.-----------------.--------------------.------------------.--------------------.
| 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