From b8288d8d677715c9f3d9b2fbdaaa71e4b35866d0 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 28 May 2013 20:12:50 +0200 Subject: delete old xen stuff --- app-emulation/xen-tools/Manifest | 15 -- .../xen-tools/files/xen-consoles.logrotate | 5 - .../files/xen-tools-3.0.4_p1--as-needed.patch | 12 - ...n-tools-3.0.4_p1-network-bridge-broadcast.patch | 19 -- .../xen-tools-3.1.0-xen-detect-nopie-fix.patch | 11 - .../xen-tools/files/xen-tools-3.1.3-bzimage.patch | 205 ----------------- .../xen-tools-3.1.3-network-bridge-broadcast.patch | 11 - .../files/xen-tools-3.2.1-qemu-nodocs.patch | 36 --- .../xen-tools/files/xen-tools-3.3.1-nostrip.patch | 26 --- .../xen-tools-3.3.1-xen-detect-nopie-fix.patch | 12 - app-emulation/xen-tools/files/xend.initd | 61 ----- .../xen-tools/files/xendomains-screen.confd | 15 -- app-emulation/xen-tools/files/xendomains.confd | 9 - app-emulation/xen-tools/files/xendomains.initd | 108 --------- app-emulation/xen-tools/xen-tools-3.3.1.ebuild | 256 --------------------- app-emulation/xen/Manifest | 2 - app-emulation/xen/xen-3.3.1.ebuild | 103 --------- 17 files changed, 906 deletions(-) delete mode 100644 app-emulation/xen-tools/Manifest delete mode 100644 app-emulation/xen-tools/files/xen-consoles.logrotate delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.1.0-xen-detect-nopie-fix.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.1.3-bzimage.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.1.3-network-bridge-broadcast.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.2.1-qemu-nodocs.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.3.1-nostrip.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.3.1-xen-detect-nopie-fix.patch delete mode 100644 app-emulation/xen-tools/files/xend.initd delete mode 100644 app-emulation/xen-tools/files/xendomains-screen.confd delete mode 100644 app-emulation/xen-tools/files/xendomains.confd delete mode 100755 app-emulation/xen-tools/files/xendomains.initd delete mode 100644 app-emulation/xen-tools/xen-tools-3.3.1.ebuild delete mode 100644 app-emulation/xen/Manifest delete mode 100644 app-emulation/xen/xen-3.3.1.ebuild diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest deleted file mode 100644 index b617a48c..00000000 --- a/app-emulation/xen-tools/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 -AUX xen-tools-3.0.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a -AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 SHA1 88142952527acc47b00c98a4ccde15661449ee04 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223 -AUX xen-tools-3.1.0-xen-detect-nopie-fix.patch 385 RMD160 5ad84ac847c1eeeaa7aac2fbcfd3b476ee7c991d SHA1 bd59257c972b7cd976b4b1953ff44a43a1d2b003 SHA256 c8b7a0858001b15ff12cc652977eb7ada06b036a8c593fccac9015ce05c84816 -AUX xen-tools-3.1.3-bzimage.patch 6703 RMD160 48d272a317dd91c9e53fad46d6868661b5bd2f92 SHA1 77b1536a2f76bd2fb712192aeb52441a76cd10e4 SHA256 497743319886841c80419dbcccf43a4ad950fe99d86243ca02255c85a1586bd1 -AUX xen-tools-3.1.3-network-bridge-broadcast.patch 490 RMD160 67a2a7f07e986b0c43f75ade5c073bbcfdae5fca SHA1 53171e6764c6018e529b805a98fa369d2568364b SHA256 1c971a0a81219b8626a25c2d135d51bc8108e7ac839794f356cc349386fe34e3 -AUX xen-tools-3.2.1-qemu-nodocs.patch 1377 RMD160 d20780a6ac4a9f2fee98523edd6701e6bc15951f SHA1 6d7cb96b5fd717291d9d18885bb7a6be869882e4 SHA256 f8dec919bb0187a71217643f302403de7d488729109e21349e5627b3bb569656 -AUX xen-tools-3.3.1-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5bb549e SHA1 bb4db097af6e206ed68bcc1a1c3ef48b02e9a4c5 SHA256 2debac718c01a7eac4daf3182a7ae04aa562137d791cd510ecf1848d7eaccebd -AUX xen-tools-3.3.1-xen-detect-nopie-fix.patch 394 RMD160 77f48ee4bdeb61f91f5dd1c0ebf2351c8ffa1b55 SHA1 07eea51bb2979f7fe342954902b8680a6bd1a7bc SHA256 64266079194f5b8374ae0c2537645f4e3658817b42e55971ebc869dc03f37208 -AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889 -AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a -AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc -AUX xendomains.initd 2609 RMD160 d606f752d3b1f9451bf9e1895f3a28350e8bdc87 SHA1 8e57c4ea216cede1898d960650008fd65ae4037f SHA256 16cac2533e045dba45cac60abde9184bc3aa41e9c319a1ac286dd4036222ff00 -DIST xen-3.3.1.tar.gz 11329774 RMD160 31d3e801b4eec37715900c6247be403aaafdd5e1 SHA1 fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9 SHA256 88b4234eeee80560a3321c7e887cedd7696f45694e3e9557c21b150de1c54a49 -EBUILD xen-tools-3.3.1.ebuild 7744 RMD160 d2013214cb59a269ecb5c02e62077e7cfbcbb157 SHA1 69d8eec7ee90372dcf58127fef11242c8b165d25 SHA256 e92a122ed0e7ff1bdefc43bed53a72efd4bec3de4ac2fe40e3eb3afaef9a9ccb diff --git a/app-emulation/xen-tools/files/xen-consoles.logrotate b/app-emulation/xen-tools/files/xen-consoles.logrotate deleted file mode 100644 index c6445239..00000000 --- a/app-emulation/xen-tools/files/xen-consoles.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xen-consoles/*.log { - rotate 7 - missingok - compress -} 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 8243ac8f..00000000 --- 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 e830de54..00000000 --- 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 6515d123..00000000 --- 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 5820c9f9..00000000 --- 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 - -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 . -+ * written 2007 by Jeremy Fitzhardinge -+ * written 2008 by Ian Campbell -+ * -+ */ -+#include -+#include -+#include -+ -+#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 f916eced..00000000 --- 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 //'` - } - 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 d112dd4a..00000000 --- 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.1-nostrip.patch b/app-emulation/xen-tools/files/xen-tools-3.3.1-nostrip.patch deleted file mode 100644 index 48e7cd57..00000000 --- a/app-emulation/xen-tools/files/xen-tools-3.3.1-nostrip.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: xen-3.3.0/tools/ioemu-qemu-xen/Makefile -=================================================================== ---- xen-3.3.0.orig/tools/ioemu-qemu-xen/Makefile -+++ xen-3.3.0/tools/ioemu-qemu-xen/Makefile -@@ -205,7 +205,7 @@ endif - install: all $(if $(BUILD_DOCS),install-doc) - mkdir -p "$(DESTDIR)$(bindir)" - ifneq ($(TOOLS),) -- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" -+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" - endif - mkdir -p "$(DESTDIR)$(datadir)" - set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ -Index: xen-3.3.0/tools/ioemu-qemu-xen/Makefile.target -=================================================================== ---- xen-3.3.0.orig/tools/ioemu-qemu-xen/Makefile.target -+++ xen-3.3.0/tools/ioemu-qemu-xen/Makefile.target -@@ -707,7 +707,7 @@ clean: - - install: all install-hook - ifneq ($(PROGS),) -- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" -+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" - endif - - # Include automatically generated dependency files diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.1-xen-detect-nopie-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.1-xen-detect-nopie-fix.patch deleted file mode 100644 index f1039d89..00000000 --- a/app-emulation/xen-tools/files/xen-tools-3.3.1-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/xend.initd b/app-emulation/xen-tools/files/xend.initd deleted file mode 100644 index a28c6b4e..00000000 --- a/app-emulation/xen-tools/files/xend.initd +++ /dev/null @@ -1,61 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd,v 1.1 2007/05/02 04:10:04 marineam Exp $ - -opts="start stop status restart" - -depend() { - need net - before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp -} - -await_daemons_up() { - for ((i=0; i<5; i++)); do - sleep 1 - /usr/sbin/xend status && return 0 - done - return 1 -} - -is_privileged_domain() { - grep -qsE '^control_d$' /proc/xen/capabilities - return $? -} - -start() { - if is_privileged_domain ; then - ebegin "Starting Xen control daemon" - /usr/sbin/xend start - /usr/sbin/xend status || await_daemons_up - eend $? - else - eerror "Can't start xend - this is not a privileged domain." - return 1 - fi -} - -stop() { - if [ "$(xm list | wc -l)" -gt 2 ]; then - ebegin " Stopping all domains" - /usr/sbin/xm shutdown --all --wait >/dev/null - eend $? - fi - - ebegin "Stopping Xen control daemon" - /usr/sbin/xend stop - eend $? - - # This needs more testing (bug #149321) - #ebegin "Stopping xenconsoled" - #kill $(/dev/null 2>&1 -} - -using_screen() { - [[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]] -} - -set_screen_cmd() { - screen_cmd="screen -q -r ${SCREEN_NAME:=xen} -X" -} - -start() { - set_screen_cmd - - einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}" - if using_screen ; then - ebegin "Creating screen session to hold domain consoles" - ( screen -d -m -S ${SCREEN_NAME} -t dom0 \ - && ${screen_cmd} zombie dr \ - && logrotate -f /etc/xen/xen-consoles.logrotate \ - && ${screen_cmd} logfile /var/log/xen-consoles/%t.log \ - && ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \ - && ${screen_cmd} log on \ - && ${screen_cmd} deflog on ) >/dev/null - if [[ $? -ne 0 ]] ; then - eend 1 - return 1 - else - eend - fi - fi - # Create all domains with config files in AUTODIR. - for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do - name=$(get_domname ${dom}) - if ! is_running ${name} ; then - ebegin " Starting domain ${name}" - if using_screen ; then - ${screen_cmd} screen -t ${name} xm create ${dom} -c - else - xm create --quiet ${dom} - fi - eend $? - else - einfo " Not starting domain ${name} - already running" - fi - done -} - -stop() { - set_screen_cmd - - einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}" - # Stop all domains with config files in AUTODIR. - DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)" - - if [[ "$PARALLEL_SHUTDOWN" = "yes" ]] ; then - for dom in $DOMAINS ; do - name=$(get_domname ${dom}) - if is_running ${name} ; then - ebegin " Asking domain ${name} to shutdown..." - xm shutdown ${name} >/dev/null - eend $? - fi - done - fi - for dom in $DOMAINS ; do - name=$(get_domname ${dom}) - if is_running ${name} ; then - ebegin " Waiting for domain ${name} to shutdown" - xm shutdown --wait ${name} >/dev/null - eend $? - else - einfo " Not stopping domain ${name} - not running" - fi - done - if using_screen ; then - ebegin "Closing screen session ${SCREEN_NAME}" - ${screen_cmd} quit - eend $? - fi -} - -status() { - /usr/sbin/xm list -} diff --git a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild deleted file mode 100644 index 507906b7..00000000 --- a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.3.0.ebuild,v 1.1 2008/09/01 00:41:07 rbu Exp $ - -inherit flag-o-matic eutils multilib python - -# TPMEMUFILE=tpm_emulator-0.4.tar.gz - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" -# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )" -S="${WORKDIR}/xen-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub hvm api acm flask" - -CDEPEND="dev-lang/python - sys-libs/zlib - hvm? ( media-libs/libsdl ) - acm? ( dev-libs/libxml2 ) - api? ( dev-libs/libxml2 net-misc/curl )" -# vtpm? ( dev-libs/gmp dev-libs/openssl ) - -DEPEND="${CDEPEND} - sys-devel/gcc - dev-lang/perl - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html - media-gfx/transfig - media-gfx/graphviz - ) - hvm? ( - x11-proto/xproto - sys-devel/dev86 - )" - -RDEPEND="${CDEPEND} - sys-apps/iproute2 - net-misc/bridge-utils - dev-python/pyxml - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( sys-fs/udev sys-apps/hotplug )" - -PYTHON_MODNAME="xen grub" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" -QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 - usr/share/xen/qemu/openbios-sparc64" - -pkg_setup() { - export "CONFIG_LOMOUNT=y" - - if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then - eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" - eerror "an amd64 multilib profile is required. Remove the hvm use flag" - eerror "to build xen-tools on your current profile." - die "USE=hvm is unsupported on this system." - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - if use doc && ! built_with_use -o dev-tex/latex2html png gif; then - # die early instead of later - eerror "USE=doc requires latex2html with image support. Please add" - eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html" - die "latex2html missing both png and gif flags" - fi - - if use pygrub && ! built_with_use dev-lang/python ncurses; then - eerror "USE=pygrub requires python to be built with ncurses support. Please add" - eerror "'ncurses' to your use flags and re-emerge python" - die "python is missing ncurses flags" - fi - - if ! built_with_use dev-lang/python threads; then - eerror "Python is required to be built with threading support. Please add" - eerror "'threads' to your use flags and re-emerge python" - die "python is missing threads flags" - fi - -# use vtpm && export "VTPM_TOOLS=y" - use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" - use flask && export "FLASK_ENABLE=y" -} - -src_unpack() { - unpack ${A} - cd "${S}" -# use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - chmod 644 tools/check/check_x11_devel - sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk - sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile - fi - - if ! use pygrub; then - sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile - fi - - # Allow --as-needed LDFLAGS - # epatch "${FILESDIR}/${P}--as-needed.patch" - - # Fix network broadcast on bridged networks - epatch "${FILESDIR}/${PN}-3.1.3-network-bridge-broadcast.patch" - - # Fix building small dumb utility called 'xen-detect' on hardened - epatch "${FILESDIR}/${P}-xen-detect-nopie-fix.patch" - - # Do not strip binaries - epatch "${FILESDIR}/"${P}-nostrip.patch -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - dodoc README docs/README.xen-bugtool docs/ChangeLog - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" - - dohtml -r docs/api/ - docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - rm -rf "${D}"/usr/share/doc/xen/ - - doman docs/man?/* - - newinitd "${FILESDIR}"/xend.initd xend \ - || die "Couldn't install xen.initd" - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd xendomains \ - || die "Couldn't install xendomains.initd" - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '', see bug #141866" - ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - if ! built_with_use dev-lang/python ncurses; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if built_with_use sys-apps/iproute2 minimal; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 multilib system is required to build HVM support." - echo - elog "The ioemu use flag has been removed and replaced with hvm." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi - - python_mod_optimize -} - -pkg_postrm() { - python_mod_cleanup -} diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest deleted file mode 100644 index 911e55a3..00000000 --- a/app-emulation/xen/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST xen-3.3.1.tar.gz 11329774 RMD160 31d3e801b4eec37715900c6247be403aaafdd5e1 SHA1 fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9 SHA256 88b4234eeee80560a3321c7e887cedd7696f45694e3e9557c21b150de1c54a49 -EBUILD xen-3.3.1.ebuild 2872 RMD160 20ea5b4d8adea891e5d5b3f61a24ceb35f298cc7 SHA1 b964d6b846daaf34feb58880cf7e50b1a8356679 SHA256 c2f05997dd872fcd5e5957ae0494d84851de981b250ef0c06f1a9d68a3b0093b diff --git a/app-emulation/xen/xen-3.3.1.ebuild b/app-emulation/xen/xen-3.3.1.ebuild deleted file mode 100644 index ae77cd6b..00000000 --- a/app-emulation/xen/xen-3.3.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.3.0.ebuild,v 1.1 2008/09/01 00:30:53 rbu Exp $ - -inherit mount-boot flag-o-matic toolchain-funcs - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug custom-cflags pae acm flask xsm" - -RDEPEND="|| ( sys-boot/grub - sys-boot/grub-static ) - >=sys-kernel/xen-sources-2.6.18" -PDEPEND="~app-emulation/xen-tools-${PV}" - -RESTRICT="test" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -pkg_setup() { - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - - if use xsm ; then - export "XSM_ENABLE=y" - use acm && export "ACM_SECURITY=y" - if use flask ; then - ! use acm && export "FLASK_ENABLE=y" - use acm && ewarn "Both acm and flask XSM specified, defaulting to acm." - fi - elif use acm || use flask ; then - ewarn "acm and flask require USE=xsm to be set, dropping use flags" - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - replace-flags -O3 -O2 - else - unset CFLAGS - fi - - # Send raw LDFLAGS so that --as-needed works - emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed" -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed" -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - if use pae; then - echo - ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" - fi -} -- cgit v1.2.3