summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2011-03-26 00:26:15 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2011-03-26 00:26:15 +0000
commitc93620ca796032f33c4d32fd01513e7246b41c68 (patch)
treed622526fa4de36a1bc6c85426934e249374299d0 /app-emulation/xen-tools/files
parentclean up (diff)
downloadgentoo-2-c93620ca796032f33c4d32fd01513e7246b41c68.tar.gz
gentoo-2-c93620ca796032f33c4d32fd01513e7246b41c68.tar.bz2
gentoo-2-c93620ca796032f33c4d32fd01513e7246b41c68.zip
[app-emulation/xen-tools] Version bump & clean up
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/xen-tools/files')
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch36
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch30
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.3.0-warning-fix.patch33
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch12
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch11
-rw-r--r--app-emulation/xen-tools/files/xen-tools-3.4.1-xc_core-memset.patch10
6 files changed, 0 insertions, 132 deletions
diff --git a/app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch b/app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch
deleted file mode 100644
index d112dd4ac438..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Introduce a configure option to disable building of qemu documentation.
-Gentoo Bug #192427
-
-Index: xen-3.2.1/tools/ioemu/configure
-===================================================================
---- xen-3.2.1.orig/tools/ioemu/configure
-+++ xen-3.2.1/tools/ioemu/configure
-@@ -214,6 +214,8 @@ for opt do
- ;;
- --disable-sdl) sdl="no"
- ;;
-+ --enable-docs) build_docs="yes"
-+ ;;
- --enable-coreaudio) coreaudio="yes"
- ;;
- --enable-alsa) alsa="yes"
-@@ -295,6 +297,7 @@ echo " --enable-coreaudio enable
- echo " --enable-alsa enable ALSA audio driver"
- echo " --enable-fmod enable FMOD audio driver"
- echo " --enabled-dsound enable DirectSound audio driver"
-+echo " --enable-docs enable building of docs (requires texi2html and pod2man)"
- echo " --disable-vnc-tls disable TLS encryption for VNC server"
- echo " --enable-system enable all system emulation targets"
- echo " --disable-system disable all system emulation targets"
-@@ -576,8 +579,9 @@ EOF
- fi
-
- # Check if tools are available to build documentation.
--if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then
-- build_docs="yes"
-+if [ ! -x "`which texi2html`" ] || [ ! -x "`which pod2man`" ]; then
-+ echo "Missing texi2html or pod2man, will not build docs"
-+ build_docs="no"
- fi
-
- if test "$mingw32" = "yes" ; then
diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch
deleted file mode 100644
index f320bd33d7ec..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Keir Fraser <keir.fraser@citrix.com>
-# Date 1219920254 -3600
-# Node ID e92dedc72471c02c8d6b05b74afed0d32ae86171
-# Parent 18a18a7dec2b6ad8eabb3281a1535e8bec05d8d5
-tools/xenmon/Makefile: Move LDFLAGS after $<
-
-gcc expects libraries needed for object files to be specified after
-the object. Linking usually does not fail, unless it is optimized (for
-instance, using -Wl,-as-needed).
-
-The related Gentoo bug is 135145 [ https://bugs.gentoo.org/135145 ].
-
-From: Robert Buchholz <rbu@gentoo.org>
-Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-xen-unstable changeset: 18386:ab8212bd5604f58635e2b8bc6ffec6eddd211cf9
-xen-unstable date: Wed Aug 27 15:02:38 2008 +0100
-
---- a/tools/xenmon/Makefile Thu Aug 28 11:43:40 2008 +0100
-+++ b/tools/xenmon/Makefile Thu Aug 28 11:44:14 2008 +0100
-@@ -42,6 +42,6 @@ clean:
-
-
- %: %.c Makefile
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-+ $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
- xentrace_%: %.c Makefile
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-+ $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.0-warning-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.0-warning-fix.patch
deleted file mode 100644
index f2f5e60141f7..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.3.0-warning-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
---- a/tools/libxc/xc_dom_x86.c 2008-08-22 17:49:08.000000000 +0800
-+++ b/tools/libxc/xc_dom_x86.c 2009-02-19 19:08:23.000000000 +0800
-@@ -418,7 +418,7 @@
- xc_dom_printf("%s: called\n", __FUNCTION__);
-
- memset(start_info, 0, sizeof(*start_info));
-- snprintf(start_info->magic, sizeof(start_info->magic), dom->guest_type);
-+ snprintf(start_info->magic, sizeof(start_info->magic), "%s", dom->guest_type);
- start_info->nr_pages = dom->total_pages;
- start_info->shared_info = shinfo << PAGE_SHIFT_X86;
- start_info->pt_base = dom->pgtables_seg.vstart;
-@@ -457,7 +457,7 @@
- xc_dom_printf("%s: called\n", __FUNCTION__);
-
- memset(start_info, 0, sizeof(*start_info));
-- snprintf(start_info->magic, sizeof(start_info->magic), dom->guest_type);
-+ snprintf(start_info->magic, sizeof(start_info->magic), "%s", dom->guest_type);
- start_info->nr_pages = dom->total_pages;
- start_info->shared_info = shinfo << PAGE_SHIFT_X86;
- start_info->pt_base = dom->pgtables_seg.vstart;
-diff -Nru a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
---- a/tools/xenstat/xentop/xentop.c 2008-08-22 17:49:08.000000000 +0800
-+++ b/tools/xenstat/xentop/xentop.c 2009-02-19 19:11:46.000000000 +0800
-@@ -254,7 +254,7 @@
- {
- if(cwin != NULL && !isendwin())
- endwin();
-- fprintf(stderr, str);
-+ fprintf(stderr, "%s", str);
- exit(1);
- }
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch
deleted file mode 100644
index f1039d89fac5..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xen-3.3.0/tools/misc/Makefile
-===================================================================
---- xen-3.3.0.orig/tools/misc/Makefile
-+++ xen-3.3.0/tools/misc/Makefile
-@@ -51,3 +51,7 @@ clean:
-
- xenperf: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl)
-+
-+xen-detect: %: %.c Makefile
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(call cc-option,$(CC),-nopie,) -o $@ $<
-+
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch b/app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch
deleted file mode 100644
index 165db6a77514..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xen-3.4.0/tools/hotplug/Linux/Makefile.orig 2009-06-10 10:54:12.000000000 +0200
-+++ xen-3.4.0/tools/hotplug/Linux/Makefile 2009-06-10 10:57:24.000000000 +0200
-@@ -36,7 +36,7 @@
- ifeq ($(findstring $(DI),$(DE)),$(DI))
- HOTPLUGS=install-hotplug install-udev
- else
--ifeq ($(shell [ -x /usr/bin/udevinfo ] && [ `/usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
-+ifeq ($(shell [ -x /sbin/udevadm ] && [ `/sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
- HOTPLUGS=install-udev
- else
- HOTPLUGS=install-hotplug
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.1-xc_core-memset.patch b/app-emulation/xen-tools/files/xen-tools-3.4.1-xc_core-memset.patch
deleted file mode 100644
index 836a39b7e00e..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.1-xc_core-memset.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xen-3.4.1/tools/libxc/xc_core.c.orig 2009-08-06 17:57:25.000000000 +0400
-+++ xen-3.4.1/tools/libxc/xc_core.c 2009-08-11 20:48:40.000000000 +0400
-@@ -321,6 +321,7 @@
- struct xen_dumpcore_elfnote_none_desc none;
-
- elfnote_init(&elfnote);
-+ if (sizeof(none))
- memset(&none, 0, sizeof(none));
-
- elfnote.descsz = sizeof(none);