Thanks, applied as 98bce3e1496006303fcea400e0daacd8988c7a39. Michael
[sent from post-receive hook] On Fri, 28 May 2021 09:01:19 +0200, Alexander Dahl <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 > <[email protected]>") > @$(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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
