* [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/, app-emulation/xen-tools/files/
@ 2012-03-30 9:07 Alexey Shvetsov
0 siblings, 0 replies; 2+ messages in thread
From: Alexey Shvetsov @ 2012-03-30 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 60503bd0d8239357a75fb04cb48edb9ff71f22d7
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 09:06:52 2012 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 09:06:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=60503bd0
[app-emulation/xen-tools] Fixes for live version from Daniel Heemann
(Portage version: 2.2.0_alpha94/git/Linux x86_64, unsigned Manifest commit)
---
.../xen-tools/files/xen-tools-9999-qemu.patch | 56 ++++++++++++++++++++
app-emulation/xen-tools/xen-tools-9999.ebuild | 16 +++++-
2 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch b/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch
new file mode 100644
index 0000000..2059d6c
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch
@@ -0,0 +1,56 @@
+diff -uNr a/tools/Makefile b/tools/Makefile
+--- a/tools/Makefile 2012-03-10 07:19:16.000000000 +0100
++++ b/tools/Makefile 2012-03-12 17:19:04.000000000 +0100
+@@ -118,11 +118,17 @@
+ $(GIT) reset --hard $(QEMU_TAG); \
+ fi
+
+-subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
++subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
+ set -e; \
+ $(buildmakevars2shellvars); \
+ cd qemu-xen-traditional-dir; \
+ $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \
++ $(MAKE)
++
++subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
++ set -e; \
++ $(buildmakevars2shellvars); \
++ cd qemu-xen-traditional-dir; \
+ $(MAKE) install
+
+ subdir-clean-qemu-xen-traditional-dir:
+@@ -140,14 +146,14 @@
+ $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \
+ fi
+
+-subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
++subdir-all-qemu-xen-dir: qemu-xen-dir-find
+ if test -d $(QEMU_UPSTREAM_URL) ; then \
+ source=$(QEMU_UPSTREAM_URL); \
+ else \
+ source=.; \
+ fi; \
+ cd qemu-xen-dir; \
+- $$source/configure --enable-xen --target-list=i386-softmmu \
++ CFLAGS="" $$source/configure --enable-xen --target-list=i386-softmmu \
+ --source-path=$$source \
+ --extra-cflags="-I$(XEN_ROOT)/tools/include \
+ -I$(XEN_ROOT)/tools/libxc \
+@@ -156,8 +162,16 @@
+ -L$(XEN_ROOT)/tools/xenstore" \
+ --bindir=$(LIBEXEC) \
+ --disable-kvm \
++ --disable-docs \
++ --datadir=$(DESTDIR)/usr/share/xen/qemu-upstream \
++ --sysconfdir=$(DESTDIR)/etc/xen/qemu-upstream \
+ --python=$(PYTHON) \
+ $(IOEMU_CONFIGURE_CROSS); \
++ sed -i 's#$$(sysconfdir)/qemu#$$(sysconfdir)#' Makefile; \
++ $(MAKE)
++
++subdir-install-qemu-xen-dir: qemu-xen-dir-find
++ cd qemu-xen-dir; \
+ $(MAKE) install
+
+ subdir-clean-qemu-xen-dir:
diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
index 452628a..8c70104 100644
--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild
@@ -93,7 +93,7 @@ RESTRICT="test"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
- export "CONFIG_LOMOUNT=y"
+ export "CONFIG_TESTS=n"
if use qemu; then
export "CONFIG_IOEMU=y"
@@ -182,6 +182,16 @@ src_prepare() {
-e 's:^\tfi:#\tfi:' -i \
-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
-i tools/firmware/etherboot/Makefile || die
+
+ # Patch tools/Makefile to build/install qemu & qemu-upstream correctly
+ epatch "${FILESDIR}/${PN}-9999-qemu.patch"
+}
+
+src_configure() {
+ econf \
+ --enable-lomount \
+ BISON=/usr/bin/bison \
+ FLEX=/usr/bin/flex
}
src_compile() {
@@ -241,8 +251,8 @@ src_install() {
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd xenstored \
- "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xenstored.initd xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/, app-emulation/xen-tools/files/
@ 2012-11-23 10:23 Ian Delaney
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney @ 2012-11-23 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 931fc09547869064f6b186fb50a30e1e67d9ea49
Author: Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au>
AuthorDate: Sat Nov 24 02:22:50 2012 +0000
Commit: Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au>
CommitDate: Sat Nov 24 02:22:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=931fc095
Added jserver.patch, fixes QA issue in build, tested
Package-Manager: portage-2.1.11.30
---
.../xen-tools/files/ipxe-nopie-4.2.0.patch | 28 --------------------
.../xen-tools/files/xen-4.2.0-jserver.patch | 20 ++++++++++++++
.../xen-tools/files/xen-4.2.0-nostrip.patch | 17 ------------
app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild | 5 +++-
4 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch b/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch
deleted file mode 100644
index f21b44d..0000000
--- a/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-10-22 Ralf Glauberman <ralfglauberman@gmx.de>
-
- #360805 Don't compile ipxe with pie on hardened.
- * /tools/firmware/etherboot/patches/ipxe-nopie.patche New patch
- * /tools/firmware/etherboot/patches/series Add ipxe-nopie.patch
-
---- a/tools/firmware/etherboot/patches/ipxe-nopie.patch 1970-01-01 01:00:00.000000000 +0100
-+++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch 2011-03-27 17:45:13.929697782 +0200
-@@ -0,0 +1,11 @@
-+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200
-++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200
-+@@ -4,7 +4,7 @@
-+ #
-+
-+ CLEANUP :=
-+-CFLAGS :=
-++CFLAGS := -nopie
-+ ASFLAGS :=
-+ LDFLAGS :=
-+ MAKEDEPS := Makefile
---- a/tools/firmware/etherboot/patches/series 2011-03-25 11:42:50.000000000 +0100
-+++ b/tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200
-@@ -1,4 +1,5 @@
- boot_prompt_option.patch
- build_fix_1.patch
- build_fix_2.patch
- build_fix_3.patch
-+ipxe-nopie.patch
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch
new file mode 100644
index 0000000..d42080c
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch
@@ -0,0 +1,20 @@
+diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile
+--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800
++++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800
+@@ -14,13 +14,13 @@
+ .PHONY: blowfish.h
+ blowfish.h:
+ rm -f blowfish.bin
+- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
++ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all
+ (echo "static unsigned int blowfish32_code[] = {"; \
+ od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
+ echo "};") >$@
+ rm -f blowfish.bin
+ ifeq ($(XEN_COMPILE_ARCH),x86_64)
+- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
++ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all
+ (echo "static unsigned int blowfish64_code[] = {"; \
+ od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
+ echo "};") >>$@
+
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch
index 1ef1555..de06279 100644
--- a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch
+++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch
@@ -35,20 +35,3 @@ diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/
endif
ifdef CONFIG_TRACE_SYSTEMTAP
ifdef CONFIG_TRACE_SYSTEMTAP
-#diff -ur xen-4.2.0.orig/Makefile xen-4.2.0/Makefile
-#--- Makefile 2012-09-17 18:21:17.000000000 +0800
-#+++ Makefile 2012-11-22 09:09:45.080624651 +0800
-#@@ -62,11 +62,11 @@
-#
-# .PHONY: install-xen
-# install-xen:
-#- $(MAKE) -C xen install
-#+ +$(MAKE) -C xen install
-#
-# .PHONY: install-tools
-# install-tools:
-#- $(MAKE) -C tools install
-#+ +$(MAKE) -C tools install
-#
-# ifeq ($(CONFIG_IOEMU),y)
-# install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir
diff --git a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
index 7ee1dc5..b426ab7 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
@@ -191,11 +191,14 @@ src_prepare() {
# Don't build ipxe with pie on hardened, Bug #360805
if gcc-specs-pie; then
- epatch "${FILESDIR}/ipxe-nopie-4.2.0.patch"
+ epatch "${FILESDIR}/ipxe-nopie.patch"
fi
# Prevent double stripping of files at install
epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch
+
+ # fix jobserver in Makefile
+ epatch "${FILESDIR}"/${P/-tools/}-jserver.patch
}
src_compile() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-23 10:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-23 10:23 [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/, app-emulation/xen-tools/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2012-03-30 9:07 Alexey Shvetsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox