diff options
author | 2006-10-07 12:24:39 +0000 | |
---|---|---|
committer | 2006-10-07 12:24:39 +0000 | |
commit | f6113eb35753f1c2bd7a52b861c10e9d64294b15 (patch) | |
tree | 41d15b6ee9ada87358d1170793e840a202fc66ae | |
parent | /etc/init.d/xend stop now stops xenstored and xenconsole in addition to xend ... (diff) | |
download | aross-f6113eb35753f1c2bd7a52b861c10e9d64294b15.tar.gz aross-f6113eb35753f1c2bd7a52b861c10e9d64294b15.tar.bz2 aross-f6113eb35753f1c2bd7a52b861c10e9d64294b15.zip |
Allow xen-tools to build when progsreiserfs is present (bug #137137) and add a pygrub local USE flag.
svn path=/; revision=23
-rw-r--r-- | app-emulation/xen-tools/Manifest | 12 | ||||
-rw-r--r-- | app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch | 56 | ||||
-rw-r--r-- | app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild | 11 |
3 files changed, 73 insertions, 6 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index f3acb6a..0a06b4f 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,3 +1,7 @@ +AUX 3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 RMD160 c77b33651e07273a613e3fc6379d80eb48315f39 SHA1 92256c3d1caeacc54f6e75c987ea302bb234a649 SHA256 1cbbd32e3130f375ca95409bd39ab817be987f029bd0ba349f1b9279eaf5b857 +MD5 c8951e871a571c6dd3d00d8b4642bd76 files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 +RMD160 c77b33651e07273a613e3fc6379d80eb48315f39 files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 +SHA256 1cbbd32e3130f375ca95409bd39ab817be987f029bd0ba349f1b9279eaf5b857 files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 AUX 3.0.2-r4/xend.initd 1140 RMD160 3850b3f5dace285643d51b4aa13e3f1230415fc1 SHA1 0764741535fbe4833ec0296ba8c055f1166b715f SHA256 dfe6b8fe04599325b21f70f2a130cccf4d8f5b9c92bfe78b4357eb05175c0b15 MD5 c8664f58b15dd3a4937c6622ea425040 files/3.0.2-r4/xend.initd 1140 RMD160 3850b3f5dace285643d51b4aa13e3f1230415fc1 files/3.0.2-r4/xend.initd 1140 @@ -55,10 +59,10 @@ EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530 -EBUILD xen-tools-3.0.2-r4.ebuild 5307 RMD160 a098195f636977cdef74182ab288e273cd53c7ec SHA1 a41a97af737fb6f80f2469946b0ae912317446b4 SHA256 f2a0e5397b7291eb6a3d0b446758ef2bce1df9839b71efafb97b6f8e73a9426a -MD5 229b789c67228f84c887b1677e13bc0e xen-tools-3.0.2-r4.ebuild 5307 -RMD160 a098195f636977cdef74182ab288e273cd53c7ec xen-tools-3.0.2-r4.ebuild 5307 -SHA256 f2a0e5397b7291eb6a3d0b446758ef2bce1df9839b71efafb97b6f8e73a9426a xen-tools-3.0.2-r4.ebuild 5307 +EBUILD xen-tools-3.0.2-r4.ebuild 5515 RMD160 76583837baf482a2b3ef6215909cb6127ad520f4 SHA1 ed1c13c1b2f5c58281660f3d0972dfc370ce7a71 SHA256 23674dfeef41e0e2e978fce166767c5a2b055cd681fa2c7e1881e02b33c24def +MD5 eddc06e8897fe318ced77b1cb6e792bd xen-tools-3.0.2-r4.ebuild 5515 +RMD160 76583837baf482a2b3ef6215909cb6127ad520f4 xen-tools-3.0.2-r4.ebuild 5515 +SHA256 23674dfeef41e0e2e978fce166767c5a2b055cd681fa2c7e1881e02b33c24def xen-tools-3.0.2-r4.ebuild 5515 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235 diff --git a/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch b/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch new file mode 100644 index 0000000..2132a63 --- /dev/null +++ b/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch @@ -0,0 +1,56 @@ +diff -urN xen-3.0.2/tools/pygrub/src/fsys/reiser/reisermodule.c xen-3.0.2-b/tools/pygrub/src/fsys/reiser/reisermodule.c +--- xen-3.0.2/tools/pygrub/src/fsys/reiser/reisermodule.c 2006-04-09 18:05:53.000000000 -0400 ++++ xen-3.0.2-b/tools/pygrub/src/fsys/reiser/reisermodule.c 2006-08-18 12:51:42.000000000 -0400 +@@ -17,7 +17,7 @@ + #include <stdlib.h> + #include <stdio.h> + +-#include <dal/file_dal.h> ++#include <dal/file.h> + #include <reiserfs/reiserfs.h> + + #if (PYTHON_API_VERSION >= 1011) +@@ -46,8 +46,7 @@ + + if (!dal) return; + +- close((int)(unsigned long)dal->dev); +- dal_free(dal); ++ dal_close(dal); + } + + /* reiser file object */ +@@ -195,7 +194,7 @@ + if (fs->fs != NULL) + { + reiserfs_fs_close(fs->fs); +- file_dal_close(fs->dal); ++ file_close(fs->dal); + fs->fs = NULL; + } + Py_INCREF(Py_None); +@@ -218,13 +217,13 @@ + return NULL; + } + +- if (!(dal = file_dal_open(name, block_size, O_RDONLY))) { ++ if (!(dal = file_open(name, block_size, O_RDONLY))) { + PyErr_SetString(PyExc_ValueError, "Couldn't create device abstraction"); + return NULL; + } + + if (!(rfs = reiserfs_fs_open_fast(dal, dal))) { +- file_dal_close(dal); ++ file_close(dal); + PyErr_SetString(PyExc_ValueError, "unable to open file"); + return NULL; + } +@@ -265,7 +264,7 @@ + if (fs->fs != NULL) + { + reiserfs_fs_close(fs->fs); +- file_dal_close(fs->dal); ++ file_close(fs->dal); + fs->fs = NULL; + } + PyObject_DEL(fs); diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild index a0ad1ce..aee6012 100644 --- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild +++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild @@ -12,12 +12,13 @@ S="${WORKDIR}/xen-${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags hardened vnc sdl" +IUSE="doc debug screen custom-cflags hardened pygrub vnc sdl" CDEPEND="dev-lang/python sys-libs/zlib sdl? ( media-libs/libsdl ) - vnc? ( media-libs/libsdl )" + vnc? ( media-libs/libsdl ) + pygrub? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )" DEPEND="${CDEPEND} sys-devel/gcc @@ -95,6 +96,12 @@ src_unpack() { if ! use x86 && ! has x86 $(get_all_abis); then sed -i -e "/SUBDIRS += vmxassist/d" "${S}"tools/firmware/Makefile fi + + if use pygrub; then + epatch "${FILESDIR}/${PVR}"/pygrub-progsreiserfs-0.3.1.patch + else + sed -i -e "/^SUBDIRS += pygrub$/d" "${S}"/tools/Makefile + fi # Fixes for hardened and amd64 epatch "${FILESDIR}"/${P}-bxclobber.patch |