[meta-virtualization] [PATCH v2 03/10] xen: remove xen-hg recipe and patches
Chris Patterson
cjp256 at gmail.com
Thu Nov 7 20:01:00 PST 2013
Signed-off-by: Chris Patterson <cjp256 at gmail.com>
---
recipes-extended/xen/xen-hg.bb | 29 -------------
.../xen/xen-hg/ioemu-cross-gl-check.patch | 29 -------------
.../xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch | 48 ----------------------
3 files changed, 106 deletions(-)
delete mode 100644 recipes-extended/xen/xen-hg.bb
delete mode 100644 recipes-extended/xen/xen-hg/ioemu-cross-gl-check.patch
delete mode 100644 recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch
diff --git a/recipes-extended/xen/xen-hg.bb b/recipes-extended/xen/xen-hg.bb
deleted file mode 100644
index bdb4d32..0000000
--- a/recipes-extended/xen/xen-hg.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-# A build of Xen Unstable from Mercurial
-
-# Build is not yet verified as functional
-# Setting BROKEN for now
-BROKEN = "1"
-
-inherit autotools
-
-require xen.inc
-
-DEPENDS += "yajl"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=e0f0f3ac55608719a82394cc353928df"
-
-SRCREV = "82db8de16530f016809264d3179823999d702849"
-
-SRC_URI = "hg://xenbits.xen.org;module=xen-unstable.hg;rev=d690c7e896a2 \
- git://xenbits.xensource.com/qemu-xen-unstable.git \
- file://ioemu-cross-gl-check.patch \
- file://tools_qemu_xen_remove_CFLAGS.patch"
-
-SRC_URI[md5sum] = "2f3e36c96fe13cebc7475652c2803e14"
-SRC_URI[sha256sum] = "b63bc8d48aaf2688cff1417f99a140943e71de0777b28ed8cbba8aa018b4117c"
-
-S = "${WORKDIR}/xen-unstable.hg"
-
-#EXTRA_OECONF="--disable-pythontools"
-require xen-python.inc
-
diff --git a/recipes-extended/xen/xen-hg/ioemu-cross-gl-check.patch b/recipes-extended/xen/xen-hg/ioemu-cross-gl-check.patch
deleted file mode 100644
index 23497e2..0000000
--- a/recipes-extended/xen/xen-hg/ioemu-cross-gl-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- git/configure.sav 2012-04-06 12:08:07.891529546 -0600
-+++ xen-unstable.hg/../git/configure 2012-04-06 12:09:39.872923477 -0600
-@@ -289,7 +289,7 @@
- kqemu="yes"
- fi
- fi
-- if test -f /usr/include/sys/soundcard.h ; then
-+ if test -f ${CROSS_SYS_ROOT}/usr/include/sys/soundcard.h ; then
- audio_drv_list="oss"
- fi
- audio_possible_drivers="oss sdl"
-@@ -872,7 +872,7 @@
- #endif
- int main( void ) { return (int) glGetString(GL_EXTENSIONS); }
- EOF
--if $cc $ARCH_CFLAGS -o $TMPE `$sdl_config --cflags --libs 2> /dev/null` -I/usr/include/GL $TMPC -lXext -lGL 2> /dev/null
-+if $cc $ARCH_CFLAGS -o $TMPE `$sdl_config --cflags --libs 2> /dev/null` -I${CROSS_SYS_ROOT}/usr/include/GL $TMPC -lXext -lGL 2> /dev/null
- then
- opengl="yes"
- else
-@@ -1450,7 +1450,7 @@
- then
- echo "#define CONFIG_OPENGL 1" >> $config_h
- echo "CONFIG_OPENGL=yes" >> $config_mak
-- echo "SDL_CFLAGS+=-I/usr/include/GL" >> $config_mak
-+ echo "SDL_CFLAGS+=-I${CROSS_SYS_ROOT}/usr/include/GL" >> $config_mak
- echo "SDL_LIBS+=-lXext" >> $config_mak
- echo "SDL_LIBS+=-lGL" >> $config_mak
- fi
diff --git a/recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch b/recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch
deleted file mode 100644
index 5fd0148..0000000
--- a/recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User Olaf Hering <olaf at xxxxxxxxx>
-# Date 1330015545 -3600
-# Node ID 5bdbdcb03d60a7b58f41306ef39cb988100efbe4
-# Parent 56214b978466914c1b9f8adb1158a3217a823e42
-tools/qemu-xen: remove CFLAGS for qemu build
-
-Currently qemu-xen gets build with CFLAGS only if CFLAGS was already in
-the environment during make invocation. If CFLAGS is in environment then
-make will append all of the various flags specified in xen Makefiles,
-which is then passed to qemu configure. If CFLAGS is not set, then
-configure will use just "-O2 -g" because make does not export its own
-CFLAGS variable.
-
-To make qemu-xen build consistent this change removes CFLAGS from the
-environment so that only the CFLAGS from qemu configure script will be
-used. This matches what is done in kvm.rpm and qemu.rpm where for
-example RPM_OPT_FLAGS is not passes as CFLAGS. Otherwise those packages
-would not build as well.
-
-Passing makes CFLAGS to configure will lead to build errors:
-- xen Makefiles append -std=gnu99, this breaks qemu build due to a bug
- in header file:
-fpu/softfloat-specialize.h:107: error: initializer element is not constant
-- in 32bit builds, qemus configure script will append -mcpu=i486 in an
- odd way, which leads to unknown gcc cmdline options due to a missing
- space
-- xen Makefiles will append -Wall which will expose all sorts of style
- issues in the qemu code
-- in one case some of the asm() blocks will not compile with gcc 4.6 in
- openSuSE 12.1
-
-Until upstream qemu has fixed all these issues use no extra CFLAGS to
-configure qemu-xen.
-
-Signed-off-by: Olaf Hering <olaf at xxxxxxxxx>
-
-diff -r 56214b978466 -r 5bdbdcb03d60 tools/Makefile
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -146,6 +146,7 @@
- source=.; \
- fi; \
- cd qemu-xen-dir; \
-+ env -u CFLAGS
- $$source/configure --enable-xen --target-list=i386-softmmu \
- --source-path=$$source \
- --extra-cflags="-I$(XEN_ROOT)/tools/include \
--
1.8.4.rc3
More information about the meta-virtualization
mailing list