diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-08-25 19:30:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-08-25 19:30:34 +0000 |
| commit | 8688a0b5b8d5732c24043609c256987dad630f1b (patch) | |
| tree | a5d5c3c4d307ba72aa728a415854790e3b6b7a6c /sys-apps | |
| parent | document (diff) | |
| download | historical-8688a0b5b8d5732c24043609c256987dad630f1b.tar.gz historical-8688a0b5b8d5732c24043609c256987dad630f1b.tar.bz2 historical-8688a0b5b8d5732c24043609c256987dad630f1b.zip | |
touchup USE=pam handling #190212
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.7.0.ebuild | 23 |
2 files changed, 23 insertions, 16 deletions
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 653954c98d3c..a0a3d74cdc47 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -72,10 +72,10 @@ EBUILD busybox-1.6.1.ebuild 6736 RMD160 81fae61f72647b9e2926bb1279c7cfec0cac3c6f MD5 240e4bfc3fede0f7e93271a12e340e0d busybox-1.6.1.ebuild 6736 RMD160 81fae61f72647b9e2926bb1279c7cfec0cac3c6f busybox-1.6.1.ebuild 6736 SHA256 dbb880b6f569841c3e0ac3b0a351cb64a80e655e435138f83a9f5cc5d64735ca busybox-1.6.1.ebuild 6736 -EBUILD busybox-1.7.0.ebuild 6779 RMD160 fe2c12ec7b09625ee65a9620d41c8ad49058a7af SHA1 53d64d2ef058404ef51f711239285a4861975863 SHA256 7e080bd46e4f8e4fb76a90f44012f503e3ae17999e3e16e199cd581bd49c58bc -MD5 6fe0b10e21f03a07e223fcc11858eef9 busybox-1.7.0.ebuild 6779 -RMD160 fe2c12ec7b09625ee65a9620d41c8ad49058a7af busybox-1.7.0.ebuild 6779 -SHA256 7e080bd46e4f8e4fb76a90f44012f503e3ae17999e3e16e199cd581bd49c58bc busybox-1.7.0.ebuild 6779 +EBUILD busybox-1.7.0.ebuild 6993 RMD160 2cbb01580535396dcdb84b059750d8c77b551480 SHA1 c2fa56eafca4a6b146c71a2e2bea629053ba01a5 SHA256 01fa7ba10cfc866cccbe7c149f6e92b9420e89b921fb2f1bc394e3c96f04384b +MD5 6f038b47d0089c3383ba03a9c03b7d68 busybox-1.7.0.ebuild 6993 +RMD160 2cbb01580535396dcdb84b059750d8c77b551480 busybox-1.7.0.ebuild 6993 +SHA256 01fa7ba10cfc866cccbe7c149f6e92b9420e89b921fb2f1bc394e3c96f04384b busybox-1.7.0.ebuild 6993 MISC ChangeLog 23881 RMD160 c1442a0d8f71b5dd7bc51f2b421e6d39b425e261 SHA1 1cdd39f404d1105d4026e3d0a5c1268a49f899c3 SHA256 e74348c10bf80990e948c7f49977c0f36796c127b8cb4a38e296f7c3904983d1 MD5 f83e39053fafb11bf90fab84e8c183ea ChangeLog 23881 RMD160 c1442a0d8f71b5dd7bc51f2b421e6d39b425e261 ChangeLog 23881 @@ -106,9 +106,9 @@ MD5 baf4f4f57e5edcd4a6123867e91d350e files/digest-busybox-1.7.0 247 RMD160 076e57b20753e68e4c8666bb5975da9a892a6d5f files/digest-busybox-1.7.0 247 SHA256 f879f15c80c48716cdd3d0b2daf84dca99b91b9149d371a55793b4eb6d16fdcb files/digest-busybox-1.7.0 247 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.5 (GNU/Linux) +Version: GnuPG v2.0.6 (GNU/Linux) -iD8DBQFG0Ebop/wUKkr7RBoRApgNAKCY/Iv1E5yS2ZtOoIbPpULrD+DumQCg1Zzx -JwY0qzcGrG0/oTaUu26ttNM= -=2m+o +iD8DBQFG0IOtp/wUKkr7RBoRApQfAJ92aD+APhvfzpRDRs7sW83EhmwePgCeJP63 +FZBKtu3c8sxugIpIlxqqlng= +=QBHe -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.7.0.ebuild b/sys-apps/busybox/busybox-1.7.0.ebuild index a8a4a6a69f31..2fd6ff29ac73 100644 --- a/sys-apps/busybox/busybox-1.7.0.ebuild +++ b/sys-apps/busybox/busybox-1.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.7.0.ebuild,v 1.1 2007/08/25 15:11:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.7.0.ebuild,v 1.2 2007/08/25 19:30:34 vapier Exp $ inherit eutils flag-o-matic savedconfig @@ -58,7 +58,7 @@ fi LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="debug pam static savedconfig make-symlinks selinux" +IUSE="debug pam static make-symlinks selinux" RESTRICT="test" DEPEND="selinux? ( sys-libs/libselinux )" @@ -123,7 +123,12 @@ src_unpack() { busybox_config_option y FEATURE_SH_IS_ASH busybox_config_option n FEATURE_SH_IS_NONE - busybox_config_option pam PAM + if use static && use pam ; then + ewarn "You cannot have USE='static pam'. Assuming static is more important." + fi + use static \ + && busybox_config_option n PAM \ + || busybox_config_option pam PAM busybox_config_option static STATIC busybox_config_option debug DEBUG use debug \ @@ -149,7 +154,7 @@ src_compile() { unset KBUILD_OUTPUT #88088 emake busybox || die "build failed" - if ! use static ; then + if ! use static && ! use pam ; then mv busybox_unstripped{,.bak} emake CONFIG_STATIC=y busybox || die "static build failed" mv busybox_unstripped bb @@ -163,10 +168,12 @@ src_install() { into / newbin busybox_unstripped busybox || die - use static \ - && dosym busybox /bin/bb \ - || dobin bb - dosym bb /bin/busybox.static + if use static || use pam ; then + dosym busybox /bin/bb || die + dosym bb /bin/busybox.static || die + else + dobin bb || die + fi insinto /$(get_libdir)/rcscripts/addons doins "${FILESDIR}"/mdev-start.sh || die |