[app-emulation/xen-tools] Clean up

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

6 files changed, 9 insertions, 259 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 2e791fe6acd6..1ec4b61c8a8e 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.67 2011/03/26 00:26:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.68 2011/03/26 00:27:52 alexxy Exp $
+
+  26 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/xen-tools-3.0.4_p1--as-needed.patch,
+  -files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch,
+  -files/xen-tools-3.1.0-xen-detect-nopie-fix.patch,
+  -files/xen-tools-3.1.3-bzimage.patch,
+  -files/xen-tools-3.1.3-network-bridge-broadcast.patch:
+  Clean up
 
 *xen-tools-4.1.0 (26 Mar 2011)
 
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch
deleted file mode 100644
index 8243ac8f342e..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rpuN xen-3.0.4_1-src.orig/tools/xenmon/Makefile xen-3.0.4_1-src/tools/xenmon/Makefile
---- xen-3.0.4_1-src.orig/tools/xenmon/Makefile	2007-01-08 15:00:51.000000000 +0000
-+++ xen-3.0.4_1-src/tools/xenmon/Makefile	2007-02-09 01:02:08.000000000 +0000
-@@ -42,6 +42,6 @@ clean:
- 
- 
- %: %.c Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
- xentrace_%: %.c Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch
deleted file mode 100644
index e830de54ae43..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru xen-3.0.4_1-src.orig/tools/examples/network-bridge xen-3.0.4_1-src/tools/examples/network-bridge
---- xen-3.0.4_1-src.orig/tools/examples/network-bridge	2007-01-08 07:00:48.000000000 -0800
-+++ xen-3.0.4_1-src/tools/examples/network-bridge	2007-03-05 17:37:32.000000000 -0800
-@@ -70,13 +70,13 @@
- vif0="vif0.${vifnum}"
- 
- get_ip_info() {
--    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
-+    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e "s/$1//"`
-     gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
- }
-     
- do_ifup() {
-     if ! ifup $1 ; then
--        if [ ${addr_pfx} ] ; then
-+        if [ "${addr_pfx}" ] ; then
-             # use the info from get_ip_info()
-             ip addr flush $1
-             ip addr add ${addr_pfx} dev $1
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch
deleted file mode 100644
index 6515d123c8a0..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: xen-3.1.0-src/tools/misc/Makefile
-===================================================================
---- xen-3.1.0-src.orig/tools/misc/Makefile
-+++ xen-3.1.0-src/tools/misc/Makefile
-@@ -45,3 +45,6 @@ clean:
- 
- xenperf: %: %.o Makefile
- 	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
-+
-+xen-detect: %: %.c Makefile
-+	$(CC) $(CFLAGS) $(call cc-option,$(CC),-nopie,) -o $@ $<
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.3-bzimage.patch b/app-emulation/xen-tools/files/xen-tools-3.1.3-bzimage.patch
deleted file mode 100644
index 5820c9f9ce94..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.3-bzimage.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-x86: Support loading Linux bzImage v2.08 and up.
-
-The latest -mm kernel (2.6.25-rc3-mm1) contains v2.08 of the Linux
-bzImage format which embeds an ELF file in place of the raw payload
-allowing it to be extracted and used by the Xen domain builder.
-
-It is expected that this functionality will be put forward for 2.6.26.
-
-Signed-off-by : Ian Campbell <ijc@hellion.org.uk>
-
-diff -up /dev/null xen-3.1.2-src/tools/libxc/xc_dom_bzimageloader.c
---- /dev/null   2008-07-30 07:06:19.721092644 +0100
-+++ xen-3.1.2-src/tools/libxc/xc_dom_bzimageloader.c    2008-07-30 08:51:24.000000000 +0100
-@@ -0,0 +1,159 @@
-+/*
-+ * Xen domain builder -- bzImage bits
-+ *
-+ * Parse and load bzImage kernel images.
-+ *
-+ * This relies on version 2.08 of the boot protocol, which contains an
-+ * ELF file embedded in the bzImage.  The loader extracts this ELF
-+ * image and passes it off to the standard ELF loader.
-+ *
-+ * This code is licenced under the GPL.
-+ * written 2006 by Gerd Hoffmann <kraxel@suse.de>.
-+ * written 2007 by Jeremy Fitzhardinge <jeremy@xensource.com>
-+ * written 2008 by Ian Campbell <ijc@hellion.org.uk>
-+ *
-+ */
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
-+
-+#include "xg_private.h"
-+#include "xc_dom.h"
-+
-+struct setup_header {
-+       uint8_t         _pad0[0x1f1];           /* skip uninteresting stuff */
-+       uint8_t         setup_sects;
-+       uint16_t        root_flags;
-+       uint32_t        syssize;
-+       uint16_t        ram_size;
-+       uint16_t        vid_mode;
-+       uint16_t        root_dev;
-+       uint16_t        boot_flag;
-+       uint16_t        jump;
-+       uint32_t        header;
-+#define HDR_MAGIC              "HdrS"
-+#define HDR_MAGIC_SZ   4
-+       uint16_t        version;
-+#define VERSION(h,l)   (((h)<<8) | (l))
-+       uint32_t        realmode_swtch;
-+       uint16_t        start_sys;
-+       uint16_t        kernel_version;
-+       uint8_t         type_of_loader;
-+       uint8_t         loadflags;
-+       uint16_t        setup_move_size;
-+       uint32_t        code32_start;
-+       uint32_t        ramdisk_image;
-+       uint32_t        ramdisk_size;
-+       uint32_t        bootsect_kludge;
-+       uint16_t        heap_end_ptr;
-+       uint16_t        _pad1;
-+       uint32_t        cmd_line_ptr;
-+       uint32_t        initrd_addr_max;
-+       uint32_t        kernel_alignment;
-+       uint8_t         relocatable_kernel;
-+       uint8_t         _pad2[3];
-+       uint32_t        cmdline_size;
-+       uint32_t        hardware_subarch;
-+       uint64_t        hardware_subarch_data;
-+       uint32_t        payload_offset;
-+       uint32_t        payload_length;
-+} __attribute__((packed));
-+
-+extern struct xc_dom_loader elf_loader;
-+
-+static unsigned int payload_offset(struct setup_header *hdr)
-+{
-+    unsigned int off;
-+
-+    off = (hdr->setup_sects + 1) * 512;
-+    off += hdr->payload_offset;
-+    return off;
-+}
-+
-+static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
-+{
-+    struct setup_header *hdr;
-+
-+    if ( dom->kernel_blob == NULL )
-+    {
-+        if ( verbose )
-+            xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
-+                         __FUNCTION__);
-+        return -EINVAL;
-+    }
-+    if ( dom->kernel_size < sizeof(struct setup_header) )
-+    {
-+        if ( verbose )
-+            xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
-+                         __FUNCTION__);
-+        return -EINVAL;
-+    }
-+
-+    hdr = dom->kernel_blob;
-+
-+    if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 )
-+    {
-+        if ( verbose )
-+            xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n",
-+                         __FUNCTION__);
-+        return -EINVAL;
-+    }
-+
-+    if ( hdr->version < VERSION(2,8) )
-+    {
-+        if ( verbose )
-+            xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n",
-+                         __FUNCTION__, hdr->version);
-+        return -EINVAL;
-+    }
-+
-+    dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
-+    dom->kernel_size = hdr->payload_length;
-+
-+    if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
-+    {
-+        if ( verbose )
-+            xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n",
-+                         __FUNCTION__);
-+        return -EINVAL;
-+    }
-+
-+    return elf_loader.probe(dom);
-+}
-+
-+static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
-+{
-+    return check_bzimage_kernel(dom, 0);
-+}
-+
-+static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom)
-+{
-+    return elf_loader.parser(dom);
-+}
-+
-+static int xc_dom_load_bzimage_kernel(struct xc_dom_image *dom)
-+{
-+    return elf_loader.loader(dom);
-+}
-+
-+static struct xc_dom_loader bzimage_loader = {
-+    .name = "Linux bzImage",
-+    .probe = xc_dom_probe_bzimage_kernel,
-+    .parser = xc_dom_parse_bzimage_kernel,
-+    .loader = xc_dom_load_bzimage_kernel,
-+};
-+
-+static void __init register_loader(void)
-+{
-+    xc_dom_register_loader(&bzimage_loader);
-+}
-+
-+/*
-+ * Local variables:
-+ * mode: C
-+ * c-set-style: "BSD"
-+ * c-basic-offset: 4
-+ * tab-width: 4
-+ * indent-tabs-mode: nil
-+ * End:
-+ */
-diff -up xen-3.1.2-src/tools/libxc/Makefile.bzImage xen-3.1.2-src/tools/libxc/Makefile
---- xen-3.1.2-src/tools/libxc/Makefile.bzImage  2007-11-14 23:35:27.000000000 +0000
-+++ xen-3.1.2-src/tools/libxc/Makefile  2008-07-30 08:51:24.000000000 +0100
-@@ -45,10 +45,11 @@ $(LIBELF_SRCS) libelf-private.h:
- GUEST_SRCS-y += $(LIBELF_SRCS)
- 
- # new domain builder
--GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c
--GUEST_SRCS-y += xc_dom_elfloader.c
--GUEST_SRCS-y += xc_dom_binloader.c
--GUEST_SRCS-y += xc_dom_compat_linux.c
-+GUEST_SRCS-y                 += xc_dom_core.c xc_dom_boot.c
-+GUEST_SRCS-y                 += xc_dom_elfloader.c
-+GUEST_SRCS-$(CONFIG_X86)     += xc_dom_bzimageloader.c
-+GUEST_SRCS-y                 += xc_dom_binloader.c
-+GUEST_SRCS-y                 += xc_dom_compat_linux.c
- 
- GUEST_SRCS-$(CONFIG_X86)     += xc_dom_x86.c
- GUEST_SRCS-$(CONFIG_IA64)    += xc_dom_ia64.c
-diff -up xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c.bzImage xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c
---- xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c.bzImage        2007-11-14 23:35:27.000000000 +0000
-+++ xen-3.1.2-src/tools/libxc/xc_dom_elfloader.c        2008-07-30 08:51:24.000000000 +0100
-@@ -281,7 +281,7 @@ static int xc_dom_load_elf_kernel(struct
- 
- /* ------------------------------------------------------------------------ */
- 
--static struct xc_dom_loader elf_loader = {
-+struct xc_dom_loader elf_loader = {
-     .name = "ELF-generic",
-     .probe = xc_dom_probe_elf_kernel,
-     .parser = xc_dom_parse_elf_kernel,
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.3-network-bridge-broadcast.patch b/app-emulation/xen-tools/files/xen-tools-3.1.3-network-bridge-broadcast.patch
deleted file mode 100644
index f916eced3360..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.3-network-bridge-broadcast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xen-3.1.3/tools/examples/network-bridge.orig	2008-01-31 02:06:54.000000000 -0800
-+++ xen-3.1.3/tools/examples/network-bridge	2008-02-02 17:21:25.000000000 -0800
-@@ -70,7 +70,7 @@
- vif0="vif0.${vifnum}"
- 
- get_ip_info() {
--    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
-+    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e "s/$1//"`
-     gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
- }
-