* [PATCH v2 01/10] xen: remove xsm from default PACKAGECONFIG options.
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
@ 2013-11-08 4:00 ` Chris Patterson
2013-11-08 4:00 ` [PATCH v2 02/10] xen: remove 4.1.2 recipe and patches Chris Patterson
` (8 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:00 UTC (permalink / raw)
To: meta-virtualization
The 'xsm' option adds a dependency for checkpolicy, which
requires an additional layer (meta-selinux).
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
recipes-extended/xen/xen_4.3.0.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/recipes-extended/xen/xen_4.3.0.bb b/recipes-extended/xen/xen_4.3.0.bb
index 283da28..afea06c 100644
--- a/recipes-extended/xen/xen_4.3.0.bb
+++ b/recipes-extended/xen/xen_4.3.0.bb
@@ -22,7 +22,6 @@ inherit autotools gettext setuptools update-rc.d
PACKAGECONFIG ??= " \
sdl \
- xsm \
"
PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 02/10] xen: remove 4.1.2 recipe and patches
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
2013-11-08 4:00 ` [PATCH v2 01/10] xen: remove xsm from default PACKAGECONFIG options Chris Patterson
@ 2013-11-08 4:00 ` Chris Patterson
2013-11-08 4:01 ` [PATCH v2 03/10] xen: remove xen-hg " Chris Patterson
` (7 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:00 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
.../xen/xen-4.1.2/allow_disable_xend.patch | 75 ----------------------
recipes-extended/xen/xen_4.1.2.bb | 24 -------
2 files changed, 99 deletions(-)
delete mode 100644 recipes-extended/xen/xen-4.1.2/allow_disable_xend.patch
delete mode 100644 recipes-extended/xen/xen_4.1.2.bb
diff --git a/recipes-extended/xen/xen-4.1.2/allow_disable_xend.patch b/recipes-extended/xen/xen-4.1.2/allow_disable_xend.patch
deleted file mode 100644
index 3318704..0000000
--- a/recipes-extended/xen/xen-4.1.2/allow_disable_xend.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- xen-4.1.2/config/StdGNU.mk.sav 2012-03-08 12:30:26.047303578 -0700
-+++ xen-4.1.2/config/StdGNU.mk 2012-03-08 12:31:48.826696508 -0700
-@@ -56,6 +56,9 @@
- XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
- XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
-
-+# Allow xend to be disabled in lieu of only libxl
-+CONFIG_ENABLE_XEND ?= y
-+
- SOCKET_LIBS =
- CURSES_LIBS = -lncurses
- PTHREAD_LIBS = -lpthread
---- xen-4.1.2/tools/Makefile.sav 2012-03-08 11:25:10.177301492 -0700
-+++ xen-4.1.2/tools/Makefile 2012-03-08 12:33:48.807302767 -0700
-@@ -15,7 +15,7 @@
- SUBDIRS-$(CONFIG_X86) += firmware
- SUBDIRS-$(ACM_SECURITY) += security
- SUBDIRS-y += console
--SUBDIRS-y += xenmon
-+SUBDIRS-$(CONFIG_ENABLE_XEND) += xenmon
- SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
- SUBDIRS-$(VTPM_TOOLS) += vtpm
- SUBDIRS-y += xenstat
-@@ -36,17 +36,19 @@
-
- SUBDIRS-y += xenpmd
- SUBDIRS-y += libxl
--SUBDIRS-y += remus
-+SUBDIRS-$(CONFIG_ENABLE_XEND) += remus
- SUBDIRS-$(CONFIG_X86) += xenpaging
- SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
- SUBDIRS-$(CONFIG_X86) += debugger/kdd
-
- # These don't cross-compile
- ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
-+ifneq ($(XEN_ENABLE_XEND),y)
- SUBDIRS-$(PYTHON_TOOLS) += python
- SUBDIRS-$(PYTHON_TOOLS) += pygrub
- SUBDIRS-$(OCAML_TOOLS) += ocaml
- endif
-+endif
-
- # For the sake of linking, set the sys-root
- ifneq ($(CROSS_COMPILE),)
---- xen-4.1.2/tools/misc/Makefile.sav 2012-03-08 12:23:10.107321955 -0700
-+++ xen-4.1.2/tools/misc/Makefile 2012-03-08 12:34:54.466721729 -0700
-@@ -19,11 +19,13 @@
- SUBDIRS-$(CONFIG_MINITERM) += miniterm
- SUBDIRS := $(SUBDIRS-y)
-
--INSTALL_BIN-y := xencons
-+INSTALL_BIN-y :=
-+INSTALL_BIN-$(CONFIG_ENABLE_XEND) += xencons
- INSTALL_BIN-$(CONFIG_X86) += xen-detect
- INSTALL_BIN := $(INSTALL_BIN-y)
-
--INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd
-+INSTALL_SBIN-y := xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd
-+INSTALL_SBIN-$(CONFIG_ENABLE_XEND) += xm xend xsview xen-python-path xen-bugtool
- INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash
- INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool
- INSTALL_SBIN := $(INSTALL_SBIN-y)
---- xen-4.1.2/tools/hotplug/NetBSD/Makefile.sav 2012-03-08 12:54:56.247306596 -0700
-+++ xen-4.1.2/tools/hotplug/NetBSD/Makefile 2012-03-08 12:57:50.337339410 -0700
-@@ -8,7 +8,9 @@
- XEN_SCRIPTS += vif-ip
-
- XEN_SCRIPT_DATA =
--XEN_RCD_PROG = rc.d/xencommons rc.d/xend rc.d/xendomains rc.d/xen-watchdog
-+XEN_RCD_PROG-y := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog
-+XEN_RCD_PROG-$(CONFIG_ENABLE_XEND) += rc.d/xend
-+XEN_RCD_PROG := $(XEN_RCD_PROG-y)
-
- .PHONY: all
- all:
diff --git a/recipes-extended/xen/xen_4.1.2.bb b/recipes-extended/xen/xen_4.1.2.bb
deleted file mode 100644
index 5a87bc4..0000000
--- a/recipes-extended/xen/xen_4.1.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Xen official download
-
-require xen.inc
-
-PR="r1"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=f46a39d9fa181e4933b1acdfdcd72017"
-
-SRCREV = "3cf61880403b4e484539596a95937cc066243388"
-
-SRC_URI = "http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
- git://xenbits.xensource.com/qemu-xen-4.1-testing.git \
- file://ioemu-cross-gl-check.patch \
- file://allow_disable_xend.patch \
- file://xend-config.sxp \
- file://xenminiinit.sh"
-
-SRC_URI[md5sum] = "73561faf3c1b5e36ec5c089b5db848ad"
-SRC_URI[sha256sum] = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d"
-
-S = "${WORKDIR}/xen-${PV}"
-
-# Include python and xend support
-require xen-python.inc
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 03/10] xen: remove xen-hg recipe and patches
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
2013-11-08 4:00 ` [PATCH v2 01/10] xen: remove xsm from default PACKAGECONFIG options Chris Patterson
2013-11-08 4:00 ` [PATCH v2 02/10] xen: remove 4.1.2 recipe and patches Chris Patterson
@ 2013-11-08 4:01 ` Chris Patterson
2013-11-08 4:01 ` [PATCH v2 05/10] xen: remove old xen.inc and xen-python.inc Chris Patterson
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:01 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Chris Patterson <cjp256@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@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@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
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 05/10] xen: remove old xen.inc and xen-python.inc
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (2 preceding siblings ...)
2013-11-08 4:01 ` [PATCH v2 03/10] xen: remove xen-hg " Chris Patterson
@ 2013-11-08 4:01 ` Chris Patterson
2013-11-08 4:01 ` [PATCH v2 06/10] xen: remove old patches Chris Patterson
` (5 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:01 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
recipes-extended/xen/xen-python.inc | 49 ------
recipes-extended/xen/xen.inc | 314 ------------------------------------
2 files changed, 363 deletions(-)
delete mode 100644 recipes-extended/xen/xen-python.inc
delete mode 100644 recipes-extended/xen/xen.inc
diff --git a/recipes-extended/xen/xen-python.inc b/recipes-extended/xen/xen-python.inc
deleted file mode 100644
index a54db07..0000000
--- a/recipes-extended/xen/xen-python.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-XEN_DISABLE_XEND=""
-
-DEPENDS += "python python-native udev"
-RDEPENDS_${PN}-python = "xen python python-lang python-re python-fcntl python-shell python-io python-threading python-stringold python-math python-crypt python-logging python-pickle python-xmlrpc python-netclient python-mime python-unixadmin python-compression python-mmap python-textutils python-resource python-terminal python-pprint python-curses"
-
-INITSCRIPT_PACKAGES += "${PN}-python"
-INITSCRIPT_NAME_${PN}-python = "xend"
-INITSCRIPT_PARAMS_${PN}-python = "defaults 64"
-
-inherit python-dir
-
-PACKAGES =+ "${PN}-python-dbg ${PN}-python"
-FILES_${PN}-python = "\
- ${sysconfdir}/init.d/xend \
- ${sysconfdir}/xen/xend-config.sxp \
- ${sysconfdir}/xen/xend-pci-permissive.sxp \
- ${sysconfdir}/xen/xend-pci-quirks.sxp \
- ${sysconfdir}/xen/xm-config.xml \
- ${bindir}/xentrace_format \
- ${bindir}/xencons \
- ${bindir}/pygrub \
- ${bindir}/remus \
- ${sbindir}/xen-bugtool \
- ${sbindir}/xend \
- ${sbindir}/xenmon.py \
- ${sbindir}/xm \
- ${sbindir}/xen-python-path \
- ${libdir}/${PYTHON_DIR} \
- /var/run/xend"
-
-FILES_${PN}-python-dbg = "\
- ${libdir}/${PYTHON_DIR}/site-packages/.debug \
- ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug"
-
-#EXTRA_OECONF="ac_cv_lib_python_PyArg_ParseTuple=yes"
-autotools_do_configure() {
- export PYTHON=${STAGING_DIR_NATIVE}/usr/bin/python
- export PREPEND_LIB="${STAGING_LIBDIR_NATIVE} ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}"
- export PREPEND_INCLUDES="${STAGING_INCDIR_NATIVE} ${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}"
-
- export STAGING_INCDIR=${STAGING_INCDIR}
- export STAGING_LIBDIR=${STAGING_LIBDIR}
- export STAGING_DIR=${STAGING_DIR}
- export BUILD_SYS=${BUILD_SYS}
- export HOST_SYS=${HOST_SYS}
-
- oe_runconf
-}
-
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
deleted file mode 100644
index 6207897..0000000
--- a/recipes-extended/xen/xen.inc
+++ /dev/null
@@ -1,314 +0,0 @@
-DESCRIPTION = "Xen is a virtual-machine monitor providing services that allow multiple computer operating systems to execute on the same computer hardware concurrently."
-HOMEPAGE = "http://xen.org"
-LICENSE = "GPLv2"
-SECTION = "console/tools"
-PR = "r0"
-
-# Disable xend and python support
-XEN_DISABLE_XEND = "1"
-
-DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps"
-
-# RDEPENDS_xen = "libgcc pciutils bridge-utils iproute2 util-linux udev procps bash"
-RDEPENDS_xen-minimal = "libgcc xen-keymaps-base xen-xenstore xen-xenconsole xen-xenlight xen-hvmloader xen-qemu-dm"
-RDEPENDS_xen = "libgcc xen-keymaps-base xen-xenstore xen-xenconsole xen-xenlight xen-hvmloader xen-qemu-dm xen-keymaps"
-RDEPENDS_xen-networking = "bridge-utils"
-RDEPENDS_xen-domains = "bash procps coreutils"
-RDEPENDS_xen-commons = "bash procps coreutils"
-RDEPENDS_xen-watchdog = "bash procps coreutils"
-
-COMPATIBLE_HOST = '(x86_64.*|i.86.*).*-linux'
-
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGES = "\
- ${PN}-boot ${PN}-watchdog ${PN}-examples ${PN}-debugging ${PN}-tools ${PN}-pm ${PN}-domains ${PN}-commons \
- ${PN}-bios-ppc ${PN}-bios-sparc ${PN}-networking \
- ${PN}-doc ${PN}-dbg ${PN}-staticdev ${PN}-minimal ${PN}-keymaps-base ${PN}-keymaps \
- ${PN}-xenstore ${PN}-xenconsole ${PN}-xenlight ${PN}-hvmloader ${PN}-qemu-dm \
- libxenlight libfsimage libflask libxenguest libblktap libblktapctl libvhd libxlutil libxenstore libxenctrl \
- libxenlight-dev libfsimage-dev libflask-dev libxenguest-dev libblktap-dev libblktapctl-dev libvhd-dev libxlutil-dev libxenstore-dev libxenctrl-dev \
- ${PN}-dev ${PN} \
- "
-
-FILES_${PN} += "\
- ${libdir}/xen \
- ${libdir}/fs \
- /usr/lib64 \
- "
-
-FILES_${PN}-minimal = "\
- ${sysconfdir}/init.d/xenminiinit \
- "
-
-FILES_${PN}-qemu-dm = "\
- ${libdir}/xen/bin/qemu-dm \
- /var/lib/xen \
- "
-
-FILES_${PN}-keymaps-base = "\
- /usr/share/xen/qemu/keymaps/common \
- /usr/share/xen/qemu/keymaps/modifiers \
- /usr/share/xen/qemu/keymaps/en-us \
- "
-
-FILES_${PN}-keymaps = "\
- /usr/share/xen/qemu/keymaps \
- "
-
-FILES_${PN}-xenlight = "\
- ${sbindir}/xl \
- ${sysconfdir}/xen/xl.conf \
- ${sysconfdir}/bash_completion.d/xl.sh \
- "
-
-FILES_${PN}-xenconsole = "\
- ${sbindir}/xenconsoled \
- ${libdir}/xen/bin/xc_restore \
- ${libdir}/xen/bin/xc_save \
- ${libdir}/xen/bin/xenconsole \
- "
-
-FILES_${PN}-xenstore = "\
- ${bindir}/xenstore \
- ${bindir}/xenstore-* \
- ${sbindir}/xenstored \
- /var/run/xenstored \
- "
-
-FILES_${PN}-hvmloader = "\
- ${libdir}/xen/boot/hvmloader \
- "
-
-FILES_libxenlight = "${libdir}/libxenlight.so.*"
-FILES_libxenlight-dev = "${libdir}/libxenlight.so {libdir}/libxenlight.a"
-FILES_libfsimage = "${libdir}/libfsimage.so.*"
-FILES_libfsimage-dev = "${libdir}/libfsimage.so {libdir}/libfsimage.a"
-FILES_libflask = "${libdir}/libflask.so.*"
-FILES_libflask-dev = "${libdir}/libflask.so ${libdir}/libflask.a"
-FILES_libxenguest = "${libdir}/libxenguest.so.*"
-FILES_libxenguest-dev = "${libdir}/libxenguest.so ${libdir}/libxenguest.a"
-FILES_libblktap = "${libdir}/libblktap.so.*"
-FILES_libblktap-dev = "${libdir}/libblktap.so ${libdir}/libblktap.a"
-FILES_libblktapctl = "${libdir}/libblktapctl.so.*"
-FILES_libblktapctl-dev = "${libdir}/libblktapctl.so ${libdir}/libblktapctl.a"
-FILES_libxlutil = "${libdir}/libxlutil.so.*"
-FILES_libxlutil-dev = "${libdir}/libxlutil.so ${libdir}/libxlutil.a"
-FILES_libvhd = "${libdir}/libvhd.so.*"
-FILES_libvhd-dev = "${libdir}/libvhd.so ${libdir}/libvhd.a"
-FILES_libxenstore = "${libdir}/libxenstore.so.*"
-FILES_libxenstore-dev = "${libdir}/libxenstore.so ${libdir}/libxenstore.a"
-FILES_libxenctrl = "${libdir}/libxenctrl.so.*"
-FILES_libxenctrl-dev = "${libdir}/libxenctrl.so ${libdir}/libxenctrl.a"
-
-FILES_${PN}-doc += "\
- /usr/share/xen/man \
- ${sysconfdir}/xen/README* \
- "
-
-FILES_${PN}-dbg += "\
- ${libdir}/xen/bin/.debug \
- ${libdir}/fs/ufs/.debug \
- ${libdir}/fs/zfs/.debug \
- ${libdir}/fs/ext2fs-lib/.debug \
- ${libdir}/fs/fat/.debug \
- ${libdir}/fs/iso9660/.debug \
- ${libdir}/fs/reiserfs/.debug \
- "
-
-FILES_${PN}-boot = "/boot"
-
-FILES_${PN}-domains = "\
- ${sysconfdir}/default/xendomains \
- ${sysconfdir}/init.d/xendomains \
- "
-
-FILES_${PN}-commons = "\
- ${sysconfdir}/default/xencommons \
- ${sysconfdir}/init.d/xencommons \
- "
-
-FILES_${PN}-bios-sparc = "\
- /usr/share/xen/qemu/openbios-sparc32 \
- /usr/share/xen/qemu/openbios-sparc64 \
- "
-
-FILES_${PN}-bios-ppc = "\
- /usr/share/xen/qemu/openbios-ppc \
- /usr/share/xen/qemu/ppc_rom.bin \
- "
-
-FILES_${PN}-networking = "\
- ${sysconfdir}/xen/scripts/network-nat \
- ${sysconfdir}/xen/scripts/network-route \
- ${sysconfdir}/xen/scripts/qemu-ifup \
- ${sysconfdir}/xen/scripts/vif2 \
- ${sysconfdir}/xen/scripts/vif-bridge \
- ${sysconfdir}/xen/scripts/vif-route \
- ${sysconfdir}/xen/scripts/vif-setup \
- ${sysconfdir}/xen/scripts/vif-common \
- ${sysconfdir}/xen/scripts/vif-nat \
- ${sysconfdir}/xen/scripts/xen-network-common \
- /usr/share/xen/qemu/pxe-e1000.bin \
- /usr/share/xen/qemu/pxe-ne2k_pci.bin \
- /usr/share/xen/qemu/pxe-pcnet.bin \
- /usr/share/xen/qemu/pxe-rtl8139.bin \
- "
-
-FILES_${PN}-pm = "\
- ${sbindir}/xenpmd \
- ${sbindir}/xenpm \
- "
-
-FILES_${PN}-watchdog = "\
- ${sysconfdir}/init.d/xen-watchdog \
- ${sbindir}/xenwatchdogd \
- "
-
-FILES_${PN}-examples = "\
- ${sysconfdir}/xen/xmexample* \
- "
-
-FILES_${PN}-debugging = "\
- ${sbindir}/gdbsx \
- ${sbindir}/kdd \
- ${sbindir}/xen-hvmcrash \
- ${sbindir}/gtraceview \
- ${sbindir}/gtracestat \
- "
-
-FILES_${PN}-tools = "\
- ${bindir}/xen-detect \
- ${bindir}/xentrace \
- ${bindir}/xentrace_* \
- ${bindir}/qemu-img-xen \
- ${sbindir}/tap-ctl \
- ${sbindir}/xentrace_* \
- ${sbindir}/tapdisk \
- ${sbindir}/tapdisk2 \
- ${sbindir}/tapdisk-* \
- ${sbindir}/flask-genenforce \
- ${sbindir}/qcow-create \
- ${sbindir}/qcow2raw \
- ${sbindir}/xen-hptool \
- ${sbindir}/blktapctrl \
- ${sbindir}/xsview \
- ${sbindir}/xen-hvmctx \
- ${sbindir}/lock-util \
- ${sbindir}/tapdisk-stream \
- ${sbindir}/vhd-update \
- ${sbindir}/xenpaging \
- ${sbindir}/xenperf \
- ${sbindir}/xenlockprof \
- ${sbindir}/td-util \
- ${sbindir}/flask-loadpolicy \
- ${sbindir}/xentop \
- ${sbindir}/img2qcow \
- ${sbindir}/flask-setenforce \
- ${sbindir}/xen-tmem-list-parse \
- ${sbindir}/vhd-util \
- ${sbindir}/xenbaked \
- "
-
-# Don't run architecture tests on xen packages
-QAPATHTEST[arch]=""
-
-inherit update-rc.d
-
-INITSCRIPT_PACKAGES = "${PN}-commons ${PN}-watchdog ${PN}-domains"
-INITSCRIPT_NAME_${PN}-commons = "xencommons"
-INITSCRIPT_PARAMS_${PN}-commons = "defaults 62"
-INITSCRIPT_NAME_${PN}-watchdog = "xen-watchdog"
-INITSCRIPT_PARAMS_${PN}-watchdog = "defaults 66"
-INITSCRIPT_NAME_${PN}-domains = "xendomains"
-INITSCRIPT_PARAMS_${PN}-domains = "defaults 68"
-NITSCRIPT_NAME_${PN}-minimal = "xenminiinit"
-INITSCRIPT_PARAMS_${PN}-minimal = "defaults 69"
-
-do_compile() {
-
- # Hack to get around missing/failed multilib support
- export LIBLEAFDIR_x86_64=lib
- test -d ${S}/tools/firmware/rombios/gnu || mkdir ${S}/tools/firmware/rombios/gnu
- test -e ${S}/tools/firmware/rombios/32bit/gnu || ln -s ../gnu ${S}/tools/firmware/rombios/32bit/gnu
- test -e ${S}/tools/firmware/hvmloader/gnu || ln -s ../rombios/gnu ${S}/tools/firmware/hvmloader/gnu
- test -e ${S}/tools/firmware/hvmloader/acpi/gnu || ln -s ../../rombios/gnu ${S}/tools/firmware/hvmloader/acpi/gnu
- test -d ${S}/tools/include || mkdir -p ${S}/tools/include
- test -e ${S}/tools/include/gnu || ln -s ../firmware/rombios/gnu ${S}/tools/include/gnu
-
- if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
- cat ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h | grep -v stub_bdflush | grep -v stub_getmsg | grep -v stub_putmsg > ${S}/tools/firmware/rombios/gnu/stubs-32.h
- echo \#define __stub___kernel_cosl >> ${S}/tools/firmware/rombios/gnu/stubs-32.h
- echo \#define __stub___kernel_sinl >> ${S}/tools/firmware/rombios/gnu/stubs-32.h
- echo \#define __stub___kernel_tanl >> ${S}/tools/firmware/rombios/gnu/stubs-32.h
- fi
- # End multilib hack
-
- export CONFIG_QEMU=${WORKDIR}/git
-
- export XEN_TARGET_ARCH=`echo ${TARGET_ARCH} | sed -e s/i.86/x86_32/ \
- -e s/i86pc/x86_32/ -e s/amd64/x86_64/`
- export XEN_OS=Linux
- export XEN_DISABLE_XEND=${XEN_DISABLE_XEND}
-
- export EXTRA_PREFIX=${STAGING_DIR_TARGET}
- export CROSS_COMPILE=${TARGET_PREFIX}
- export CROSS_BIN_PATH=${STAGING_DIR_NATIVE}/usr/bin
- export CROSS_SYS_ROOT=${STAGING_DIR_TARGET}
-
- # These are needed by sysconfig.py
- export BUILD_SYS=${BUILD_SYS}
- export HOST_SYS=${HOST_SYS}
- export STAGING_INCDIR=${STAGING_INCDIR}
- export STAGING_LIBDIR=${STAGING_LIBDIR}
-
- export PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python"
- export PREPEND_LIB="${STAGING_LIBDIR_NATIVE} ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}"
- export PREPEND_INCLUDES="${STAGING_INCDIR} ${STAGING_INCDIR}/${PYTHON_DIR}"
- export CFLAGS=
- export LDFLAGS=
-
- # These two checks are for binaries that are not installed yet
- rm -f ${S}/tools/check/check_python_devel
- rm -f ${S}/tools/check/check_xgettext
-
- # These checks are for libraries utilizing ldconfig
- rm -f ${S}/tools/check/check_zlib_lib
- rm -f ${S}/tools/check/check_crypto_lib
- rm -f ${S}/tools/check/check_zlib_devel
-
- # remove -Werror for gcc-4.6's sake
- find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
- xargs sed -i 's/ *-Werror */ /'
-
- #stubdom image builds are being a pain
- oe_runmake dist-xen dist-tools dist-kernels dist-docs
-}
-
-do_install() {
-
- for foo in `find ${S}/dist/install -type f` ; do
- if file $foo | grep text 2>&1 ; then
- echo Fixing paths in $foo
- sed -e "s%${STAGING_DIR_NATIVE}%%g" -i $foo
- sed -e "s%${STAGING_DIR_TARGET}%%g" -i $foo
- fi
- done
-
- cp -av ${S}/dist/install/* ${D}/
- install -d ${D}/etc/xen
- install -d ${D}/etc/init.d
-
- install -m 0755 ${WORKDIR}/xenminiinit.sh ${D}/etc/init.d/xenminiinit
- install -m 0644 ${WORKDIR}/xend-config.sxp ${D}/etc/xen/xend-config.sxp
- test -e ${D}/usr/lib64 || ln -s lib ${D}/usr/lib64
-
-}
-
-sysroot_stage_all_append() {
- sysroot_stage_dir ${D}/boot ${SYSROOT_DESTDIR}/kernel
-
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 ${D}/boot/xen.gz ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz
-}
-
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 06/10] xen: remove old patches
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (3 preceding siblings ...)
2013-11-08 4:01 ` [PATCH v2 05/10] xen: remove old xen.inc and xen-python.inc Chris Patterson
@ 2013-11-08 4:01 ` Chris Patterson
2013-11-08 4:01 ` [PATCH v2 07/10] xen: rename xen patches directory from xen-4.3.0 to files Chris Patterson
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:01 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
.../xen/files/allow_disable_xend.patch | 75 -----
.../xen/files/ioemu-cross-gl-check.patch | 29 --
recipes-extended/xen/files/xend-config.sxp | 304 ---------------------
recipes-extended/xen/files/xenminiinit.sh | 59 ----
4 files changed, 467 deletions(-)
delete mode 100644 recipes-extended/xen/files/allow_disable_xend.patch
delete mode 100644 recipes-extended/xen/files/ioemu-cross-gl-check.patch
delete mode 100644 recipes-extended/xen/files/xend-config.sxp
delete mode 100755 recipes-extended/xen/files/xenminiinit.sh
diff --git a/recipes-extended/xen/files/allow_disable_xend.patch b/recipes-extended/xen/files/allow_disable_xend.patch
deleted file mode 100644
index 3318704..0000000
--- a/recipes-extended/xen/files/allow_disable_xend.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- xen-4.1.2/config/StdGNU.mk.sav 2012-03-08 12:30:26.047303578 -0700
-+++ xen-4.1.2/config/StdGNU.mk 2012-03-08 12:31:48.826696508 -0700
-@@ -56,6 +56,9 @@
- XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
- XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
-
-+# Allow xend to be disabled in lieu of only libxl
-+CONFIG_ENABLE_XEND ?= y
-+
- SOCKET_LIBS =
- CURSES_LIBS = -lncurses
- PTHREAD_LIBS = -lpthread
---- xen-4.1.2/tools/Makefile.sav 2012-03-08 11:25:10.177301492 -0700
-+++ xen-4.1.2/tools/Makefile 2012-03-08 12:33:48.807302767 -0700
-@@ -15,7 +15,7 @@
- SUBDIRS-$(CONFIG_X86) += firmware
- SUBDIRS-$(ACM_SECURITY) += security
- SUBDIRS-y += console
--SUBDIRS-y += xenmon
-+SUBDIRS-$(CONFIG_ENABLE_XEND) += xenmon
- SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
- SUBDIRS-$(VTPM_TOOLS) += vtpm
- SUBDIRS-y += xenstat
-@@ -36,17 +36,19 @@
-
- SUBDIRS-y += xenpmd
- SUBDIRS-y += libxl
--SUBDIRS-y += remus
-+SUBDIRS-$(CONFIG_ENABLE_XEND) += remus
- SUBDIRS-$(CONFIG_X86) += xenpaging
- SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
- SUBDIRS-$(CONFIG_X86) += debugger/kdd
-
- # These don't cross-compile
- ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
-+ifneq ($(XEN_ENABLE_XEND),y)
- SUBDIRS-$(PYTHON_TOOLS) += python
- SUBDIRS-$(PYTHON_TOOLS) += pygrub
- SUBDIRS-$(OCAML_TOOLS) += ocaml
- endif
-+endif
-
- # For the sake of linking, set the sys-root
- ifneq ($(CROSS_COMPILE),)
---- xen-4.1.2/tools/misc/Makefile.sav 2012-03-08 12:23:10.107321955 -0700
-+++ xen-4.1.2/tools/misc/Makefile 2012-03-08 12:34:54.466721729 -0700
-@@ -19,11 +19,13 @@
- SUBDIRS-$(CONFIG_MINITERM) += miniterm
- SUBDIRS := $(SUBDIRS-y)
-
--INSTALL_BIN-y := xencons
-+INSTALL_BIN-y :=
-+INSTALL_BIN-$(CONFIG_ENABLE_XEND) += xencons
- INSTALL_BIN-$(CONFIG_X86) += xen-detect
- INSTALL_BIN := $(INSTALL_BIN-y)
-
--INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd
-+INSTALL_SBIN-y := xenperf xsview xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd
-+INSTALL_SBIN-$(CONFIG_ENABLE_XEND) += xm xend xsview xen-python-path xen-bugtool
- INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash
- INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool
- INSTALL_SBIN := $(INSTALL_SBIN-y)
---- xen-4.1.2/tools/hotplug/NetBSD/Makefile.sav 2012-03-08 12:54:56.247306596 -0700
-+++ xen-4.1.2/tools/hotplug/NetBSD/Makefile 2012-03-08 12:57:50.337339410 -0700
-@@ -8,7 +8,9 @@
- XEN_SCRIPTS += vif-ip
-
- XEN_SCRIPT_DATA =
--XEN_RCD_PROG = rc.d/xencommons rc.d/xend rc.d/xendomains rc.d/xen-watchdog
-+XEN_RCD_PROG-y := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog
-+XEN_RCD_PROG-$(CONFIG_ENABLE_XEND) += rc.d/xend
-+XEN_RCD_PROG := $(XEN_RCD_PROG-y)
-
- .PHONY: all
- all:
diff --git a/recipes-extended/xen/files/ioemu-cross-gl-check.patch b/recipes-extended/xen/files/ioemu-cross-gl-check.patch
deleted file mode 100644
index a1363ea..0000000
--- a/recipes-extended/xen/files/ioemu-cross-gl-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- qemu-xen-4.1-testing/configure 2012-02-20 09:01:08.219798969 -0700
-+++ xen-4.1-testing.hg/../git/configure 2012-02-20 09:03:27.876749305 -0700
-@@ -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/files/xend-config.sxp b/recipes-extended/xen/files/xend-config.sxp
deleted file mode 100644
index 096bb55..0000000
--- a/recipes-extended/xen/files/xend-config.sxp
+++ /dev/null
@@ -1,304 +0,0 @@
-# -*- sh -*-
-
-#
-# Xend configuration file.
-#
-
-# This example configuration is appropriate for an installation that
-# utilizes a bridged network configuration. Access to xend via http
-# is disabled.
-
-# Commented out entries show the default for that entry, unless otherwise
-# specified.
-
-#(logfile /var/log/xen/xend.log)
-#(loglevel DEBUG)
-
-# Uncomment the line below. Set the value to flask, acm, or dummy to
-# select a security module.
-
-#(xsm_module_name dummy)
-
-# The Xen-API server configuration.
-#
-# This value configures the ports, interfaces, and access controls for the
-# Xen-API server. Each entry in the list starts with either unix, a port
-# number, or an address:port pair. If this is "unix", then a UDP socket is
-# opened, and this entry applies to that. If it is a port, then Xend will
-# listen on all interfaces on that TCP port, and if it is an address:port
-# pair, then Xend will listen on the specified port, using the interface with
-# the specified address.
-#
-# The subsequent string configures the user-based access control for the
-# listener in question. This can be one of "none" or "pam", indicating either
-# that users should be allowed access unconditionally, or that the local
-# Pluggable Authentication Modules configuration should be used. If this
-# string is missing or empty, then "pam" is used.
-#
-# The final string gives the host-based access control for that listener. If
-# this is missing or empty, then all connections are accepted. Otherwise,
-# this should be a space-separated sequence of regular expressions; any host
-# with a fully-qualified domain name or an IP address that matches one of
-# these regular expressions will be accepted.
-#
-# Example: listen on TCP port 9363 on all interfaces, accepting connections
-# only from machines in example.com or localhost, and allow access through
-# the unix domain socket unconditionally:
-#
-# (xen-api-server ((9363 pam '^localhost$ example\\.com$')
-# (unix none)))
-#
-# Optionally, the TCP Xen-API server can use SSL by specifying the private
-# key and certificate location:
-#
-# (9367 pam '' xen-api.key xen-api.crt)
-#
-# Default:
-# (xen-api-server ((unix)))
-
-
-(xend-http-server yes)
-(xend-unix-server yes)
-(xend-tcp-xmlrpc-server yes)
-(xend-unix-xmlrpc-server yes)
-#(xend-relocation-server no)
-(xend-relocation-server yes)
-#(xend-relocation-ssl-server no)
-(xend-udev-event-server yes)
-
-#(xend-unix-path /var/lib/xend/xend-socket)
-
-
-# Address and port xend should use for the legacy TCP XMLRPC interface,
-# if xend-tcp-xmlrpc-server is set.
-#(xend-tcp-xmlrpc-server-address 'localhost')
-#(xend-tcp-xmlrpc-server-port 8006)
-
-# SSL key and certificate to use for the legacy TCP XMLRPC interface.
-# Setting these will mean that this port serves only SSL connections as
-# opposed to plaintext ones.
-#(xend-tcp-xmlrpc-server-ssl-key-file xmlrpc.key)
-#(xend-tcp-xmlrpc-server-ssl-cert-file xmlrpc.crt)
-
-
-# Port xend should use for the HTTP interface, if xend-http-server is set.
-#(xend-port 8000)
-
-# Port xend should use for the relocation interface, if xend-relocation-server
-# is set.
-#(xend-relocation-port 8002)
-
-# Port xend should use for the ssl relocation interface, if
-# xend-relocation-ssl-server is set.
-#(xend-relocation-ssl-port 8003)
-
-# SSL key and certificate to use for the ssl relocation interface, if
-# xend-relocation-ssl-server is set.
-#(xend-relocation-server-ssl-key-file xmlrpc.key)
-#(xend-relocation-server-ssl-cert-file xmlrpc.crt)
-
-# Whether to use ssl as default when relocating.
-#(xend-relocation-ssl no)
-
-# Address xend should listen on for HTTP connections, if xend-http-server is
-# set.
-# Specifying 'localhost' prevents remote connections.
-# Specifying the empty string '' (the default) allows all connections.
-#(xend-address '')
-#(xend-address localhost)
-
-# Address xend should listen on for relocation-socket connections, if
-# xend-relocation-server is set.
-# Meaning and default as for xend-address above.
-# Also, interface name is allowed (e.g. eth0) there to get the
-# relocation address to be bound on.
-#(xend-relocation-address '')
-
-# The hosts allowed to talk to the relocation port. If this is empty (the
-# default), then all connections are allowed (assuming that the connection
-# arrives on a port and interface on which we are listening; see
-# xend-relocation-port and xend-relocation-address above). Otherwise, this
-# should be a space-separated sequence of regular expressions. Any host with
-# a fully-qualified domain name or an IP address that matches one of these
-# regular expressions will be accepted.
-#
-# For example:
-# (xend-relocation-hosts-allow '^localhost$ ^.*\\.example\\.org$')
-#
-#(xend-relocation-hosts-allow '')
-(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
-
-# The limit (in kilobytes) on the size of the console buffer
-#(console-limit 1024)
-
-##
-# To bridge network traffic, like this:
-#
-# dom0: ----------------- bridge -> real eth0 -> the network
-# |
-# domU: fake eth0 -> vifN.0 -+
-#
-# use
-#
-# (network-script network-bridge)
-#
-# Your default ethernet device is used as the outgoing interface, by default.
-# To use a different one (e.g. eth1) use
-#
-# (network-script 'network-bridge netdev=eth1')
-#
-# The bridge is named eth0, by default (yes, really!)
-#
-
-# It is normally much better to create the bridge yourself in
-# /etc/network/interfaces. network-bridge start does nothing if you
-# already have a bridge, and network-bridge stop does nothing if the
-# default bridge name (normally eth0) is not a bridge. See
-# bridge-utils-interfaces(5) for full information on the syntax in
-# /etc/network/interfaces, but you probably want something like this:
-# iface xenbr0 inet static
-# address [etc]
-# netmask [etc]
-# [etc]
-# bridge_ports eth0
-#
-# To have network-bridge create a differently-named bridge, use:
-# (network-script 'network-bridge bridge=<name>')
-#
-# It is possible to use the network-bridge script in more complicated
-# scenarios, such as having two outgoing interfaces, with two bridges, and
-# two fake interfaces per guest domain. To do things like this, write
-# yourself a wrapper script, and call network-bridge from it, as appropriate.
-#
-(network-script network-bridge)
-
-# The script used to control virtual interfaces. This can be overridden on a
-# per-vif basis when creating a domain or a configuring a new vif. The
-# vif-bridge script is designed for use with the network-bridge script, or
-# similar configurations.
-#
-# If you have overridden the bridge name using
-# (network-script 'network-bridge bridge=<name>') then you may wish to do the
-# same here. The bridge name can also be set when creating a domain or
-# configuring a new vif, but a value specified here would act as a default.
-#
-# If you are using only one bridge, the vif-bridge script will discover that,
-# so there is no need to specify it explicitly. The default is to use
-# the bridge which is listed first in the output from brctl.
-#
-(vif-script vif-bridge)
-
-
-## Use the following if network traffic is routed, as an alternative to the
-# settings for bridged networking given above.
-#(network-script network-route)
-#(vif-script vif-route)
-
-
-## Use the following if network traffic is routed with NAT, as an alternative
-# to the settings for bridged networking given above.
-#(network-script network-nat)
-#(vif-script vif-nat)
-
-# dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
-# This is a minimum both for auto-ballooning (as enabled by
-# enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
-(dom0-min-mem 196)
-
-# Whether to enable auto-ballooning of dom0 to allow domUs to be created.
-# If enable-dom0-ballooning = no, dom0 will never balloon out.
-(enable-dom0-ballooning yes)
-
-# 32-bit paravirtual domains can only consume physical
-# memory below 168GB. On systems with memory beyond that address,
-# they'll be confined to memory below 128GB.
-# Using total_available_memory (in GB) to specify the amount of memory reserved
-# in the memory pool exclusively for 32-bit paravirtual domains.
-# Additionally you should use dom0_mem = <-Value> as a parameter in
-# xen kernel to reserve the memory for 32-bit paravirtual domains, default
-# is "0" (0GB).
-(total_available_memory 0)
-
-# In SMP system, dom0 will use dom0-cpus # of CPUS
-# If dom0-cpus = 0, dom0 will take all cpus available
-(dom0-cpus 0)
-
-# Whether to enable core-dumps when domains crash.
-#(enable-dump no)
-
-# The tool used for initiating virtual TPM migration
-#(external-migration-tool '')
-
-# The interface for VNC servers to listen on. Defaults
-# to 127.0.0.1 To restore old 'listen everywhere' behaviour
-# set this to 0.0.0.0
-#(vnc-listen '127.0.0.1')
-
-# The default password for VNC console on HVM domain.
-# Empty string is no authentication.
-(vncpasswd '')
-
-# The VNC server can be told to negotiate a TLS session
-# to encryption all traffic, and provide x509 cert to
-# clients enabling them to verify server identity. The
-# GTK-VNC widget, virt-viewer, virt-manager and VeNCrypt
-# all support the VNC extension for TLS used in QEMU. The
-# TightVNC/RealVNC/UltraVNC clients do not.
-#
-# To enable this create x509 certificates / keys in the
-# directory ${XEN_CONFIG_DIR} + vnc
-#
-# ca-cert.pem - The CA certificate
-# server-cert.pem - The Server certificate signed by the CA
-# server-key.pem - The server private key
-#
-# and then uncomment this next line
-# (vnc-tls 1)
-
-# The certificate dir can be pointed elsewhere..
-#
-# (vnc-x509-cert-dir vnc)
-
-# The server can be told to request & validate an x509
-# certificate from the client. Only clients with a cert
-# signed by the trusted CA will be able to connect. This
-# is more secure the password auth alone. Passwd auth can
-# used at the same time if desired. To enable client cert
-# checking uncomment this:
-#
-# (vnc-x509-verify 1)
-
-# The default keymap to use for the VM's virtual keyboard
-# when not specififed in VM's configuration
-#(keymap 'en-us')
-
-# Script to run when the label of a resource has changed.
-#(resource-label-change-script '')
-
-# Rotation count of qemu-dm log file.
-#(qemu-dm-logrotate-count 10)
-
-# Path where persistent domain configuration is stored.
-# Default is /var/lib/xend/domains/
-#(xend-domains-path /var/lib/xend/domains)
-
-# Number of seconds xend will wait for device creation and
-# destruction
-#(device-create-timeout 100)
-#(device-destroy-timeout 100)
-
-# When assigning device to HVM guest, we use the strict check for HVM guest by
-# default. (For PV guest, we use loose check automatically if necessary.)
-# When we assign device to HVM guest, if we meet with the co-assignment
-# issues or the ACS issue, we could try changing the option to 'no' -- however,
-# we have to realize this may incur security issue and we can't make sure the
-# device assignment could really work properly even after we do this.
-#(pci-passthrough-strict-check yes)
-
-# If we have a very big scsi device configuration, start of xend is slow,
-# because xend scans all the device paths to build its internal PSCSI device
-# list. If we need only a few devices for assigning to a guest, we can reduce
-# the scan to this device. Set list list of device paths in same syntax like in
-# command lsscsi, e.g. ('16:0:0:0' '15:0')
-# (pscsi-device-mask ('*'))
-
diff --git a/recipes-extended/xen/files/xenminiinit.sh b/recipes-extended/xen/files/xenminiinit.sh
deleted file mode 100755
index 22d5008..0000000
--- a/recipes-extended/xen/files/xenminiinit.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# This is currently a very raw init script for xen-minimal
-# Feel free to expand and make more useful
-
-STARTDOMAINS="rtos freedos"
-
-# Shutdown Xen domains
-for foo in $STARTDOMAINS ; do
- xl destroy $foo
-done
-
-# Stop and Startup Xen common
-if test -f /etc/init.d/xencommons ; then
- echo Using Xen standard init scripts
-# /etc/init.d/libvirtd stop
-# /etc/init.d/xendomains stop
-# /etc/init.d/xencommons stop
-#
-# /etc/init.d/xencommons start
-# /etc/init.d/libvirtd start
-# /etc/init.d/xendomains start
-else
- echo Skipping Xen standard init scripts
-
- killall xenstored
- killall xenconsoled
- umount /proc/xen
-
- # Fix up device nodes
- if pidof udevd ; then
- echo Udev running. Skipping mdev fixups
- else
- rm -rf /dev/xen
- mkdir /dev/xen
- for foo in /dev/xen!* ; do ln -s $foo /dev/xen/`echo $foo | cut -f 2 -d '!'` ; done
- fi
-
- mount -t xenfs xenfs /proc/xen
- xenstored --pid-file=/var/run/xenstored.pid
- xenstore-write "/local/domain/0/name" "Domain-0"
- xenconsoled --pid-file=/var/run/xenconsoled.pid
-fi
-
-# Remove the images we have
-cd /tmp
-rm -rf xen
-
-# Grab and start the VM images
-mkdir xen
-cd xen
-for foo in $STARTDOMAINS ; do
- wget http://candidates/xen/images/$foo.zip
- unzip $foo.zip
- xl create $foo.cfg
-done
-
-# Fix up the Webmin server with a new admin password
-test -f /usr/libexec/webmin/changepass.pl && /usr/libexec/webmin/changepass.pl /etc/webmin admin password
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 07/10] xen: rename xen patches directory from xen-4.3.0 to files.
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (4 preceding siblings ...)
2013-11-08 4:01 ` [PATCH v2 06/10] xen: remove old patches Chris Patterson
@ 2013-11-08 4:01 ` Chris Patterson
2013-11-08 4:01 ` [PATCH v2 09/10] xen: improve organization with new xen.inc Chris Patterson
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:01 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
...lask-avoid-installing-policy-file-as-boot.patch | 26 ++++++++++++++++++++++
...lask-avoid-installing-policy-file-as-boot.patch | 26 ----------------------
2 files changed, 26 insertions(+), 26 deletions(-)
create mode 100644 recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
delete mode 100644 recipes-extended/xen/xen-4.3.0/flask-avoid-installing-policy-file-as-boot.patch
diff --git a/recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch b/recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
new file mode 100644
index 0000000..d980807
--- /dev/null
+++ b/recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
@@ -0,0 +1,26 @@
+From 8bff3edead4318bfebc487f929f833d11922c238 Mon Sep 17 00:00:00 2001
+From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
+Date: Tue, 30 Jul 2013 16:34:38 +0400
+Subject: [PATCH] flask: avoid installing policy file as '/boot'
+
+Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
+Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
+---
+ tools/flask/policy/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
+index e666f3e..df1e8f3 100644
+--- a/tools/flask/policy/Makefile
++++ b/tools/flask/policy/Makefile
+@@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
+ all: $(POLICY_FILENAME)
+
+ install: $(POLICY_FILENAME)
++ $(INSTALL_DIR) $(POLICY_LOADPATH)
+ $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
+
+ $(POLICY_FILENAME): policy.conf
+--
+1.7.10.4
+
diff --git a/recipes-extended/xen/xen-4.3.0/flask-avoid-installing-policy-file-as-boot.patch b/recipes-extended/xen/xen-4.3.0/flask-avoid-installing-policy-file-as-boot.patch
deleted file mode 100644
index d980807..0000000
--- a/recipes-extended/xen/xen-4.3.0/flask-avoid-installing-policy-file-as-boot.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8bff3edead4318bfebc487f929f833d11922c238 Mon Sep 17 00:00:00 2001
-From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
-Date: Tue, 30 Jul 2013 16:34:38 +0400
-Subject: [PATCH] flask: avoid installing policy file as '/boot'
-
-Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
-Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
----
- tools/flask/policy/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
-index e666f3e..df1e8f3 100644
---- a/tools/flask/policy/Makefile
-+++ b/tools/flask/policy/Makefile
-@@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
- all: $(POLICY_FILENAME)
-
- install: $(POLICY_FILENAME)
-+ $(INSTALL_DIR) $(POLICY_LOADPATH)
- $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
-
- $(POLICY_FILENAME): policy.conf
---
-1.7.10.4
-
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 09/10] xen: improve organization with new xen.inc
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (5 preceding siblings ...)
2013-11-08 4:01 ` [PATCH v2 07/10] xen: rename xen patches directory from xen-4.3.0 to files Chris Patterson
@ 2013-11-08 4:01 ` Chris Patterson
2013-11-08 4:01 ` [PATCH v2 10/10] xen: add xen_git recipe Chris Patterson
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:01 UTC (permalink / raw)
To: meta-virtualization
Moved common recipe bits from xen_4.3.1.bb to xen.inc.
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
recipes-extended/xen/xen.inc | 632 +++++++++++++++++++++++++++++++++++++
recipes-extended/xen/xen_4.3.1.bb | 636 +-------------------------------------
2 files changed, 635 insertions(+), 633 deletions(-)
create mode 100644 recipes-extended/xen/xen.inc
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
new file mode 100644
index 0000000..fff3dc1
--- /dev/null
+++ b/recipes-extended/xen/xen.inc
@@ -0,0 +1,632 @@
+DESCRIPTION = "Xen hypervisor"
+HOMEPAGE = "http://xen.org"
+LICENSE = "GPLv2"
+SECTION = "console/tools"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e0f0f3ac55608719a82394cc353928df"
+
+COMPATIBLE_HOST = '(x86_64.*).*-linux'
+
+inherit autotools gettext setuptools update-rc.d
+
+PACKAGECONFIG ??= " \
+ sdl \
+"
+
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
+PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
+
+DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native glib-2.0"
+
+# inherit setuptools adds python to RDEPENDS, override it
+RDEPENDS_${PN} = ""
+
+RDEPENDS_${PN}-base = "\
+ libgcc udev bash perl xz \
+ ${PN}-blktap \
+ ${PN}-console \
+ ${PN}-libblktapctl \
+ ${PN}-libxenguest \
+ ${PN}-libxenlight \
+ ${PN}-libxenvchan \
+ ${PN}-libxenctrl \
+ ${PN}-libxlutil \
+ ${PN}-libvhd \
+ ${PN}-libxenstat \
+ ${PN}-libxenstore \
+ ${PN}-libblktap \
+ ${PN}-libfsimage \
+ ${PN}-flask \
+ ${PN}-fsimage \
+ ${PN}-hvmloader \
+ ${PN}-scripts-block \
+ ${PN}-scripts-network \
+ ${PN}-udev \
+ ${PN}-xenpaging \
+ ${PN}-xen-watchdog \
+ ${PN}-xencommons \
+ ${PN}-xendomains \
+ ${PN}-xenstore \
+ ${PN}-xenstored \
+ ${PN}-xl \
+ "
+
+RDEPENDS_${PN}-scripts-block = "\
+ ${PN}-scripts-common \
+ ${PN}-udev \
+ "
+
+RDEPENDS_${PN}-scripts-network = "\
+ bridge-utils \
+ ${PN}-scripts-common \
+ ${PN}-udev \
+ "
+
+PACKAGES = "\
+ ${PN}-base \
+ ${PN}-blktap \
+ ${PN}-console \
+ ${PN}-dbg \
+ ${PN}-dev \
+ ${PN}-doc \
+ ${PN}-flask \
+ ${PN}-fsimage \
+ ${PN}-gdbsx \
+ ${PN}-hvmloader \
+ ${PN}-hypervisor \
+ ${PN}-kdd \
+ ${PN}-libblktap \
+ ${PN}-libblktapctl \
+ ${PN}-libblktapctl-dev \
+ ${PN}-libblktap-dev \
+ ${PN}-libfsimage \
+ ${PN}-libfsimage-dev \
+ ${PN}-libvhd \
+ ${PN}-libvhd-dev \
+ ${PN}-libxenctrl \
+ ${PN}-libxenctrl-dev \
+ ${PN}-libxenguest \
+ ${PN}-libxenguest-dev \
+ ${PN}-libxenlight \
+ ${PN}-libxenlight-dev \
+ ${PN}-libxenstat \
+ ${PN}-libxenstat-dev \
+ ${PN}-libxenstore \
+ ${PN}-libxenstore-dev \
+ ${PN}-libxenvchan \
+ ${PN}-libxenvchan-dev \
+ ${PN}-libxlutil \
+ ${PN}-libxlutil-dev \
+ ${PN}-misc \
+ ${PN}-pygrub \
+ ${PN}-python \
+ ${PN}-qemu \
+ ${PN}-remus \
+ ${PN}-scripts-block \
+ ${PN}-scripts-common \
+ ${PN}-scripts-network \
+ ${PN}-staticdev \
+ ${PN}-udev \
+ ${PN}-xcutils \
+ ${PN}-xencommons \
+ ${PN}-xend \
+ ${PN}-xend-examples \
+ ${PN}-xendomains \
+ ${PN}-xenmon \
+ ${PN}-xenpaging \
+ ${PN}-xenpmd \
+ ${PN}-xenstat \
+ ${PN}-xenstore \
+ ${PN}-xenstored \
+ ${PN}-xentrace \
+ ${PN}-xen-watchdog \
+ ${PN}-xl \
+ ${PN}-xl-examples \
+ ${PN}-xm \
+ ${PN}-xm-examples \
+ "
+
+FILES_${PN}-dbg += "\
+ ${libdir}/.debug \
+ ${libdir}/xen/bin/.debug \
+ ${libdir}/python2.7/site-packages/.debug \
+ ${libdir}/python2.7/site-packages/xen/lowlevel/.debug \
+ ${libdir}/fs/xfs/.debug \
+ ${libdir}/fs/ufs/.debug \
+ ${libdir}/fs/ext2fs-lib/.debug \
+ ${libdir}/fs/fat/.debug \
+ ${libdir}/fs/zfs/.debug \
+ ${libdir}/fs/reiserfs/.debug \
+ ${libdir}/fs/iso9660/.debug \
+ ${sbindir}/.debug \
+ ${libdir}exec/.debug \
+ ${bindir}/.debug \
+ ${libdir}/python2.7/dist-packages/.debug \
+ ${libdir}/python2.7/dist-packages/xen/lowlevel/.debug \
+ "
+
+FILES_${PN}-dev = "\
+ ${includedir} \
+ "
+
+FILES_${PN}-doc = "\
+ ${sysconfdir}/xen/README \
+ ${sysconfdir}/xen/README.incompatibilities \
+ ${datadir}/doc \
+ ${datadir}/man \
+ "
+
+FILES_${PN}-staticdev += "\
+ ${libdir}/libblktapctl.a \
+ ${libdir}/libxenguest.a \
+ ${libdir}/libxenlight.a \
+ ${libdir}/libxenvchan.a \
+ ${libdir}/libxenctrl.a \
+ ${libdir}/libxlutil.a \
+ ${libdir}/libvhd.a \
+ ${libdir}/libxenstat.a \
+ ${libdir}/libxenstore.a \
+ ${libdir}/libblktap.a \
+ "
+
+FILES_${PN}-libblktapctl = "${libdir}/libblktapctl.so.*"
+FILES_${PN}-libblktapctl-dev = "${libdir}/libblktapctl.so"
+
+FILES_${PN}-libxenguest = "${libdir}/libxenguest.so.*"
+FILES_${PN}-libxenguest-dev = "${libdir}/libxenguest.so"
+
+FILES_${PN}-libxenlight = "${libdir}/libxenlight.so.*"
+FILES_${PN}-libxenlight-dev = "${libdir}/libxenlight.so"
+
+FILES_${PN}-libxenvchan = "${libdir}/libxenvchan.so.*"
+FILES_${PN}-libxenvchan-dev = "${libdir}/libxenvchan.so"
+
+FILES_${PN}-libxenctrl = "${libdir}/libxenctrl.so.*"
+FILES_${PN}-libxenctrl-dev = "${libdir}/libxenctrl.so"
+
+FILES_${PN}-libxlutil = "${libdir}/libxlutil.so.*"
+FILES_${PN}-libxlutil-dev = "${libdir}/libxlutil.so"
+
+FILES_${PN}-libvhd = "${libdir}/libvhd.so.*"
+FILES_${PN}-libvhd-dev = "${libdir}/libvhd.so"
+
+FILES_${PN}-libxenstat = "${libdir}/libxenstat.so.*"
+FILES_${PN}-libxenstat-dev = "${libdir}/libxenstat.so"
+
+FILES_${PN}-libxenstore = "${libdir}/libxenstore.so.*"
+FILES_${PN}-libxenstore-dev = "${libdir}/libxenstore.so"
+
+FILES_${PN}-libblktap = "${libdir}/libblktap.so.*"
+FILES_${PN}-libblktap-dev = "${libdir}/libblktap.so"
+
+FILES_${PN}-libfsimage = "${libdir}/libfsimage.so.*"
+FILES_${PN}-libfsimage-dev = "${libdir}/libfsimage.so"
+
+FILES_${PN}-fsimage = "${libdir}/fs/*/*fsimage.so"
+
+FILES_${PN}-hypervisor = "\
+ /boot/xen-*.gz \
+ /boot/xen.gz \
+ /boot/xen-syms-* \
+ "
+
+FILES_${PN}-base = "\
+ ${sysconfdir}/default/volatiles/99_xen \
+ ${sysconfdir}/default/xencommons \
+ ${sysconfdir}/default/xendomains \
+ ${sysconfdir}/xen/auto \
+ ${sysconfdir}/xen/cpupool \
+ ${sysconfdir}/sysconfig/xendomains \
+ ${localstatedir}/xen/dump \
+ "
+
+FILES_${PN}-blktap = "\
+ ${sbindir}/blktapctrl \
+ ${sbindir}/img2qcow \
+ ${sbindir}/lock-util \
+ ${sbindir}/qcow2raw \
+ ${sbindir}/qcow-create \
+ ${sbindir}/tap-ctl \
+ ${sbindir}/tapdisk \
+ ${sbindir}/tapdisk2 \
+ ${sbindir}/tapdisk-client \
+ ${sbindir}/tapdisk-diff \
+ ${sbindir}/tapdisk-stream \
+ ${sbindir}/td-util \
+ ${sbindir}/vhd-update \
+ ${sbindir}/vhd-util \
+ "
+
+FILES_${PN}-console = "\
+ ${libdir}/xen/bin/xenconsole \
+ ${sbindir}/xenconsoled \
+ "
+
+FILES_${PN}-flask = "\
+ ${sbindir}/flask-get-bool \
+ ${sbindir}/flask-getenforce \
+ ${sbindir}/flask-label-pci \
+ ${sbindir}/flask-loadpolicy \
+ ${sbindir}/flask-set-bool \
+ ${sbindir}/flask-setenforce \
+ /boot/xenpolicy.24 \
+ "
+
+FILES_${PN}-gdbsx = "\
+ ${sbindir}/gdbsx \
+ "
+
+INSANE_SKIP_${PN}-hvmloader = "arch"
+FILES_${PN}-hvmloader = "\
+ ${libdir}/xen/boot/hvmloader \
+ "
+
+FILES_${PN}-kdd = "\
+ ${sbindir}/kdd \
+ "
+
+FILES_${PN}-misc = "\
+ ${bindir}/xencons \
+ ${bindir}/xencov_split \
+ ${bindir}/xen-detect \
+ ${libdir}/xen/bin/xenpvnetboot \
+ ${sbindir}/gtracestat \
+ ${sbindir}/gtraceview \
+ ${sbindir}/xen-bugtool \
+ ${sbindir}/xencov \
+ ${sbindir}/xenperf \
+ ${sbindir}/xenpm \
+ ${sbindir}/xsview \
+ ${sbindir}/xen-tmem-list-parse \
+ ${sbindir}/xen-python-path \
+ ${sbindir}/xen-ringwatch \
+ ${sbindir}/xen-hptool \
+ ${sbindir}/xen-hvmcrash \
+ ${sbindir}/xen-hvmctx \
+ ${sbindir}/xenlockprof \
+ ${sbindir}/xen-lowmemd \
+ "
+
+FILES_${PN}-pygrub = "\
+ ${bindir}/pygrub \
+ ${libdir}/xen/bin/pygrub \
+ "
+
+FILES_${PN}-python = "\
+ ${libdir}/python2.7 \
+ "
+
+INSANE_SKIP_${PN} = "already-stripped"
+INSANE_SKIP_${PN}-qemu = "arch"
+FILES_${PN}-qemu = " \
+ ${datadir}/xen/qemu \
+ ${libdir}/xen/bin/qemu-system-i386 \
+ ${libdir}/xen/bin/qemu-system-x86_64 \
+ ${libdir}/xen/bin/qemu-img \
+ ${libdir}/xen/bin/qemu-nbd \
+ ${libdir}/xen/bin/qemu-ga \
+ ${libdir}/xen/bin/qemu-io \
+ ${libdir}/xen/bin/qemu-dm \
+ ${libdir}/xen/bin/virtfs-proxy-helper \
+ /usr/libexec/qemu-bridge-helper \
+ /usr/etc/qemu \
+ /usr/etc/qemu/target-x86_64.conf \
+ ${datadir}/qemu-xen \
+ ${datadir}/qemu-xen/qemu \
+ ${datadir}/qemu-xen/qemu/bamboo.dtb \
+ ${datadir}/qemu-xen/qemu/pxe-pcnet.rom \
+ ${datadir}/qemu-xen/qemu/vgabios-vmware.bin \
+ ${datadir}/qemu-xen/qemu/pxe-eepro100.rom \
+ ${datadir}/qemu-xen/qemu/pxe-e1000.rom \
+ ${datadir}/qemu-xen/qemu/openbios-ppc \
+ ${datadir}/qemu-xen/qemu/multiboot.bin \
+ ${datadir}/qemu-xen/qemu/vgabios-cirrus.bin \
+ ${datadir}/qemu-xen/qemu/bios.bin \
+ ${datadir}/qemu-xen/qemu/vgabios-stdvga.bin \
+ ${datadir}/qemu-xen/qemu/palcode-clipper \
+ ${datadir}/qemu-xen/qemu/pxe-ne2k_pci.rom \
+ ${datadir}/qemu-xen/qemu/spapr-rtas.bin \
+ ${datadir}/qemu-xen/qemu/slof.bin \
+ ${datadir}/qemu-xen/qemu/vgabios-qxl.bin \
+ ${datadir}/qemu-xen/qemu/pxe-rtl8139.rom \
+ ${datadir}/qemu-xen/qemu/openbios-sparc64 \
+ ${datadir}/qemu-xen/qemu/pxe-virtio.rom \
+ ${datadir}/qemu-xen/qemu/kvmvapic.bin \
+ ${datadir}/qemu-xen/qemu/openbios-sparc32 \
+ ${datadir}/qemu-xen/qemu/petalogix-s3adsp1800.dtb \
+ ${datadir}/qemu-xen/qemu/sgabios.bin \
+ ${datadir}/qemu-xen/qemu/linuxboot.bin \
+ ${datadir}/qemu-xen/qemu/qemu-icon.bmp \
+ ${datadir}/qemu-xen/qemu/ppc_rom.bin \
+ ${datadir}/qemu-xen/qemu/vgabios.bin \
+ ${datadir}/qemu-xen/qemu/s390-zipl.rom \
+ ${datadir}/qemu-xen/qemu/petalogix-ml605.dtb \
+ ${datadir}/qemu-xen/qemu/keymaps \
+ ${datadir}/qemu-xen/qemu/keymaps/common \
+ ${datadir}/qemu-xen/qemu/keymaps/th \
+ ${datadir}/qemu-xen/qemu/keymaps/is \
+ ${datadir}/qemu-xen/qemu/keymaps/en-gb \
+ ${datadir}/qemu-xen/qemu/keymaps/ar \
+ ${datadir}/qemu-xen/qemu/keymaps/fr-be \
+ ${datadir}/qemu-xen/qemu/keymaps/ru \
+ ${datadir}/qemu-xen/qemu/keymaps/hu \
+ ${datadir}/qemu-xen/qemu/keymaps/de-ch \
+ ${datadir}/qemu-xen/qemu/keymaps/no \
+ ${datadir}/qemu-xen/qemu/keymaps/fr \
+ ${datadir}/qemu-xen/qemu/keymaps/pl \
+ ${datadir}/qemu-xen/qemu/keymaps/fr-ca \
+ ${datadir}/qemu-xen/qemu/keymaps/de \
+ ${datadir}/qemu-xen/qemu/keymaps/fr-ch \
+ ${datadir}/qemu-xen/qemu/keymaps/bepo \
+ ${datadir}/qemu-xen/qemu/keymaps/lv \
+ ${datadir}/qemu-xen/qemu/keymaps/ja \
+ ${datadir}/qemu-xen/qemu/keymaps/da \
+ ${datadir}/qemu-xen/qemu/keymaps/lt \
+ ${datadir}/qemu-xen/qemu/keymaps/hr \
+ ${datadir}/qemu-xen/qemu/keymaps/es \
+ ${datadir}/qemu-xen/qemu/keymaps/modifiers \
+ ${datadir}/qemu-xen/qemu/keymaps/sl \
+ ${datadir}/qemu-xen/qemu/keymaps/it \
+ ${datadir}/qemu-xen/qemu/keymaps/nl \
+ ${datadir}/qemu-xen/qemu/keymaps/fo \
+ ${datadir}/qemu-xen/qemu/keymaps/mk \
+ ${datadir}/qemu-xen/qemu/keymaps/pt-br \
+ ${datadir}/qemu-xen/qemu/keymaps/tr \
+ ${datadir}/qemu-xen/qemu/keymaps/sv \
+ ${datadir}/qemu-xen/qemu/keymaps/fi \
+ ${datadir}/qemu-xen/qemu/keymaps/en-us \
+ ${datadir}/qemu-xen/qemu/keymaps/et \
+ ${datadir}/qemu-xen/qemu/keymaps/nl-be \
+ ${datadir}/qemu-xen/qemu/keymaps/pt \
+ ${bindir}/qemu-nbd-xen \
+ ${bindir}/qemu-img-xen \
+ "
+
+FILES_${PN}-remus = "\
+ ${bindir}/remus \
+ "
+
+FILES_${PN}-scripts-network = " \
+ ${sysconfdir}/xen/scripts/network-bridge \
+ ${sysconfdir}/xen/scripts/network-nat \
+ ${sysconfdir}/xen/scripts/network-route \
+ ${sysconfdir}/xen/scripts/qemu-ifup \
+ ${sysconfdir}/xen/scripts/vif2 \
+ ${sysconfdir}/xen/scripts/vif-bridge \
+ ${sysconfdir}/xen/scripts/vif-common.sh \
+ ${sysconfdir}/xen/scripts/vif-nat \
+ ${sysconfdir}/xen/scripts/vif-openvswitch \
+ ${sysconfdir}/xen/scripts/vif-route \
+ ${sysconfdir}/xen/scripts/vif-setup \
+ "
+
+FILES_${PN}-scripts-block = " \
+ ${sysconfdir}/xen/scripts/blktap \
+ ${sysconfdir}/xen/scripts/block \
+ ${sysconfdir}/xen/scripts/block-common.sh \
+ ${sysconfdir}/xen/scripts/block-enbd \
+ ${sysconfdir}/xen/scripts/block-iscsi \
+ ${sysconfdir}/xen/scripts/block-nbd \
+ ${sysconfdir}/xen/scripts/vscsi \
+ "
+
+FILES_${PN}-scripts-common = " \
+ ${sysconfdir}/xen/scripts/external-device-migrate \
+ ${sysconfdir}/xen/scripts/hotplugpath.sh \
+ ${sysconfdir}/xen/scripts/locking.sh \
+ ${sysconfdir}/xen/scripts/logging.sh \
+ ${sysconfdir}/xen/scripts/xen-hotplug-cleanup \
+ ${sysconfdir}/xen/scripts/xen-hotplug-common.sh \
+ ${sysconfdir}/xen/scripts/xen-network-common.sh \
+ ${sysconfdir}/xen/scripts/xen-script-common.sh \
+ "
+
+FILES_${PN}-udev = "\
+ ${sysconfdir}/udev/rules.d/xen-backend.rules \
+ ${sysconfdir}/udev/rules.d/xend.rules \
+ "
+
+FILES_${PN}-xcutils = "\
+ ${libdir}/xen/bin/lsevtchn \
+ ${libdir}/xen/bin/readnotes \
+ ${libdir}/xen/bin/xc_restore \
+ ${libdir}/xen/bin/xc_save \
+ "
+
+FILES_${PN}-xend-examples = "\
+ ${sysconfdir}/xen/xend-config.sxp \
+ ${sysconfdir}/xen/xend-pci-permissive.sxp \
+ ${sysconfdir}/xen/xend-pci-quirks.sxp \
+ "
+
+FILES_${PN}-xenpaging = "\
+ ${libdir}/xen/bin/xenpaging \
+ ${localstatedir}/lib/xen/xenpaging \
+ "
+
+FILES_${PN}-xenpmd = "\
+ ${sbindir}/xenpmd \
+ "
+
+FILES_${PN}-xenstat = "\
+ ${sbindir}/xentop \
+ "
+
+FILES_${PN}-xenstore = "\
+ ${bindir}/xenstore \
+ ${bindir}/xenstore-chmod \
+ ${bindir}/xenstore-control \
+ ${bindir}/xenstore-exists \
+ ${bindir}/xenstore-list \
+ ${bindir}/xenstore-ls \
+ ${bindir}/xenstore-read \
+ ${bindir}/xenstore-rm \
+ ${bindir}/xenstore-watch \
+ ${bindir}/xenstore-write \
+ "
+
+FILES_${PN}-xenstored = "\
+ ${sbindir}/xenstored \
+ ${localstatedir}/lib/xenstored \
+ "
+
+FILES_${PN}-xentrace = "\
+ ${bindir}/xentrace \
+ ${bindir}/xentrace_format \
+ ${bindir}/xentrace_setsize \
+ ${libdir}/xen/bin/xenctx \
+ "
+
+FILES_${PN}-xen-watchdog = "\
+ ${sbindir}/xenwatchdogd \
+ "
+
+FILES_${PN}-xl = "\
+ ${sysconfdir}/bash_completion.d/xl.sh \
+ ${sysconfdir}/xen/xl.conf \
+ ${libdir}/xen/bin/libxl-save-helper \
+ ${sbindir}/xl \
+ "
+
+FILES_${PN}-xl-examples = "\
+ ${sysconfdir}/xen/xlexample.hvm \
+ ${sysconfdir}/xen/xlexample.pvlinux \
+ "
+
+FILES_${PN}-xm-examples = "\
+ ${sysconfdir}/xen/xmexample1 \
+ ${sysconfdir}/xen/xmexample2 \
+ ${sysconfdir}/xen/xmexample3 \
+ ${sysconfdir}/xen/xmexample.hvm \
+ ${sysconfdir}/xen/xmexample.hvm-stubdom \
+ ${sysconfdir}/xen/xmexample.nbd \
+ ${sysconfdir}/xen/xmexample.pv-grub \
+ ${sysconfdir}/xen/xmexample.vti \
+ "
+
+FILES_${PN}-xenmon = "\
+ ${sbindir}/xenbaked \
+ ${sbindir}/xentrace_setmask \
+ ${sbindir}/xenmon.py \
+ "
+
+FILES_${PN}-xm = "\
+ ${sysconfdir}/xen/xm-config.xml \
+ ${datadir}/xen/create.dtd \
+ ${sbindir}/xm \
+ "
+
+FILES_${PN}-xencommons += "${sysconfdir}/init.d/xencommons"
+FILES_${PN}-xend += " \
+ ${sysconfdir}/init.d/xend \
+ ${sbindir}/xend \
+ "
+FILES_${PN}-xendomains += "${sysconfdir}/init.d/xendomains"
+FILES_${PN}-xen-watchdog += "${sysconfdir}/init.d/xen-watchdog"
+
+# configure init.d scripts
+INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xencommons ${PN}-xen-watchdog ${PN}-xendomains"
+INITSCRIPT_NAME_${PN}-xencommons = "xencommons"
+INITSCRIPT_PARAMS_${PN}-xencommons = "defaults 80"
+INITSCRIPT_NAME_${PN}-xen-watchdog = "xen-watchdog"
+INITSCRIPT_PARAMS_${PN}-xen-watchdog = "defaults 81"
+INITSCRIPT_NAME_${PN}-xend = "xend"
+INITSCRIPT_PARAMS_${PN}-xend = "defaults 82"
+INITSCRIPT_NAME_${PN}-xendomains = "xendomains"
+INITSCRIPT_PARAMS_${PN}-xendomains = "defaults 83"
+
+#### REQUIRED ENVIRONMENT VARIABLES ####
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+# specify xen hypervisor to target x86_64 (x86_32 not supported)
+export XEN_TARGET_ARCH="x86_64"
+export XEN_COMPILE_ARCH="x86_64"
+
+# this is used for the header (#!${bindir}/python) of the install python scripts
+export PYTHONPATH="${bindir}/python"
+
+# seabios forcefully sets HOSTCC to CC - fixup to allow it to build native conf executable
+export HOSTCC="${BUILD_CC}"
+
+# make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure
+export CROSS_COMPILE="${TARGET_PREFIX}"
+
+# overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'"
+export LDFLAGS=""
+
+EXTRA_OECONF += " \
+ --exec-prefix=/usr \
+ --prefix=/usr \
+ --host=${HOST_SYS} \
+ --disable-stubdom \
+ --disable-ioemu-stubdom \
+ --disable-pv-grub \
+ --disable-xenstore-stubdom \
+"
+
+do_configure() {
+ # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu
+ test -d ${S}/tools/include/gnu || mkdir ${S}/tools/include/gnu
+ if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
+ cat ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h | grep -v stub_bdflush | grep -v stub_getmsg | grep -v stub_putmsg > ${S}/tools/include/gnu/stubs-32.h
+ echo \#define __stub___kernel_cosl >> ${S}/tools/include/gnu/stubs-32.h
+ echo \#define __stub___kernel_sinl >> ${S}/tools/include/gnu/stubs-32.h
+ echo \#define __stub___kernel_tanl >> ${S}/tools/include/gnu/stubs-32.h
+ fi
+
+ # do configure
+ oe_runconf
+
+ # seabios needs a patch to specify correct compiler - pull and patch Makefile
+ make -C ${S}/tools/firmware seabios-dir
+ sed -i 's/export HOSTCC.*$(CC)/export HOSTCC ?= $(CC)/g' ${S}/tools/firmware/seabios-dir/Makefile
+}
+
+do_compile() {
+ oe_runmake
+}
+
+do_install() {
+ oe_runmake DESTDIR="${D}" install
+
+ # remove installed volatiles
+ rm -rf ${D}${localstatedir}/run ${D}${localstatedir}/lock ${D}${localstatedir}/log ${D}${localstatedir}/volatile
+
+ # install volatiles using populate_volatiles mechanism
+ install -d ${D}${sysconfdir}/default/volatiles
+ echo "d root root 0755 ${localstatedir}/run/xenstored none" \
+ > ${D}${sysconfdir}/default/volatiles/99_xen
+ echo "d root root 0755 ${localstatedir}/run/xend none" \
+ >> ${D}${sysconfdir}/default/volatiles/99_xen
+ echo "d root root 0755 ${localstatedir}/run/xend/boot none" \
+ >> ${D}${sysconfdir}/default/volatiles/99_xen
+ echo "d root root 0755 ${localstatedir}/run/xen none" \
+ >> ${D}${sysconfdir}/default/volatiles/99_xen
+ echo "d root root 0755 ${localstatedir}/log/xen none" \
+ >> ${D}${sysconfdir}/default/volatiles/99_xen
+ echo "d root root 0755 ${localstatedir}/lock/xen none" \
+ >> ${D}${sysconfdir}/default/volatiles/99_xen
+ echo "d root root 0755 ${localstatedir}/lock/subsys none" \
+ >> ${D}${sysconfdir}/default/volatiles/99_xen
+
+ # workaround for xendomains script which searchs sysconfig if directory exists
+ install -d ${D}${sysconfdir}/sysconfig
+ ln -sf ${sysconfdir}/default/xendomains ${D}${sysconfdir}/sysconfig/xendomains
+}
+
+pkg_postinst_${PN}-base() {
+ if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
+ ${sysconfdir}/init.d/populate-volatile.sh update
+ fi
+}
+
+sysroot_stage_all_append() {
+ sysroot_stage_dir ${D}/boot ${SYSROOT_DESTDIR}/kernel
+
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0644 ${D}/boot/xen.gz ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz
+}
diff --git a/recipes-extended/xen/xen_4.3.1.bb b/recipes-extended/xen/xen_4.3.1.bb
index f28fd79..46563ce 100644
--- a/recipes-extended/xen/xen_4.3.1.bb
+++ b/recipes-extended/xen/xen_4.3.1.bb
@@ -1,10 +1,4 @@
-DESCRIPTION = "Xen hypervisor"
-HOMEPAGE = "http://xen.org"
-LICENSE = "GPLv2"
-SECTION = "console/tools"
-PR = "r0"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=e0f0f3ac55608719a82394cc353928df"
+require xen.inc
SRC_URI = " \
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
@@ -16,634 +10,10 @@ SRC_URI[sha256sum] = "3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d
S = "${WORKDIR}/xen-${PV}"
-COMPATIBLE_HOST = '(x86_64.*).*-linux'
-
-inherit autotools gettext setuptools update-rc.d
-
-PACKAGECONFIG ??= " \
- sdl \
-"
-PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
-PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
-
-DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native glib-2.0"
-
-# inherit setuptools adds python to RDEPENDS, override it
-RDEPENDS_${PN} = ""
-
-RDEPENDS_${PN}-base = "\
- libgcc udev bash perl xz \
- ${PN}-blktap \
- ${PN}-console \
- ${PN}-libblktapctl \
- ${PN}-libxenguest \
- ${PN}-libxenlight \
- ${PN}-libxenvchan \
- ${PN}-libxenctrl \
- ${PN}-libxlutil \
- ${PN}-libvhd \
- ${PN}-libxenstat \
- ${PN}-libxenstore \
- ${PN}-libblktap \
- ${PN}-libfsimage \
- ${PN}-flask \
- ${PN}-fsimage \
- ${PN}-hvmloader \
- ${PN}-scripts-block \
- ${PN}-scripts-network \
- ${PN}-udev \
- ${PN}-xenpaging \
- ${PN}-xen-watchdog \
- ${PN}-xencommons \
- ${PN}-xendomains \
- ${PN}-xenstore \
- ${PN}-xenstored \
- ${PN}-xl \
- "
-
-RDEPENDS_${PN}-scripts-block = "\
- ${PN}-scripts-common \
- ${PN}-udev \
- "
-
-RDEPENDS_${PN}-scripts-network = "\
- bridge-utils \
- ${PN}-scripts-common \
- ${PN}-udev \
- "
-
-PACKAGES = "\
- ${PN}-base \
- ${PN}-blktap \
- ${PN}-console \
- ${PN}-dbg \
- ${PN}-dev \
- ${PN}-doc \
- ${PN}-flask \
- ${PN}-fsimage \
- ${PN}-gdbsx \
- ${PN}-hvmloader \
- ${PN}-hypervisor \
- ${PN}-kdd \
- ${PN}-libblktap \
- ${PN}-libblktapctl \
- ${PN}-libblktapctl-dev \
- ${PN}-libblktap-dev \
- ${PN}-libfsimage \
- ${PN}-libfsimage-dev \
- ${PN}-libvhd \
- ${PN}-libvhd-dev \
- ${PN}-libxenctrl \
- ${PN}-libxenctrl-dev \
- ${PN}-libxenguest \
- ${PN}-libxenguest-dev \
- ${PN}-libxenlight \
- ${PN}-libxenlight-dev \
- ${PN}-libxenstat \
- ${PN}-libxenstat-dev \
- ${PN}-libxenstore \
- ${PN}-libxenstore-dev \
- ${PN}-libxenvchan \
- ${PN}-libxenvchan-dev \
- ${PN}-libxlutil \
- ${PN}-libxlutil-dev \
- ${PN}-misc \
- ${PN}-pygrub \
- ${PN}-python \
- ${PN}-qemu \
- ${PN}-remus \
- ${PN}-scripts-block \
- ${PN}-scripts-common \
- ${PN}-scripts-network \
- ${PN}-staticdev \
- ${PN}-udev \
- ${PN}-xcutils \
- ${PN}-xencommons \
- ${PN}-xend \
- ${PN}-xend-examples \
- ${PN}-xendomains \
- ${PN}-xenmon \
- ${PN}-xenpaging \
- ${PN}-xenpmd \
- ${PN}-xenstat \
- ${PN}-xenstore \
- ${PN}-xenstored \
- ${PN}-xentrace \
- ${PN}-xen-watchdog \
- ${PN}-xl \
- ${PN}-xl-examples \
- ${PN}-xm \
- ${PN}-xm-examples \
- "
-
-FILES_${PN}-dbg += "\
- ${libdir}/.debug \
- ${libdir}/xen/bin/.debug \
- ${libdir}/python2.7/site-packages/.debug \
- ${libdir}/python2.7/site-packages/xen/lowlevel/.debug \
- ${libdir}/fs/xfs/.debug \
- ${libdir}/fs/ufs/.debug \
- ${libdir}/fs/ext2fs-lib/.debug \
- ${libdir}/fs/fat/.debug \
- ${libdir}/fs/zfs/.debug \
- ${libdir}/fs/reiserfs/.debug \
- ${libdir}/fs/iso9660/.debug \
- ${sbindir}/.debug \
- ${libdir}exec/.debug \
- ${bindir}/.debug \
- ${libdir}/python2.7/dist-packages/.debug \
- ${libdir}/python2.7/dist-packages/xen/lowlevel/.debug \
- "
-
-FILES_${PN}-dev = "\
- ${includedir} \
- "
-
-FILES_${PN}-doc = "\
- ${sysconfdir}/xen/README \
- ${sysconfdir}/xen/README.incompatibilities \
- ${datadir}/doc \
- ${datadir}/man \
- "
-
-FILES_${PN}-staticdev += "\
- ${libdir}/libblktapctl.a \
- ${libdir}/libxenguest.a \
- ${libdir}/libxenlight.a \
- ${libdir}/libxenvchan.a \
- ${libdir}/libxenctrl.a \
- ${libdir}/libxlutil.a \
- ${libdir}/libvhd.a \
- ${libdir}/libxenstat.a \
- ${libdir}/libxenstore.a \
- ${libdir}/libblktap.a \
- "
-
-FILES_${PN}-libblktapctl = "${libdir}/libblktapctl.so.*"
-FILES_${PN}-libblktapctl-dev = "${libdir}/libblktapctl.so"
-
-FILES_${PN}-libxenguest = "${libdir}/libxenguest.so.*"
-FILES_${PN}-libxenguest-dev = "${libdir}/libxenguest.so"
-
-FILES_${PN}-libxenlight = "${libdir}/libxenlight.so.*"
-FILES_${PN}-libxenlight-dev = "${libdir}/libxenlight.so"
-
-FILES_${PN}-libxenvchan = "${libdir}/libxenvchan.so.*"
-FILES_${PN}-libxenvchan-dev = "${libdir}/libxenvchan.so"
-
-FILES_${PN}-libxenctrl = "${libdir}/libxenctrl.so.*"
-FILES_${PN}-libxenctrl-dev = "${libdir}/libxenctrl.so"
-
-FILES_${PN}-libxlutil = "${libdir}/libxlutil.so.*"
-FILES_${PN}-libxlutil-dev = "${libdir}/libxlutil.so"
-
-FILES_${PN}-libvhd = "${libdir}/libvhd.so.*"
-FILES_${PN}-libvhd-dev = "${libdir}/libvhd.so"
-
-FILES_${PN}-libxenstat = "${libdir}/libxenstat.so.*"
-FILES_${PN}-libxenstat-dev = "${libdir}/libxenstat.so"
-
-FILES_${PN}-libxenstore = "${libdir}/libxenstore.so.*"
-FILES_${PN}-libxenstore-dev = "${libdir}/libxenstore.so"
-
-FILES_${PN}-libblktap = "${libdir}/libblktap.so.*"
-FILES_${PN}-libblktap-dev = "${libdir}/libblktap.so"
-
-FILES_${PN}-libfsimage = "${libdir}/libfsimage.so.*"
-FILES_${PN}-libfsimage-dev = "${libdir}/libfsimage.so"
-
-FILES_${PN}-fsimage = "${libdir}/fs/*/*fsimage.so"
-
-FILES_${PN}-hypervisor = "\
- /boot/xen-4.3.1.gz \
- /boot/xen-4.3.gz \
- /boot/xen-4.gz \
- /boot/xen.gz \
- /boot/xen-syms-4.3.1 \
- "
-
-FILES_${PN}-base = "\
- ${sysconfdir}/default/volatiles/99_xen \
- ${sysconfdir}/default/xencommons \
- ${sysconfdir}/default/xendomains \
- ${sysconfdir}/xen/auto \
- ${sysconfdir}/xen/cpupool \
- ${sysconfdir}/sysconfig/xendomains \
- ${localstatedir}/xen/dump \
- "
-
-FILES_${PN}-blktap = "\
- ${sbindir}/blktapctrl \
- ${sbindir}/img2qcow \
- ${sbindir}/lock-util \
- ${sbindir}/qcow2raw \
- ${sbindir}/qcow-create \
- ${sbindir}/tap-ctl \
- ${sbindir}/tapdisk \
- ${sbindir}/tapdisk2 \
- ${sbindir}/tapdisk-client \
- ${sbindir}/tapdisk-diff \
- ${sbindir}/tapdisk-stream \
- ${sbindir}/td-util \
- ${sbindir}/vhd-update \
- ${sbindir}/vhd-util \
- "
-
-FILES_${PN}-console = "\
- ${libdir}/xen/bin/xenconsole \
- ${sbindir}/xenconsoled \
- "
-
-FILES_${PN}-flask = "\
- ${sbindir}/flask-get-bool \
- ${sbindir}/flask-getenforce \
- ${sbindir}/flask-label-pci \
- ${sbindir}/flask-loadpolicy \
- ${sbindir}/flask-set-bool \
- ${sbindir}/flask-setenforce \
- /boot/xenpolicy.24 \
- "
-
-FILES_${PN}-gdbsx = "\
- ${sbindir}/gdbsx \
- "
-
-INSANE_SKIP_${PN}-hvmloader = "arch"
-FILES_${PN}-hvmloader = "\
- ${libdir}/xen/boot/hvmloader \
- "
-
-FILES_${PN}-kdd = "\
- ${sbindir}/kdd \
- "
-
-FILES_${PN}-misc = "\
- ${bindir}/xencons \
- ${bindir}/xencov_split \
- ${bindir}/xen-detect \
- ${libdir}/xen/bin/xenpvnetboot \
- ${sbindir}/gtracestat \
- ${sbindir}/gtraceview \
- ${sbindir}/xen-bugtool \
- ${sbindir}/xencov \
- ${sbindir}/xenperf \
- ${sbindir}/xenpm \
- ${sbindir}/xsview \
- ${sbindir}/xen-tmem-list-parse \
- ${sbindir}/xen-python-path \
- ${sbindir}/xen-ringwatch \
- ${sbindir}/xen-hptool \
- ${sbindir}/xen-hvmcrash \
- ${sbindir}/xen-hvmctx \
- ${sbindir}/xenlockprof \
- ${sbindir}/xen-lowmemd \
- "
-
-FILES_${PN}-pygrub = "\
- ${bindir}/pygrub \
- ${libdir}/xen/bin/pygrub \
- "
-
-FILES_${PN}-python = "\
- ${libdir}/python2.7 \
- "
-
-INSANE_SKIP_${PN} = "already-stripped"
-INSANE_SKIP_${PN}-qemu = "arch"
-FILES_${PN}-qemu = " \
- ${datadir}/xen/qemu \
- ${libdir}/xen/bin/qemu-system-i386 \
- ${libdir}/xen/bin/qemu-system-x86_64 \
- ${libdir}/xen/bin/qemu-img \
- ${libdir}/xen/bin/qemu-nbd \
- ${libdir}/xen/bin/qemu-ga \
- ${libdir}/xen/bin/qemu-io \
- ${libdir}/xen/bin/qemu-dm \
- ${libdir}/xen/bin/virtfs-proxy-helper \
- /usr/libexec/qemu-bridge-helper \
- /usr/etc/qemu \
- /usr/etc/qemu/target-x86_64.conf \
- ${datadir}/qemu-xen \
- ${datadir}/qemu-xen/qemu \
- ${datadir}/qemu-xen/qemu/bamboo.dtb \
- ${datadir}/qemu-xen/qemu/pxe-pcnet.rom \
- ${datadir}/qemu-xen/qemu/vgabios-vmware.bin \
- ${datadir}/qemu-xen/qemu/pxe-eepro100.rom \
- ${datadir}/qemu-xen/qemu/pxe-e1000.rom \
- ${datadir}/qemu-xen/qemu/openbios-ppc \
- ${datadir}/qemu-xen/qemu/multiboot.bin \
- ${datadir}/qemu-xen/qemu/vgabios-cirrus.bin \
- ${datadir}/qemu-xen/qemu/bios.bin \
- ${datadir}/qemu-xen/qemu/vgabios-stdvga.bin \
- ${datadir}/qemu-xen/qemu/palcode-clipper \
- ${datadir}/qemu-xen/qemu/pxe-ne2k_pci.rom \
- ${datadir}/qemu-xen/qemu/spapr-rtas.bin \
- ${datadir}/qemu-xen/qemu/slof.bin \
- ${datadir}/qemu-xen/qemu/vgabios-qxl.bin \
- ${datadir}/qemu-xen/qemu/pxe-rtl8139.rom \
- ${datadir}/qemu-xen/qemu/openbios-sparc64 \
- ${datadir}/qemu-xen/qemu/pxe-virtio.rom \
- ${datadir}/qemu-xen/qemu/kvmvapic.bin \
- ${datadir}/qemu-xen/qemu/openbios-sparc32 \
- ${datadir}/qemu-xen/qemu/petalogix-s3adsp1800.dtb \
- ${datadir}/qemu-xen/qemu/sgabios.bin \
- ${datadir}/qemu-xen/qemu/linuxboot.bin \
- ${datadir}/qemu-xen/qemu/qemu-icon.bmp \
- ${datadir}/qemu-xen/qemu/ppc_rom.bin \
- ${datadir}/qemu-xen/qemu/vgabios.bin \
- ${datadir}/qemu-xen/qemu/s390-zipl.rom \
- ${datadir}/qemu-xen/qemu/petalogix-ml605.dtb \
- ${datadir}/qemu-xen/qemu/keymaps \
- ${datadir}/qemu-xen/qemu/keymaps/common \
- ${datadir}/qemu-xen/qemu/keymaps/th \
- ${datadir}/qemu-xen/qemu/keymaps/is \
- ${datadir}/qemu-xen/qemu/keymaps/en-gb \
- ${datadir}/qemu-xen/qemu/keymaps/ar \
- ${datadir}/qemu-xen/qemu/keymaps/fr-be \
- ${datadir}/qemu-xen/qemu/keymaps/ru \
- ${datadir}/qemu-xen/qemu/keymaps/hu \
- ${datadir}/qemu-xen/qemu/keymaps/de-ch \
- ${datadir}/qemu-xen/qemu/keymaps/no \
- ${datadir}/qemu-xen/qemu/keymaps/fr \
- ${datadir}/qemu-xen/qemu/keymaps/pl \
- ${datadir}/qemu-xen/qemu/keymaps/fr-ca \
- ${datadir}/qemu-xen/qemu/keymaps/de \
- ${datadir}/qemu-xen/qemu/keymaps/fr-ch \
- ${datadir}/qemu-xen/qemu/keymaps/bepo \
- ${datadir}/qemu-xen/qemu/keymaps/lv \
- ${datadir}/qemu-xen/qemu/keymaps/ja \
- ${datadir}/qemu-xen/qemu/keymaps/da \
- ${datadir}/qemu-xen/qemu/keymaps/lt \
- ${datadir}/qemu-xen/qemu/keymaps/hr \
- ${datadir}/qemu-xen/qemu/keymaps/es \
- ${datadir}/qemu-xen/qemu/keymaps/modifiers \
- ${datadir}/qemu-xen/qemu/keymaps/sl \
- ${datadir}/qemu-xen/qemu/keymaps/it \
- ${datadir}/qemu-xen/qemu/keymaps/nl \
- ${datadir}/qemu-xen/qemu/keymaps/fo \
- ${datadir}/qemu-xen/qemu/keymaps/mk \
- ${datadir}/qemu-xen/qemu/keymaps/pt-br \
- ${datadir}/qemu-xen/qemu/keymaps/tr \
- ${datadir}/qemu-xen/qemu/keymaps/sv \
- ${datadir}/qemu-xen/qemu/keymaps/fi \
- ${datadir}/qemu-xen/qemu/keymaps/en-us \
- ${datadir}/qemu-xen/qemu/keymaps/et \
- ${datadir}/qemu-xen/qemu/keymaps/nl-be \
- ${datadir}/qemu-xen/qemu/keymaps/pt \
- ${bindir}/qemu-nbd-xen \
- ${bindir}/qemu-img-xen \
- "
-
-FILES_${PN}-remus = "\
- ${bindir}/remus \
- "
-
-FILES_${PN}-scripts-network = " \
- ${sysconfdir}/xen/scripts/network-bridge \
- ${sysconfdir}/xen/scripts/network-nat \
- ${sysconfdir}/xen/scripts/network-route \
- ${sysconfdir}/xen/scripts/qemu-ifup \
- ${sysconfdir}/xen/scripts/vif2 \
- ${sysconfdir}/xen/scripts/vif-bridge \
- ${sysconfdir}/xen/scripts/vif-common.sh \
- ${sysconfdir}/xen/scripts/vif-nat \
- ${sysconfdir}/xen/scripts/vif-openvswitch \
- ${sysconfdir}/xen/scripts/vif-route \
- ${sysconfdir}/xen/scripts/vif-setup \
- "
-
-FILES_${PN}-scripts-block = " \
- ${sysconfdir}/xen/scripts/blktap \
- ${sysconfdir}/xen/scripts/block \
- ${sysconfdir}/xen/scripts/block-common.sh \
- ${sysconfdir}/xen/scripts/block-enbd \
- ${sysconfdir}/xen/scripts/block-iscsi \
- ${sysconfdir}/xen/scripts/block-nbd \
- ${sysconfdir}/xen/scripts/vscsi \
- "
-
-FILES_${PN}-scripts-common = " \
- ${sysconfdir}/xen/scripts/external-device-migrate \
- ${sysconfdir}/xen/scripts/hotplugpath.sh \
- ${sysconfdir}/xen/scripts/locking.sh \
- ${sysconfdir}/xen/scripts/logging.sh \
- ${sysconfdir}/xen/scripts/xen-hotplug-cleanup \
- ${sysconfdir}/xen/scripts/xen-hotplug-common.sh \
- ${sysconfdir}/xen/scripts/xen-network-common.sh \
- ${sysconfdir}/xen/scripts/xen-script-common.sh \
- "
-
-FILES_${PN}-udev = "\
- ${sysconfdir}/udev/rules.d/xen-backend.rules \
- ${sysconfdir}/udev/rules.d/xend.rules \
- "
-
-FILES_${PN}-xcutils = "\
- ${libdir}/xen/bin/lsevtchn \
- ${libdir}/xen/bin/readnotes \
- ${libdir}/xen/bin/xc_restore \
- ${libdir}/xen/bin/xc_save \
- "
-
-FILES_${PN}-xend-examples = "\
- ${sysconfdir}/xen/xend-config.sxp \
- ${sysconfdir}/xen/xend-pci-permissive.sxp \
- ${sysconfdir}/xen/xend-pci-quirks.sxp \
- "
-
-FILES_${PN}-xenpaging = "\
- ${libdir}/xen/bin/xenpaging \
- ${localstatedir}/lib/xen/xenpaging \
- "
-
-FILES_${PN}-xenpmd = "\
- ${sbindir}/xenpmd \
- "
-
-FILES_${PN}-xenstat = "\
- ${sbindir}/xentop \
- "
-
-FILES_${PN}-xenstore = "\
- ${bindir}/xenstore \
- ${bindir}/xenstore-chmod \
- ${bindir}/xenstore-control \
- ${bindir}/xenstore-exists \
- ${bindir}/xenstore-list \
- ${bindir}/xenstore-ls \
- ${bindir}/xenstore-read \
- ${bindir}/xenstore-rm \
- ${bindir}/xenstore-watch \
- ${bindir}/xenstore-write \
- "
-
-FILES_${PN}-xenstored = "\
- ${sbindir}/xenstored \
- ${localstatedir}/lib/xenstored \
- "
-
-FILES_${PN}-xentrace = "\
- ${bindir}/xentrace \
- ${bindir}/xentrace_format \
- ${bindir}/xentrace_setsize \
- ${libdir}/xen/bin/xenctx \
- "
-
-FILES_${PN}-xen-watchdog = "\
- ${sbindir}/xenwatchdogd \
- "
-
-FILES_${PN}-xl = "\
- ${sysconfdir}/bash_completion.d/xl.sh \
- ${sysconfdir}/xen/xl.conf \
- ${libdir}/xen/bin/libxl-save-helper \
- ${sbindir}/xl \
- "
-
-FILES_${PN}-xl-examples = "\
- ${sysconfdir}/xen/xlexample.hvm \
- ${sysconfdir}/xen/xlexample.pvlinux \
- "
-
-FILES_${PN}-xm-examples = "\
- ${sysconfdir}/xen/xmexample1 \
- ${sysconfdir}/xen/xmexample2 \
- ${sysconfdir}/xen/xmexample3 \
- ${sysconfdir}/xen/xmexample.hvm \
- ${sysconfdir}/xen/xmexample.hvm-stubdom \
- ${sysconfdir}/xen/xmexample.nbd \
- ${sysconfdir}/xen/xmexample.pv-grub \
- ${sysconfdir}/xen/xmexample.vti \
- "
-
-FILES_${PN}-xenmon = "\
- ${sbindir}/xenbaked \
- ${sbindir}/xentrace_setmask \
- ${sbindir}/xenmon.py \
- "
-
-FILES_${PN}-xm = "\
- ${sysconfdir}/xen/xm-config.xml \
- ${datadir}/xen/create.dtd \
- ${sbindir}/xm \
- "
-
-FILES_${PN}-xencommons += "${sysconfdir}/init.d/xencommons"
-FILES_${PN}-xend += " \
- ${sysconfdir}/init.d/xend \
- ${sbindir}/xend \
- "
-FILES_${PN}-xendomains += "${sysconfdir}/init.d/xendomains"
-FILES_${PN}-xen-watchdog += "${sysconfdir}/init.d/xen-watchdog"
-
-# configure init.d scripts
-INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xencommons ${PN}-xen-watchdog ${PN}-xendomains"
-INITSCRIPT_NAME_${PN}-xencommons = "xencommons"
-INITSCRIPT_PARAMS_${PN}-xencommons = "defaults 80"
-INITSCRIPT_NAME_${PN}-xen-watchdog = "xen-watchdog"
-INITSCRIPT_PARAMS_${PN}-xen-watchdog = "defaults 81"
-INITSCRIPT_NAME_${PN}-xend = "xend"
-INITSCRIPT_PARAMS_${PN}-xend = "defaults 82"
-INITSCRIPT_NAME_${PN}-xendomains = "xendomains"
-INITSCRIPT_PARAMS_${PN}-xendomains = "defaults 83"
-
-#### REQUIRED ENVIRONMENT VARIABLES ####
-export BUILD_SYS
-export HOST_SYS
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-# specify xen hypervisor to target x86_64 (x86_32 not supported)
-export XEN_TARGET_ARCH="x86_64"
-export XEN_COMPILE_ARCH="x86_64"
-
-# this is used for the header (#!${bindir}/python) of the install python scripts
-export PYTHONPATH="${bindir}/python"
-
-# seabios forcefully sets HOSTCC to CC - fixup to allow it to build native conf executable
-export HOSTCC="${BUILD_CC}"
-
-# make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure
-export CROSS_COMPILE="${TARGET_PREFIX}"
-
-# overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'"
-export LDFLAGS=""
-
-EXTRA_OECONF += " \
- --exec-prefix=/usr \
- --prefix=/usr \
- --host=${HOST_SYS} \
- --disable-stubdom \
- --disable-ioemu-stubdom \
- --disable-pv-grub \
- --disable-xenstore-stubdom \
-"
-
-do_configure() {
- # fixup qemu-xen-traditional pciutils check hardcoded to test ${includedir}/pci
+do_configure_prepend() {
+ # fixup qemu-xen-traditional pciutils check hardcoded to test /usr/include/pci
sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g' ${S}/tools/qemu-xen-traditional/xen-hooks.mak
# fixup for qemu to cross compile
sed -i 's/configure --d/configure --cross-prefix=${TARGET_PREFIX} --d/g' ${S}/tools/qemu-xen-traditional/xen-setup
-
- # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu
- test -d ${S}/tools/include/gnu || mkdir ${S}/tools/include/gnu
- if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
- cat ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h | grep -v stub_bdflush | grep -v stub_getmsg | grep -v stub_putmsg > ${S}/tools/include/gnu/stubs-32.h
- echo \#define __stub___kernel_cosl >> ${S}/tools/include/gnu/stubs-32.h
- echo \#define __stub___kernel_sinl >> ${S}/tools/include/gnu/stubs-32.h
- echo \#define __stub___kernel_tanl >> ${S}/tools/include/gnu/stubs-32.h
- fi
-
- # do configure
- oe_runconf
-
- # seabios needs a patch to specify correct compiler - pull and patch Makefile
- make -C ${S}/tools/firmware seabios-dir
- sed -i 's/export HOSTCC.*$(CC)/export HOSTCC ?= $(CC)/g' ${S}/tools/firmware/seabios-dir/Makefile
-}
-
-do_compile() {
- oe_runmake
-}
-
-do_install() {
- oe_runmake DESTDIR="${D}" install
-
- # remove installed volatiles
- rm -rf ${D}${localstatedir}/run ${D}${localstatedir}/lock ${D}${localstatedir}/log ${D}${localstatedir}/volatile
-
- # install volatiles using populate_volatiles mechanism
- install -d ${D}${sysconfdir}/default/volatiles
- echo "d root root 0755 ${localstatedir}/run/xenstored none" \
- > ${D}${sysconfdir}/default/volatiles/99_xen
- echo "d root root 0755 ${localstatedir}/run/xend none" \
- >> ${D}${sysconfdir}/default/volatiles/99_xen
- echo "d root root 0755 ${localstatedir}/run/xend/boot none" \
- >> ${D}${sysconfdir}/default/volatiles/99_xen
- echo "d root root 0755 ${localstatedir}/run/xen none" \
- >> ${D}${sysconfdir}/default/volatiles/99_xen
- echo "d root root 0755 ${localstatedir}/log/xen none" \
- >> ${D}${sysconfdir}/default/volatiles/99_xen
- echo "d root root 0755 ${localstatedir}/lock/xen none" \
- >> ${D}${sysconfdir}/default/volatiles/99_xen
- echo "d root root 0755 ${localstatedir}/lock/subsys none" \
- >> ${D}${sysconfdir}/default/volatiles/99_xen
-
- # workaround for xendomains script which searchs sysconfig if directory exists
- install -d ${D}${sysconfdir}/sysconfig
- ln -sf ${sysconfdir}/default/xendomains ${D}${sysconfdir}/sysconfig/xendomains
-}
-
-pkg_postinst_${PN}-base() {
- if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
- ${sysconfdir}/init.d/populate-volatile.sh update
- fi
-}
-
-sysroot_stage_all_append() {
- sysroot_stage_dir ${D}/boot ${SYSROOT_DESTDIR}/kernel
-
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 ${D}/boot/xen.gz ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz
}
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 10/10] xen: add xen_git recipe.
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (6 preceding siblings ...)
2013-11-08 4:01 ` [PATCH v2 09/10] xen: improve organization with new xen.inc Chris Patterson
@ 2013-11-08 4:01 ` Chris Patterson
2013-11-08 18:35 ` Philip Tricca
2013-11-08 12:50 ` [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
2013-11-11 20:50 ` Bruce Ashfield
9 siblings, 1 reply; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 4:01 UTC (permalink / raw)
To: meta-virtualization
Added recipe for xen unstable from git repository.
Moved now empty xen-flask and xen-libblktap packages from
required dependencies from xen.inc into xen_4.3.1.bb.
Signed-off-by: Chris Patterson <cjp256@gmail.com>
---
recipes-extended/xen/xen.inc | 2 --
recipes-extended/xen/xen_4.3.1.bb | 5 +++++
recipes-extended/xen/xen_git.bb | 18 ++++++++++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 recipes-extended/xen/xen_git.bb
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index fff3dc1..9d43814 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -35,9 +35,7 @@ RDEPENDS_${PN}-base = "\
${PN}-libvhd \
${PN}-libxenstat \
${PN}-libxenstore \
- ${PN}-libblktap \
${PN}-libfsimage \
- ${PN}-flask \
${PN}-fsimage \
${PN}-hvmloader \
${PN}-scripts-block \
diff --git a/recipes-extended/xen/xen_4.3.1.bb b/recipes-extended/xen/xen_4.3.1.bb
index 46563ce..2c9806b 100644
--- a/recipes-extended/xen/xen_4.3.1.bb
+++ b/recipes-extended/xen/xen_4.3.1.bb
@@ -10,6 +10,11 @@ SRC_URI[sha256sum] = "3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d
S = "${WORKDIR}/xen-${PV}"
+RDEPENDS_${PN}-base += "\
+ ${PN}-libblktap \
+ ${PN}-flask \
+ "
+
do_configure_prepend() {
# fixup qemu-xen-traditional pciutils check hardcoded to test /usr/include/pci
sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g' ${S}/tools/qemu-xen-traditional/xen-hooks.mak
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
new file mode 100644
index 0000000..f333157
--- /dev/null
+++ b/recipes-extended/xen/xen_git.bb
@@ -0,0 +1,18 @@
+require xen.inc
+
+SRCREV = "68bd172e6fa565899c846eb72755c8ffd8562c8a"
+
+PV = "4.4.0+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+SRC_URI = " \
+ git://xenbits.xen.org/xen.git \
+ "
+
+DEFAULT_PREFERENCE = "-1"
+
+PACKAGES += "${PN}-xen-mfndump"
+
+FILES_${PN}-xen-mfndump = "${sbindir}/xen-mfndump"
+
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2 10/10] xen: add xen_git recipe.
2013-11-08 4:01 ` [PATCH v2 10/10] xen: add xen_git recipe Chris Patterson
@ 2013-11-08 18:35 ` Philip Tricca
2013-11-08 21:38 ` Chris Patterson
0 siblings, 1 reply; 14+ messages in thread
From: Philip Tricca @ 2013-11-08 18:35 UTC (permalink / raw)
To: Chris Patterson; +Cc: meta-virtualization
Can I get you to explain the reason for removing libblktap and flask
from RDEPENDS in xen.inc? Other than that the patch set looks good to
me. Deleting stuff is a very good thing :)
- Philip
On 11/07/2013 11:01 PM, Chris Patterson wrote:
> Added recipe for xen unstable from git repository.
>
> Moved now empty xen-flask and xen-libblktap packages from
> required dependencies from xen.inc into xen_4.3.1.bb.
>
> Signed-off-by: Chris Patterson <cjp256@gmail.com>
> ---
> recipes-extended/xen/xen.inc | 2 --
> recipes-extended/xen/xen_4.3.1.bb | 5 +++++
> recipes-extended/xen/xen_git.bb | 18 ++++++++++++++++++
> 3 files changed, 23 insertions(+), 2 deletions(-)
> create mode 100644 recipes-extended/xen/xen_git.bb
>
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index fff3dc1..9d43814 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -35,9 +35,7 @@ RDEPENDS_${PN}-base = "\
> ${PN}-libvhd \
> ${PN}-libxenstat \
> ${PN}-libxenstore \
> - ${PN}-libblktap \
> ${PN}-libfsimage \
> - ${PN}-flask \
> ${PN}-fsimage \
> ${PN}-hvmloader \
> ${PN}-scripts-block \
> diff --git a/recipes-extended/xen/xen_4.3.1.bb b/recipes-extended/xen/xen_4.3.1.bb
> index 46563ce..2c9806b 100644
> --- a/recipes-extended/xen/xen_4.3.1.bb
> +++ b/recipes-extended/xen/xen_4.3.1.bb
> @@ -10,6 +10,11 @@ SRC_URI[sha256sum] = "3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d
>
> S = "${WORKDIR}/xen-${PV}"
>
> +RDEPENDS_${PN}-base += "\
> + ${PN}-libblktap \
> + ${PN}-flask \
> + "
> +
> do_configure_prepend() {
> # fixup qemu-xen-traditional pciutils check hardcoded to test /usr/include/pci
> sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g' ${S}/tools/qemu-xen-traditional/xen-hooks.mak
> diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
> new file mode 100644
> index 0000000..f333157
> --- /dev/null
> +++ b/recipes-extended/xen/xen_git.bb
> @@ -0,0 +1,18 @@
> +require xen.inc
> +
> +SRCREV = "68bd172e6fa565899c846eb72755c8ffd8562c8a"
> +
> +PV = "4.4.0+git${SRCPV}"
> +
> +S = "${WORKDIR}/git"
> +
> +SRC_URI = " \
> + git://xenbits.xen.org/xen.git \
> + "
> +
> +DEFAULT_PREFERENCE = "-1"
> +
> +PACKAGES += "${PN}-xen-mfndump"
> +
> +FILES_${PN}-xen-mfndump = "${sbindir}/xen-mfndump"
> +
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v2 10/10] xen: add xen_git recipe.
2013-11-08 18:35 ` Philip Tricca
@ 2013-11-08 21:38 ` Chris Patterson
2013-11-10 0:51 ` Philip Tricca
0 siblings, 1 reply; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 21:38 UTC (permalink / raw)
To: Philip Tricca; +Cc: meta-virtualization@yoctoproject.org
[-- Attachment #1: Type: text/plain, Size: 2821 bytes --]
Both are no longer built by default: libblktap is for blktap1, and flask is
now only built if you have xsm enabled.
On Fri, Nov 8, 2013 at 1:35 PM, Philip Tricca <flihp@twobit.us> wrote:
> Can I get you to explain the reason for removing libblktap and flask
> from RDEPENDS in xen.inc? Other than that the patch set looks good to
> me. Deleting stuff is a very good thing :)
>
> - Philip
>
> On 11/07/2013 11:01 PM, Chris Patterson wrote:
> > Added recipe for xen unstable from git repository.
> >
> > Moved now empty xen-flask and xen-libblktap packages from
> > required dependencies from xen.inc into xen_4.3.1.bb.
> >
> > Signed-off-by: Chris Patterson <cjp256@gmail.com>
> > ---
> > recipes-extended/xen/xen.inc | 2 --
> > recipes-extended/xen/xen_4.3.1.bb | 5 +++++
> > recipes-extended/xen/xen_git.bb | 18 ++++++++++++++++++
> > 3 files changed, 23 insertions(+), 2 deletions(-)
> > create mode 100644 recipes-extended/xen/xen_git.bb
> >
> > diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> > index fff3dc1..9d43814 100644
> > --- a/recipes-extended/xen/xen.inc
> > +++ b/recipes-extended/xen/xen.inc
> > @@ -35,9 +35,7 @@ RDEPENDS_${PN}-base = "\
> > ${PN}-libvhd \
> > ${PN}-libxenstat \
> > ${PN}-libxenstore \
> > - ${PN}-libblktap \
> > ${PN}-libfsimage \
> > - ${PN}-flask \
> > ${PN}-fsimage \
> > ${PN}-hvmloader \
> > ${PN}-scripts-block \
> > diff --git a/recipes-extended/xen/xen_4.3.1.bb b/recipes-extended/xen/
> xen_4.3.1.bb
> > index 46563ce..2c9806b 100644
> > --- a/recipes-extended/xen/xen_4.3.1.bb
> > +++ b/recipes-extended/xen/xen_4.3.1.bb
> > @@ -10,6 +10,11 @@ SRC_URI[sha256sum] =
> "3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d
> >
> > S = "${WORKDIR}/xen-${PV}"
> >
> > +RDEPENDS_${PN}-base += "\
> > + ${PN}-libblktap \
> > + ${PN}-flask \
> > + "
> > +
> > do_configure_prepend() {
> > # fixup qemu-xen-traditional pciutils check hardcoded to test
> /usr/include/pci
> > sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g'
> ${S}/tools/qemu-xen-traditional/xen-hooks.mak
> > diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/
> xen_git.bb
> > new file mode 100644
> > index 0000000..f333157
> > --- /dev/null
> > +++ b/recipes-extended/xen/xen_git.bb
> > @@ -0,0 +1,18 @@
> > +require xen.inc
> > +
> > +SRCREV = "68bd172e6fa565899c846eb72755c8ffd8562c8a"
> > +
> > +PV = "4.4.0+git${SRCPV}"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +SRC_URI = " \
> > + git://xenbits.xen.org/xen.git \
> > + "
> > +
> > +DEFAULT_PREFERENCE = "-1"
> > +
> > +PACKAGES += "${PN}-xen-mfndump"
> > +
> > +FILES_${PN}-xen-mfndump = "${sbindir}/xen-mfndump"
> > +
> >
>
>
[-- Attachment #2: Type: text/html, Size: 4311 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v2 10/10] xen: add xen_git recipe.
2013-11-08 21:38 ` Chris Patterson
@ 2013-11-10 0:51 ` Philip Tricca
0 siblings, 0 replies; 14+ messages in thread
From: Philip Tricca @ 2013-11-10 0:51 UTC (permalink / raw)
To: Chris Patterson; +Cc: meta-virtualization@yoctoproject.org
On 11/08/2013 04:38 PM, Chris Patterson wrote:
> Both are no longer built by default: libblktap is for blktap1, and flask
> is now only built if you have xsm enabled.
Gotcha. LGTM.
- Philip
> On Fri, Nov 8, 2013 at 1:35 PM, Philip Tricca <flihp@twobit.us
> <mailto:flihp@twobit.us>> wrote:
>
> Can I get you to explain the reason for removing libblktap and flask
> from RDEPENDS in xen.inc? Other than that the patch set looks good to
> me. Deleting stuff is a very good thing :)
>
> - Philip
>
> On 11/07/2013 11:01 PM, Chris Patterson wrote:
> > Added recipe for xen unstable from git repository.
> >
> > Moved now empty xen-flask and xen-libblktap packages from
> > required dependencies from xen.inc into xen_4.3.1.bb
> <http://xen_4.3.1.bb>.
> >
> > Signed-off-by: Chris Patterson <cjp256@gmail.com
> <mailto:cjp256@gmail.com>>
> > ---
> > recipes-extended/xen/xen.inc | 2 --
> > recipes-extended/xen/xen_4.3.1.bb <http://xen_4.3.1.bb> | 5 +++++
> > recipes-extended/xen/xen_git.bb <http://xen_git.bb> | 18
> ++++++++++++++++++
> > 3 files changed, 23 insertions(+), 2 deletions(-)
> > create mode 100644 recipes-extended/xen/xen_git.bb
> <http://xen_git.bb>
> >
> > diff --git a/recipes-extended/xen/xen.inc
> b/recipes-extended/xen/xen.inc
> > index fff3dc1..9d43814 100644
> > --- a/recipes-extended/xen/xen.inc
> > +++ b/recipes-extended/xen/xen.inc
> > @@ -35,9 +35,7 @@ RDEPENDS_${PN}-base = "\
> > ${PN}-libvhd \
> > ${PN}-libxenstat \
> > ${PN}-libxenstore \
> > - ${PN}-libblktap \
> > ${PN}-libfsimage \
> > - ${PN}-flask \
> > ${PN}-fsimage \
> > ${PN}-hvmloader \
> > ${PN}-scripts-block \
> > diff --git a/recipes-extended/xen/xen_4.3.1.bb
> <http://xen_4.3.1.bb> b/recipes-extended/xen/xen_4.3.1.bb
> <http://xen_4.3.1.bb>
> > index 46563ce..2c9806b 100644
> > --- a/recipes-extended/xen/xen_4.3.1.bb <http://xen_4.3.1.bb>
> > +++ b/recipes-extended/xen/xen_4.3.1.bb <http://xen_4.3.1.bb>
> > @@ -10,6 +10,11 @@ SRC_URI[sha256sum] =
> "3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d
> >
> > S = "${WORKDIR}/xen-${PV}"
> >
> > +RDEPENDS_${PN}-base += "\
> > + ${PN}-libblktap \
> > + ${PN}-flask \
> > + "
> > +
> > do_configure_prepend() {
> > # fixup qemu-xen-traditional pciutils check hardcoded to test
> /usr/include/pci
> > sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g'
> ${S}/tools/qemu-xen-traditional/xen-hooks.mak
> > diff --git a/recipes-extended/xen/xen_git.bb <http://xen_git.bb>
> b/recipes-extended/xen/xen_git.bb <http://xen_git.bb>
> > new file mode 100644
> > index 0000000..f333157
> > --- /dev/null
> > +++ b/recipes-extended/xen/xen_git.bb <http://xen_git.bb>
> > @@ -0,0 +1,18 @@
> > +require xen.inc
> > +
> > +SRCREV = "68bd172e6fa565899c846eb72755c8ffd8562c8a"
> > +
> > +PV = "4.4.0+git${SRCPV}"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +SRC_URI = " \
> > + git://xenbits.xen.org/xen.git <http://xenbits.xen.org/xen.git> \
> > + "
> > +
> > +DEFAULT_PREFERENCE = "-1"
> > +
> > +PACKAGES += "${PN}-xen-mfndump"
> > +
> > +FILES_${PN}-xen-mfndump = "${sbindir}/xen-mfndump"
> > +
> >
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 00/10] xen cleanup and upgrades
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (7 preceding siblings ...)
2013-11-08 4:01 ` [PATCH v2 10/10] xen: add xen_git recipe Chris Patterson
@ 2013-11-08 12:50 ` Chris Patterson
2013-11-11 20:50 ` Bruce Ashfield
9 siblings, 0 replies; 14+ messages in thread
From: Chris Patterson @ 2013-11-08 12:50 UTC (permalink / raw)
To: meta-virtualization@yoctoproject.org
[-- Attachment #1: Type: text/plain, Size: 3535 bytes --]
Bounce messages say patches 2 & 8 are subject to moderator approval.
For future reference, it states a limit of 40 KB in the message body.
Cheers,
-Chris
On Thu, Nov 7, 2013 at 11:00 PM, Chris Patterson <cjp256@gmail.com> wrote:
> Cleaned out old xen bits, upgraded to 4.3.1, moved to common xen.inc,
> and added git recipe pointing to xen-unstable.
>
> I broke out the cleanup into smaller patches in hopes that it will make it
> through.
>
> If not, you can find these patches in branch=xen-upgrades-and-cleanup-v2
> at:
> https://github.com/cjp256/meta-virtualization.git
>
> Chris Patterson (10):
> xen: remove xsm from default PACKAGECONFIG options.
> xen: remove 4.1.2 recipe and patches
> xen: remove xen-hg recipe and patches
> xen: remove xen-rt recipe and patches
> xen: remove old xen.inc and xen-python.inc
> xen: remove old patches
> xen: rename xen patches directory from xen-4.3.0 to files.
> xen: upgrade to 4.3.1
> xen: improve organization with new xen.inc
> xen: add xen_git recipe.
>
> .../xen/files/allow_disable_xend.patch | 75 -
> ...lask-avoid-installing-policy-file-as-boot.patch | 26 +
> .../xen/files/ioemu-cross-gl-check.patch | 29 -
> recipes-extended/xen/files/xend-config.sxp | 304 -
> recipes-extended/xen/files/xenminiinit.sh | 59 -
> .../xen/xen-4.1.2/allow_disable_xend.patch | 75 -
> ...lask-avoid-installing-policy-file-as-boot.patch | 26 -
> 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 -
> recipes-extended/xen/xen-python.inc | 49 -
> recipes-extended/xen/xen-rt/rt-xen_0.3_4.0.1.patch | 6785
> --------------------
> recipes-extended/xen/xen-rt_4.0.1.bb | 25 -
> recipes-extended/xen/xen.inc | 902 ++-
> recipes-extended/xen/xen_4.1.2.bb | 24 -
> recipes-extended/xen/xen_4.3.0.bb | 650 --
> recipes-extended/xen/xen_4.3.1.bb | 24 +
> recipes-extended/xen/xen_git.bb | 18 +
> 18 files changed, 677 insertions(+), 8500 deletions(-)
> delete mode 100644 recipes-extended/xen/files/allow_disable_xend.patch
> create mode 100644
> recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
> delete mode 100644 recipes-extended/xen/files/ioemu-cross-gl-check.patch
> delete mode 100644 recipes-extended/xen/files/xend-config.sxp
> delete mode 100755 recipes-extended/xen/files/xenminiinit.sh
> delete mode 100644 recipes-extended/xen/xen-4.1.2/allow_disable_xend.patch
> delete mode 100644
> recipes-extended/xen/xen-4.3.0/flask-avoid-installing-policy-file-as-boot.patch
> 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
> delete mode 100644 recipes-extended/xen/xen-python.inc
> delete mode 100644 recipes-extended/xen/xen-rt/rt-xen_0.3_4.0.1.patch
> delete mode 100644 recipes-extended/xen/xen-rt_4.0.1.bb
> delete mode 100644 recipes-extended/xen/xen_4.1.2.bb
> delete mode 100644 recipes-extended/xen/xen_4.3.0.bb
> create mode 100644 recipes-extended/xen/xen_4.3.1.bb
> create mode 100644 recipes-extended/xen/xen_git.bb
>
> --
> 1.8.4.rc3
>
>
[-- Attachment #2: Type: text/html, Size: 4706 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v2 00/10] xen cleanup and upgrades
2013-11-08 4:00 [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
` (8 preceding siblings ...)
2013-11-08 12:50 ` [PATCH v2 00/10] xen cleanup and upgrades Chris Patterson
@ 2013-11-11 20:50 ` Bruce Ashfield
9 siblings, 0 replies; 14+ messages in thread
From: Bruce Ashfield @ 2013-11-11 20:50 UTC (permalink / raw)
To: Chris Patterson; +Cc: meta-virtualization@yoctoproject.org
On Thu, Nov 7, 2013 at 11:00 PM, Chris Patterson <cjp256@gmail.com> wrote:
> Cleaned out old xen bits, upgraded to 4.3.1, moved to common xen.inc,
> and added git recipe pointing to xen-unstable.
>
> I broke out the cleanup into smaller patches in hopes that it will make it through.
>
> If not, you can find these patches in branch=xen-upgrades-and-cleanup-v2 at:
> https://github.com/cjp256/meta-virtualization.git
>
The series looks fine to me. I've pulled it in locally and will push the changes
shortly.
Bruce
> Chris Patterson (10):
> xen: remove xsm from default PACKAGECONFIG options.
> xen: remove 4.1.2 recipe and patches
> xen: remove xen-hg recipe and patches
> xen: remove xen-rt recipe and patches
> xen: remove old xen.inc and xen-python.inc
> xen: remove old patches
> xen: rename xen patches directory from xen-4.3.0 to files.
> xen: upgrade to 4.3.1
> xen: improve organization with new xen.inc
> xen: add xen_git recipe.
>
> .../xen/files/allow_disable_xend.patch | 75 -
> ...lask-avoid-installing-policy-file-as-boot.patch | 26 +
> .../xen/files/ioemu-cross-gl-check.patch | 29 -
> recipes-extended/xen/files/xend-config.sxp | 304 -
> recipes-extended/xen/files/xenminiinit.sh | 59 -
> .../xen/xen-4.1.2/allow_disable_xend.patch | 75 -
> ...lask-avoid-installing-policy-file-as-boot.patch | 26 -
> 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 -
> recipes-extended/xen/xen-python.inc | 49 -
> recipes-extended/xen/xen-rt/rt-xen_0.3_4.0.1.patch | 6785 --------------------
> recipes-extended/xen/xen-rt_4.0.1.bb | 25 -
> recipes-extended/xen/xen.inc | 902 ++-
> recipes-extended/xen/xen_4.1.2.bb | 24 -
> recipes-extended/xen/xen_4.3.0.bb | 650 --
> recipes-extended/xen/xen_4.3.1.bb | 24 +
> recipes-extended/xen/xen_git.bb | 18 +
> 18 files changed, 677 insertions(+), 8500 deletions(-)
> delete mode 100644 recipes-extended/xen/files/allow_disable_xend.patch
> create mode 100644 recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
> delete mode 100644 recipes-extended/xen/files/ioemu-cross-gl-check.patch
> delete mode 100644 recipes-extended/xen/files/xend-config.sxp
> delete mode 100755 recipes-extended/xen/files/xenminiinit.sh
> delete mode 100644 recipes-extended/xen/xen-4.1.2/allow_disable_xend.patch
> delete mode 100644 recipes-extended/xen/xen-4.3.0/flask-avoid-installing-policy-file-as-boot.patch
> 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
> delete mode 100644 recipes-extended/xen/xen-python.inc
> delete mode 100644 recipes-extended/xen/xen-rt/rt-xen_0.3_4.0.1.patch
> delete mode 100644 recipes-extended/xen/xen-rt_4.0.1.bb
> delete mode 100644 recipes-extended/xen/xen_4.1.2.bb
> delete mode 100644 recipes-extended/xen/xen_4.3.0.bb
> create mode 100644 recipes-extended/xen/xen_4.3.1.bb
> create mode 100644 recipes-extended/xen/xen_git.bb
>
> --
> 1.8.4.rc3
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 14+ messages in thread