[Pkg-xen-changes] r867 - in trunk/xen/debian: . patches

[Bastian Blank]

Author: waldi
Date: Mon Apr 11 19:53:26 2011
New Revision: 867

Log:
* debian/changelog: Update.
* debian/patches/tools-disable.diff: Reenable firmware dir.
* debian/patches/tools-firmware-etherboot-packaged.diff: Fix filenames.

Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/patches/tools-disable.diff
   trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Mon Apr 11 19:38:04 2011	(r866)
+++ trunk/xen/debian/changelog	Mon Apr 11 19:53:26 2011	(r867)
@@ -1,3 +1,10 @@
+xen (4.1.0-2) UNRELEASED; urgency=low
+
+  * Reenable hvmloader:
+    - Use packaged ipxe.
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 11 Apr 2011 15:07:42 +0000
+
 xen (4.1.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/xen/debian/patches/tools-disable.diff
==============================================================================
--- trunk/xen/debian/patches/tools-disable.diff	Mon Apr 11 19:38:04 2011	(r866)
+++ trunk/xen/debian/patches/tools-disable.diff	Mon Apr 11 19:53:26 2011	(r867)
@@ -1,13 +1,6 @@
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -12,16 +12,13 @@
- SUBDIRS-y += hotplug
- SUBDIRS-y += xentrace
- SUBDIRS-$(CONFIG_XCUTILS) += xcutils
--SUBDIRS-$(CONFIG_X86) += firmware
- SUBDIRS-$(ACM_SECURITY) += security
- SUBDIRS-y += console
- SUBDIRS-y += xenmon
+@@ -19,9 +19,7 @@
  SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
  SUBDIRS-$(VTPM_TOOLS) += vtpm
  SUBDIRS-y += xenstat
@@ -17,7 +10,7 @@
  SUBDIRS-$(CONFIG_Linux) += blktap2
  SUBDIRS-$(CONFIG_NetBSD) += libaio
  SUBDIRS-$(CONFIG_NetBSD) += blktap2
-@@ -31,8 +28,11 @@
+@@ -31,8 +29,11 @@
  
  # do not recurse in to a dir we are about to delete
  ifneq "$(MAKECMDGOALS)" "distclean"

Modified: trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff
==============================================================================
--- trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff	Mon Apr 11 19:38:04 2011	(r866)
+++ trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff	Mon Apr 11 19:53:26 2011	(r867)
@@ -54,3 +54,12 @@
  .PHONY: distclean
  distclean: clean
 -	rm -rf $T
+--- a/tools/firmware/etherboot/Config
++++ b/tools/firmware/etherboot/Config
+@@ -1,5 +1,5 @@
+ 
+-NICS = rtl8139 8086100e
++NICS = rtl8139 e1000_82540
+ 
+ CFLAGS += -UPXE_DHCP_STRICT
+ CFLAGS += -DPXE_DHCP_STRICT