diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-05-10 10:03:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-05-10 10:03:38 +0000 |
| commit | 87da89a38db61cf057ce65a9a43b1fcafcc1f59b (patch) | |
| tree | 9d18905e0af93851299d39327c543e73c0dbab40 /sys-apps/baselayout | |
| parent | Version bump (diff) | |
| download | historical-87da89a38db61cf057ce65a9a43b1fcafcc1f59b.tar.gz historical-87da89a38db61cf057ce65a9a43b1fcafcc1f59b.tar.bz2 historical-87da89a38db61cf057ce65a9a43b1fcafcc1f59b.zip | |
Install the Makefile into $D so that we can use it in pkg_preinst steps (for binpkgs) #218877 by Kevin Cody Jr.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.0.0.ebuild | 9 |
3 files changed, 17 insertions, 8 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index ab31d72ae560..18de376ecdd3 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.467 2008/04/19 06:22:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.468 2008/05/10 10:03:38 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 10 May 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild: + Install the Makefile into $D so that we can use it in pkg_preinst steps (for + binpkgs) #218877 by Kevin Cody Jr. + 19 Apr 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild: Detect and display users with non-existent shells #215698. diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 54fe29f733d2..d27f4fc1a461 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -11,13 +11,13 @@ DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779 EBUILD baselayout-1.11.15-r3.ebuild 18810 RMD160 70a6adf906ecc25c47084b99d10bd2885da5c4fc SHA1 fd25e055fc06493f265f193e92bbcb02c8809f0a SHA256 7121667401fd361ea636880fd3d29dcb876aff313f14f298e1da4bb8d8ff7660 EBUILD baselayout-1.12.11.1.ebuild 19431 RMD160 f9a9ea6cd713286d16cea13e7a1e43e5b8197026 SHA1 29487a6939425dbc744681b24c0590683ea9267d SHA256 524fced8a4667878dbefa37628b32075623b10cc2f9809dd9b40b8d3cc0e4dff EBUILD baselayout-1.12.12.ebuild 19417 RMD160 07c5ad50dc02dde2806f2eeed0c165055ca76048 SHA1 08690a566a6b2e13c05254758d75e24f297d2e0f SHA256 fc74698d50dfd8eb3679137b68bada1d3d9c01acec46473e31f92b4d16e5febe -EBUILD baselayout-2.0.0.ebuild 4822 RMD160 28e1ecd9bfa5341e90b8a9af65f6556a6553766d SHA1 93a18430c87eb5a1eb5c3c0bf89ac86a4f17dbc3 SHA256 7af2c456ee1854d13f2d0406da72203c3386f496aa97b6af0a2fa9cd5ccb8985 -MISC ChangeLog 101283 RMD160 bc05f76ddf4ad46ad655215d644f5b734efe819c SHA1 b834c2f1ce269477dd5e4e04077ece617a7cd96e SHA256 31a6e45d04ff6f2ce56ff1643d8c3af94a2f9a8c17f87fadd07f26d355b24149 +EBUILD baselayout-2.0.0.ebuild 4950 RMD160 4fe7151a309bd80c401da2623654f8433228e5b8 SHA1 2b28ce129cfb417c9d4b7d53280a5b9d8f9333e9 SHA256 b481a6624ad1fd1078992acf4b8dde5c79de524f248736840b2fa6da4815cb96 +MISC ChangeLog 101475 RMD160 c17736fecfeca72e16a6b864fa8621eefd97aadf SHA1 d2c8b7b8882cc379cc464c281430176ab6935100 SHA256 b733ffea0a4d66241742dec527ac4bf7b492fc0b2006ff45ccf856bd125fafa9 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFICY/Cj9hvisErhMIRAlSrAJ9C7GC0GOem+B7bG3/beRco0gyATACgxZCl -a4p2YFKQ5KBdk0RbLuYH9tI= -=N7yV +iD8DBQFIJXL/j9hvisErhMIRAjEzAKC7OVsqIdZquHW2bpIKsljmAR3lOwCfZuEP +9qwf1gQBSaJ2mjAXHMvHrQc= +=IZj+ -----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-2.0.0.ebuild b/sys-apps/baselayout/baselayout-2.0.0.ebuild index bf49e9edb75e..36ce441b3904 100644 --- a/sys-apps/baselayout/baselayout-2.0.0.ebuild +++ b/sys-apps/baselayout/baselayout-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.4 2008/04/19 06:22:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.5 2008/05/10 10:03:38 vapier Exp $ inherit multilib @@ -49,8 +49,9 @@ pkg_preinst() { ln -s "${lib}" "${ROOT}usr/local/lib" fi - emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" + emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem" fi + rm -f "${D}"/usr/share/${PN}/Makefile } src_install() { @@ -64,6 +65,10 @@ src_install() { install || die dodoc ChangeLog + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile || die + # Should this belong in another ebuild? Like say binutils? # List all the multilib libdirs in /etc/env/04multilib (only if they're # actually different from the normal |