All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2 for 2015.11.x] support/check-host-rpath: remove trailing '/' in host dir
Date: Tue,  1 Dec 2015 23:19:06 +0100	[thread overview]
Message-ID: <b8b895896ff04a0551c1d4b63a623e8c24eb9dfa.1449008170.git.yann.morin.1998@free.fr> (raw)
In-Reply-To: <cover.1449008170.git.yann.morin.1998@free.fr>

Despite the comment saying so, the trailing '/' in the host directory is
not removed. note however that it is properly removed from extracted
RPATH tags.

This is not visible when the host directory is our default $(O)/host
location, but breaks for user-supplied external host ditrectory, when
the user leaves a trailing slash in the path.

Fix that.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---
Peter, for the maintenance branch over 2015.11.
Sorry for the mess, it's a case I did not test...
---
 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 dc9e17f..48d69da 100755
--- a/support/scripts/check-host-rpath
+++ b/support/scripts/check-host-rpath
@@ -14,7 +14,7 @@ main() {
     local file ret
 
     # Remove duplicate and trailing '/' for proper match
-    hostdir="$( sed -r -e 's:/+:/:g;' <<<"${hostdir}" )"
+    hostdir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${hostdir}" )"
 
     ret=0
     while read file; do
-- 
1.9.1

  reply	other threads:[~2015-12-01 22:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-01 22:19 [Buildroot] [PATCH 0/2 for 2015.11.x] rpath: fix fallout of check-host-rpath (branch yem/host-gawk) Yann E. MORIN
2015-12-01 22:19 ` Yann E. MORIN [this message]
2015-12-02 22:40   ` [Buildroot] [PATCH 1/2 for 2015.11.x] support/check-host-rpath: remove trailing '/' in host dir Peter Korsgaard
2015-12-01 22:19 ` [Buildroot] [PATCH 2/2 for 2015.11.x] package/gawk: do not use readeline ormpfr in host variant Yann E. MORIN
2015-12-01 22:22   ` Thomas Petazzoni
2015-12-02 22:16     ` Yann E. MORIN
2015-12-02 22:34       ` Peter Korsgaard
2015-12-02 22:36         ` Yann E. MORIN
2015-12-02 22:41   ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b8b895896ff04a0551c1d4b63a623e8c24eb9dfa.1449008170.git.yann.morin.1998@free.fr \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.