On Fri, Aug 03, 2018 at 03:33:54PM +0200, Michael Grzeschik wrote: > This patch fixes the case where we use other initmethod then busybox and > want to enable the applet, but don't want to install the link. This is > useful to create busybox based lxc containers. > > Signed-off-by: Michael Grzeschik <[email protected]> > --- > rules/busybox.make | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/rules/busybox.make b/rules/busybox.make > index 28d61f5ef..970ac6b4d 100644 > --- a/rules/busybox.make > +++ b/rules/busybox.make > @@ -92,6 +92,13 @@ endif > # Target-Install > # > ---------------------------------------------------------------------------- > > +BUSYBOX_APPLETS_ = $(shell cat $(BUSYBOX_PKGDIR)/etc/busybox.links) > + > +ifndef PTXCONF_INITMETHOD_BBINIT > +BUSYBOX_RM_TEMPLTE = "/sbin/init" ^^^^^^^ This should be BUSYBOX_RM_TEMPLATE.
> +endif
> +BUSYBOX_APPLETS = $(filter-out $(BUSYBOX_RM_TEMPLATE),$(BUSYBOX_APPLETS_))
> +
> $(STATEDIR)/busybox.targetinstall:
> @$(call targetinfo)
>
> @@ -107,7 +114,7 @@ ifdef PTXCONF_BUSYBOX_FEATURE_INDIVIDUAL
> #
> @$(call install_lib, busybox, 0, 0, 0644, libbusybox)
>
> - @cat $(BUSYBOX_PKGDIR)/etc/busybox.links | while read link; do \
> + @for link in $(BUSYBOX_APPLETS); do \
> $(call install_copy, busybox, 0, 0, 755, \
> "$(BUSYBOX_PKGDIR)/usr/lib/busybox/$${link##*/}",
> "/usr$${link}"); \
> done
> @@ -123,7 +130,7 @@ endif
> else
> @$(call install_copy, busybox, 0, 0, 755, -, /usr/bin/busybox)
> endif
> - @cat $(BUSYBOX_PKGDIR)/etc/busybox.links | while read link; do
> \
> + @for link in $(BUSYBOX_APPLETS); do
> \
> case "$${link}" in
> \
> /bin/*) to="busybox" ;;
> \
> /*/*) to="../bin/busybox" ;;
> \
> --
> 2.18.0
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
signature.asc
Description: PGP signature
_______________________________________________ ptxdist mailing list [email protected]
