From b7d923f4689836405a35c118d9c70dda42f9e8fb Mon Sep 17 00:00:00 2001
From: Floris Bos
Date: Fri, 6 May 2011 18:33:05 +0100
Subject: [contrib] Update rom-o-matic to build iPXE

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 contrib/rom-o-matic/bottom.php     | 14 +++++++-------
 contrib/rom-o-matic/build.php      |  2 +-
 contrib/rom-o-matic/directions.php |  2 +-
 contrib/rom-o-matic/flag-table.php | 22 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'contrib')

diff --git a/contrib/rom-o-matic/bottom.php b/contrib/rom-o-matic/bottom.php
index ff094fd8..a6343d45 100644
--- a/contrib/rom-o-matic/bottom.php
+++ b/contrib/rom-o-matic/bottom.php
@@ -27,25 +27,25 @@ Resources:
 <ul>
   <li>
     Source code for iPXE images is available at
-    <a href="http://etherboot.org/wiki/download" target="_blank">
-    http://etherboot.org/wiki/download</a>
+    <a href="http://www.ipxe.org/download" target="_blank">
+    http://www.ipxe.org/download</a>
     <br><br>
   </li>
   <li>
     For general information about using iPXE, please visit the
-    <a href="http://www.etherboot.org/" target="_blank">
-    Etherboot Project Home Page</a>
+    <a href="http://www.ipxe.org/" target="_blank">
+    iPXE Project Home Page</a>
     <br><br>
   </li>
   <li>
     For Email-based support for iPXE please join
-    <a href="http://etherboot.org/wiki/mailinglists" target="_blank">
-    Etherboot Project mailing lists.</a>
+    <a href="http://www.ipxe.org/contact" target="_blank">
+    iPXE Project mailing lists.</a>
     <br><br>
   </li>
   <li>
     For real-time online iPXE support via IRC please visit the
-    <a href="irc://irc.freenode.net/%23etherboot"> #etherboot channel
+    <a href="irc://irc.freenode.net/%23ipxe"> #ipxe channel
     of irc.freenode.net</a>.
     <br><br>
   </li>
diff --git a/contrib/rom-o-matic/build.php b/contrib/rom-o-matic/build.php
index 3101b3e3..b9bc5951 100644
--- a/contrib/rom-o-matic/build.php
+++ b/contrib/rom-o-matic/build.php
@@ -179,7 +179,7 @@ if ( $embedded_script != "" ) {
 
 // Make the requested image.  $status is set to 0 on success
 $make_target = "bin/${nic}.${fmt_extension}";
-$make_cmd = "make -C '$build_dir' '$make_target' $emb_script_cmd $2>&1";
+$make_cmd = "make -C '$build_dir' '$make_target' $emb_script_cmd 2>&1";
 
 exec ( $make_cmd, $maketxt, $status );
 
diff --git a/contrib/rom-o-matic/directions.php b/contrib/rom-o-matic/directions.php
index cba5eb44..45323573 100644
--- a/contrib/rom-o-matic/directions.php
+++ b/contrib/rom-o-matic/directions.php
@@ -37,7 +37,7 @@
       <em>PCI VENDOR CODE</em> and <em>PCI DEVICE CODE</em>  <br>
       that match the NIC device for which you are making this image.<br><br>
       Information on how to determine NIC PCI IDs may be found
-      <a href="http://etherboot.org/wiki/romburning"
+      <a href="http://www.ipxe.org/howto/romburning"
       target="_blank">here</a>.
       <br><br>
       PCI VENDOR CODE:  <? echo textbox ( "pci_vendor_code",
diff --git a/contrib/rom-o-matic/flag-table.php b/contrib/rom-o-matic/flag-table.php
index 078e5fd6..0eee0c3f 100644
--- a/contrib/rom-o-matic/flag-table.php
+++ b/contrib/rom-o-matic/flag-table.php
@@ -98,6 +98,17 @@ $flag_table = array (
 	   "cfgsec" => "general"
 	   ),
 
+        "KEYBOARD_MAP"
+        => array (
+           "flag" => "KEYBOARD_MAP",
+           "type" => "choice",
+	   "options" => array("al","az","bg","by","cf","cz","de","dk","es","et","fi","fr",
+	      "gr","hu","il","it","lt","mk","mt","nl","no","pl","pt","ro","ru","sg","sr",
+	      "th","ua","uk","us","wo"),
+           "value" => "us",
+           "cfgsec" => "console"
+           ),
+
 	// End Console Options
 
 	// Begin Network Protocol Options:
@@ -487,6 +498,17 @@ $flag_table = array (
 
 	// End Wireless options
 
+	// Obscure options required to compile
+	"NETDEV_DISCARD_RATE"
+	=> array (
+	   "flag" => "NETDEV_DISCARD_RATE",
+	   "type" => "integer",
+	   "value" => "0",
+	   "cfgsec" => "general",
+	   "hide_from_user" => true
+	   )
+
+	// End Obscure options
 );
 
 // For emacs:
-- 
cgit v1.2.3-55-g7522