Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] core/sdk: don't mangle symlinks with '.' or '..' at start
Date: Fri, 7 Dec 2018 20:44:17 +0100	[thread overview]
Message-ID: <20181207194417.GJ2561@scaer> (raw)
In-Reply-To: <CA+1k=2ZVBqB3mi-7ZtR+9jkBE2hUoBDvQOEYA6jg87NFd9g3KQ@mail.gmail.com>

Joel, All,

On 2018-12-07 12:39 -0700, Joel Carlson spake thusly:
> On Fri, Dec 7, 2018 at 11:10 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > From: Joel Carlson <JoelsonCarl@gmail.com>
> > The current transform changes any '.' at the start of a filename to
> > $(BR2_SDK_PREFIX). This also applies to the target of a symlink, when
> > it is relative.
> >
> > We thus might end up with something like:
> >     $(BR2_SDK_PREFIX)/bin/aarch64-linux-gnu-ar ->
> >     $(BR2_SDK_PREFIX)./opt/ext-toolchain/bin/aarch64-linux-gnu-ar
> >
> > when it should be:
> >     $(BR2_SDK_PREFIX)/bin/aarch64-linux-gnu-ar ->
> >     ../opt/ext-toolchain/bin/aarch64-linux-gnu-ar
> >
> > We fix that by making sure we always remove a known prefix, i.e. we
> > remove the path to host dir. The obvious solution would be to cd into
> > $(HOST_DIR)/.. , then tar ./host/ and finally use a --transfrom pattern
> > as 's,^\./$(notdir $(HOST_DIR)),$(BR2_SDK_PREFIX)'.
> >
> > Since $(HOST_DIR) can point to a user-supplied location, we don't know
> > very well how the pattern may patch.
> >
> > Instead, we cd into / and tar the full path to $(HOST_DIR).
> >
> > Since tar removes any leading '/', it would spurr a warning message,
> > which is annoying. So we explicitly remove the leading '/' from
> > $(HOST_DIR) when we tar it.
> >
> > Finally, we transform all filenames to replace a leading $(HOST_DIR)
> > (without a leading /) to the prefix to use.
> >
> > Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com>
> > [yann.morin.1998 at free.fr:
> >   - use a single transform pattern
> >   - use full HOST_DIR path as pattern to replace
> >   - update commit log accordingly
> > ]
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >
> 
> So not sure what protocol is on tags when this is essentially v2 of my
> own patch, but...
> Reviewed-by: Joel Carlson <JoelsonCarl@gmail.com>
> Tested-by: Joel Carlson <JoelsonCarl@gmail.com>

Since my proposal is more than trivial tweaks of your proposal, your
tags are welcome.

Thanks for reporting the issue, for your initial patch which got me
kickstarted, and thanks for your review and tests! :-)

Regards,
Yann E. MORIN.

> Applied this and the first patch to my branch and made sure my SDKs
> seemed to have the correct links.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

  reply	other threads:[~2018-12-07 19:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-07 18:10 [Buildroot] [PATCH 0/2] core/sdk: fix relative symlinks in generated tarball (branch yem/sdk) Yann E. MORIN
2018-12-07 18:10 ` [Buildroot] [PATCH 1/2] core: make symlinks relative when preparing the SDK Yann E. MORIN
2018-12-07 19:35   ` Joel Carlson
2018-12-07 18:10 ` [Buildroot] [PATCH 2/2] core/sdk: don't mangle symlinks with '.' or '..' at start Yann E. MORIN
2018-12-07 19:39   ` Joel Carlson
2018-12-07 19:44     ` Yann E. MORIN [this message]
2018-12-21  9:46 ` [Buildroot] [PATCH 0/2] core/sdk: fix relative symlinks in generated tarball (branch yem/sdk) Andreas Naumann
2018-12-22  0:13   ` Joel Carlson
2018-12-22  8:31     ` Yann E. MORIN
2018-12-22 18:21       ` Joel Carlson
2018-12-22 18:54         ` Yann E. MORIN
2018-12-26 18:22         ` Trent Piepho
2018-12-22  8:32   ` Yann E. MORIN

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=20181207194417.GJ2561@scaer \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox