summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2013-06-27 22:13:57 +0000
committerDoug Goldstein <cardoe@gentoo.org>2013-06-27 22:13:57 +0000
commite4b06fa390d2a7e8cc8667670099704a7b028286 (patch)
treeebe10eba8a0b8e46c4c3481f718d9681fabe0733 /sys-firmware/ipxe
parentGenerally disable -Werror. (diff)
downloadgentoo-2-e4b06fa390d2a7e8cc8667670099704a7b028286.tar.gz
gentoo-2-e4b06fa390d2a7e8cc8667670099704a7b028286.tar.bz2
gentoo-2-e4b06fa390d2a7e8cc8667670099704a7b028286.zip
Simplify generating our configs for VMWare.
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Diffstat (limited to 'sys-firmware/ipxe')
-rw-r--r--sys-firmware/ipxe/ChangeLog5
-rw-r--r--sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild12
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-firmware/ipxe/ChangeLog b/sys-firmware/ipxe/ChangeLog
index 8c4e92ace1f4..6025deadd9e2 100644
--- a/sys-firmware/ipxe/ChangeLog
+++ b/sys-firmware/ipxe/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-firmware/ipxe
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ChangeLog,v 1.7 2013/06/27 22:10:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ChangeLog,v 1.8 2013/06/27 22:13:57 cardoe Exp $
+
+ 27 Jun 2013; Doug Goldstein <cardoe@gentoo.org> ipxe-1.0.0_p20130624.ebuild:
+ Simplify generating our configs for VMWare.
27 Jun 2013; Doug Goldstein <cardoe@gentoo.org> ipxe-1.0.0_p20120905.ebuild,
ipxe-1.0.0_p20130225.ebuild, ipxe-1.0.0_p20130624.ebuild:
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild
index 57cc122dc0bd..1af52437fdea 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild,v 1.2 2013/06/27 22:10:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/ipxe/ipxe-1.0.0_p20130624.ebuild,v 1.3 2013/06/27 22:13:57 cardoe Exp $
EAPI=5
@@ -32,14 +32,12 @@ src_prepare() {
#undef BANNER_TIMEOUT
#define BANNER_TIMEOUT 0
EOF
-}
-src_configure() {
if use vmware; then
- sed -i config/sideband.h \
- -e 's|//#define[[:space:]]VMWARE_SETTINGS|#define VMWARE_SETTINGS|'
- sed -i config/console.h \
- -e 's|//#define[[:space:]]CONSOLE_VMWARE|#define CONSOLE_VMWARE|'
+ cat <<-EOF >> "${S}"/config/local/general.h
+#define VMWARE_SETTINGS
+#define CONSOLE_VMWARE
+EOF
fi
}