From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] iputils: Fix targetinstall
Date: Fri, 28 May 2021 09:01:19 +0200 [thread overview]
Message-ID: <20210528070119.794815-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210525163015.59080-1-ada@thorsis.com>
Thanks, applied as 98bce3e1496006303fcea400e0daacd8988c7a39.
Michael
[sent from post-receive hook]
On Fri, 28 May 2021 09:01:19 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> The tools are all optional. If no tool to be installed in /usr/bin is
> selected, targetinstall fails. Same for tools going to /usr/sbin. See
> for example following log of failed targetinstall, if only arping and
> ping are selected, but none of the others:
>
> install file:
> src=rsu/platform-v7a/packages/iputils-s20200821/usr/bin/arping
> dst=/usr/bin/arping
> owner=0
> group=0
> permissions=0755
> debug file: /usr/lib/debug/.build-id/51/e139e0e79232c85ddadeb45ae7ecc901d4073c.debug
>
> install file:
> src=rsu/platform-v7a/packages/iputils-s20200821/usr/bin/ping
> dst=/usr/bin/ping
> owner=0
> group=0
> permissions=0755
> debug file: /usr/lib/debug/.build-id/93/03312f626e591bc167b0e7e2a9b38c71d4bc7b.debug
>
> No suitable file '/usr/sbin' could be found in any of these locations:
> /home/adahl/[…]/rsu/platform-v7a/packages/iputils-s20200821/usr/sbin.v7a
> /home/adahl/[…]/rsu/platform-v7a/packages/iputils-s20200821/usr/sbin
>
> Error: install_tree failed!
>
> Fixes: 928752d3a0bc ("iputils: version bump s20180629 -> s20200821")
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210525163015.59080-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/iputils.make b/rules/iputils.make
> index 33fa4826e067..441433b05b0e 100644
> --- a/rules/iputils.make
> +++ b/rules/iputils.make
> @@ -67,8 +67,30 @@ $(STATEDIR)/iputils.targetinstall:
> @$(call install_fixup, iputils,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> @$(call install_fixup, iputils,DESCRIPTION,missing)
>
> - @$(call install_tree, iputils, 0, 0, -, /usr/bin)
> - @$(call install_tree, iputils, 0, 0, -, /usr/sbin)
> +ifdef PTXCONF_IPUTILS_ARPING
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/arping)
> +endif
> +ifdef PTXCONF_IPUTILS_CLOCKDIFF
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/clockdiff)
> +endif
> +ifdef PTXCONF_IPUTILS_PING
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/ping)
> +endif
> +ifdef PTXCONF_IPUTILS_RARPD
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/sbin/rarpd)
> +endif
> +ifdef PTXCONF_IPUTILS_RDISC
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/sbin/rdisc)
> +endif
> +ifdef PTXCONF_IPUTILS_TFTPD
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tftpd)
> +endif
> +ifdef PTXCONF_IPUTILS_TRACEPATH
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tracepath)
> +endif
> +ifdef PTXCONF_IPUTILS_TRACEROUTE6
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/traceroute6)
> +endif
>
> @$(call install_finish, iputils)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-05-28 7:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 16:30 [ptxdist] [PATCH] " Alexander Dahl
2021-05-28 7:01 ` Michael Olbrich [this message]
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=20210528070119.794815-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/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