From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1flbdO-0001NU-OQ for ptxdist@pengutronix.de; Fri, 03 Aug 2018 17:04:54 +0200 Received: from mgr by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1flbdO-00073g-CC for ptxdist@pengutronix.de; Fri, 03 Aug 2018 17:04:54 +0200 Date: Fri, 3 Aug 2018 17:04:54 +0200 From: Michael Grzeschik Message-ID: <20180803150454.wxzdnklitdlqy3dp@pengutronix.de> References: <20180803133356.4177-1-m.grzeschik@pengutronix.de> <20180803133356.4177-2-m.grzeschik@pengutronix.de> MIME-Version: 1.0 In-Reply-To: <20180803133356.4177-2-m.grzeschik@pengutronix.de> Subject: Re: [ptxdist] [PATCH 1/3] busybox: don't install /sbin/init link if busybox is not the initmethod List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============0295201567==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de --===============0295201567== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uamozgae6i55psmy" Content-Disposition: inline --uamozgae6i55psmy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Michael Grzeschik > --- > rules/busybox.make | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) >=20 > 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 > # ----------------------------------------------------------------------= ------ > =20 > +BUSYBOX_APPLETS_ =3D $(shell cat $(BUSYBOX_PKGDIR)/etc/busybox.links) > + > +ifndef PTXCONF_INITMETHOD_BBINIT > +BUSYBOX_RM_TEMPLTE =3D "/sbin/init" ^^^^^^^ This should be BUSYBOX_RM_TEMPLATE. > +endif > +BUSYBOX_APPLETS =3D $(filter-out $(BUSYBOX_RM_TEMPLATE),$(BUSYBOX_APPLET= S_)) > + > $(STATEDIR)/busybox.targetinstall: > @$(call targetinfo) > =20 > @@ -107,7 +114,7 @@ ifdef PTXCONF_BUSYBOX_FEATURE_INDIVIDUAL > # > @$(call install_lib, busybox, 0, 0, 0644, libbusybox) > =20 > - @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=3D"busybox" ;; \ > /*/*) to=3D"../bin/busybox" ;; \ > --=20 > 2.18.0 >=20 >=20 > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de --=20 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 | --uamozgae6i55psmy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEElXvEUs6VPX6mDPT8C+njFXoeLGQFAltkbw4ACgkQC+njFXoe LGSHRA//QOkDqISE+OKLrEVU98my1XMg7+R5KLEAHK2nIOGKNAKbqC2W62rOV8mp ldNhD5p9v+fQ2c5owLbObdb7JZJDAl03ou/UY+qZXASjoV6mNgom/i1tTkcemyLe Dtiwx3Qe6SO2xDctASE7WUqwqwOTXU/B7m61zyvKwAFqm9Prt+GdtNpVK1TOWtoJ R2lMyf2fyFzteYEj6in+c9DqxmUZA+xNLxtfLOd5ANCzSQXbHpRTtV2/gJP343XH bQWUrK3b+KYKDoxQuW7rH6oEoB0iuPwZtt8vzdWORV28id16QIr0topdYT4nvwmH K2tL9BUipg1uSkoBehp5XYNJ3hMVJghK35mVG/taB9upg6pI0Tje79tqUC1XI6cc tMxFT+GI+3h+j7sDeoAclUgWjMXwFEvJevVrMsAK1P1HxeqAaCRZDFi+XoRal912 ga6lJRgVOONyze3khY2RkprWuQGUYJknHZnZb2goi93PR7JKnZO0OMNAQ7f5NxdM hNJa7GIcuYj5p0HP0jyKt6dMNrrzyf7SINamm18RNU1iWe61r+ILWLOGFqypUDdt R5fIFbSpKZ461dDcaZ6d9Diih1xKuwnIzngvJ5o1gd4fIpW0G+JjCqxzGVQKcBdA n3dZ1mXG4kcQdv+cc4QIK3BntRsIEON4dxhHo53Xa7SGp2mk29o= =Rpc4 -----END PGP SIGNATURE----- --uamozgae6i55psmy-- --===============0295201567== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ== --===============0295201567==--