diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-04-23 16:35:21 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-04-23 16:35:21 +0000 |
| commit | b0d27f2f7114eac0a2185fc08b40b73e40ccb90b (patch) | |
| tree | d73654581d65245778e40d1a4e5bc20fbb4d7547 /sys-boot | |
| parent | alpha/ia64/sparc stable wrt #361523 (diff) | |
| download | gentoo-2-b0d27f2f7114eac0a2185fc08b40b73e40ccb90b.tar.gz gentoo-2-b0d27f2f7114eac0a2185fc08b40b73e40ccb90b.tar.bz2 gentoo-2-b0d27f2f7114eac0a2185fc08b40b73e40ccb90b.zip | |
Do not run make in images/ since that tries to run lilo.
(Portage version: 2.2.0_alpha30/cvs/Linux i686)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/lilo/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-23.1-r1.ebuild | 10 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-23.2-r1.ebuild | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog index 7288e1492647..9771bb7b8f77 100644 --- a/sys-boot/lilo/ChangeLog +++ b/sys-boot/lilo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/lilo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.66 2011/04/23 16:12:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.67 2011/04/23 16:35:21 jer Exp $ + + 23 Apr 2011; Jeroen Roovers <jer@gentoo.org> lilo-23.1-r1.ebuild, + lilo-23.2-r1.ebuild: + Do not run make in images/ since that tries to run lilo. *lilo-23.2-r1 (23 Apr 2011) *lilo-23.1-r1 (23 Apr 2011) diff --git a/sys-boot/lilo/lilo-23.1-r1.ebuild b/sys-boot/lilo/lilo-23.1-r1.ebuild index d0bfb4ac56c8..6121b8412546 100644 --- a/sys-boot/lilo/lilo-23.1-r1.ebuild +++ b/sys-boot/lilo/lilo-23.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.1-r1.ebuild,v 1.1 2011/04/23 16:12:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.1-r1.ebuild,v 1.2 2011/04/23 16:35:21 jer Exp $ EAPI="2" @@ -22,13 +22,12 @@ SLOT="0" LICENSE="BSD GPL-2" KEYWORDS="-* ~amd64 ~x86" -DEPEND=">=sys-devel/bin86-0.15.5" +DEPEND=">=sys-devel/bin86-0.15.5 + app-arch/sharutils" RDEPEND="device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.02.12 ) )" -S="${WORKDIR}/${PN}-23.0" - src_prepare() { # this patch is needed when booting PXE and the device you're using # emulates vga console via serial console. @@ -36,8 +35,11 @@ src_prepare() { use pxeserial && epatch "${FILESDIR}/${PN}-22.8-novga.patch" # Do not strip and have parallel make + # FIXME: images/Makefile does weird stuff sed -i Makefile src/Makefile \ -e '/strip/d;s|^ make| $(MAKE)|g' \ + -e '/images install/d' \ + -e '/images all/d' \ || die "sed strip failed" } diff --git a/sys-boot/lilo/lilo-23.2-r1.ebuild b/sys-boot/lilo/lilo-23.2-r1.ebuild index 8a63ec2c2f3c..262021c108c7 100644 --- a/sys-boot/lilo/lilo-23.2-r1.ebuild +++ b/sys-boot/lilo/lilo-23.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2-r1.ebuild,v 1.1 2011/04/23 16:12:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2-r1.ebuild,v 1.2 2011/04/23 16:35:21 jer Exp $ EAPI="2" @@ -22,13 +22,12 @@ SLOT="0" LICENSE="BSD GPL-2" KEYWORDS="-* ~amd64 ~x86" -DEPEND=">=sys-devel/bin86-0.15.5" +DEPEND=">=sys-devel/bin86-0.15.5 + app-arch/sharutils" RDEPEND="device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.02.12 ) )" -S="${WORKDIR}/${PN}-23.0" - src_prepare() { # this patch is needed when booting PXE and the device you're using # emulates vga console via serial console. @@ -36,8 +35,11 @@ src_prepare() { use pxeserial && epatch "${FILESDIR}/${PN}-22.8-novga.patch" # Do not strip and have parallel make + # FIXME: images/Makefile does weird stuff sed -i Makefile src/Makefile \ -e '/strip/d;s|^ make| $(MAKE)|g' \ + -e '/images install/d' \ + -e '/images all/d' \ || die "sed strip failed" } |