Bastian Blank
2012-Jun-18 19:43 UTC
[Pkg-xen-changes] r1042 - in trunk/xen/debian: . patches templates
Author: waldi
Date: Mon Jun 18 19:43:47 2012
New Revision: 1042
Log:
* debian/changelog: Set version to 4.2~hg-20120617.32034d1914a6-1.
* debian/libxenstore3.0.symbols: Add new symbols.
* debian/libxen-dev.install: Install new xenstore headers.
* debian/patches: Update patches.
* debian/rules.real
- Use configure.
- Disable seabios build.
* debian/templates/control.source.in: Add new build-dependencies.
Added:
trunk/xen/debian/patches/config-etherboot.diff
trunk/xen/debian/patches/tools-firmware-seabios-packaged.diff
trunk/xen/debian/patches/tools-xenstat-abiname.diff
Deleted:
trunk/xen/debian/patches/docs-texlive.patch
trunk/xen/debian/patches/qemu-disable.diff
trunk/xen/debian/patches/qemu-prefix.diff
trunk/xen/debian/patches/tools-blktap2-link.diff
trunk/xen/debian/patches/tools-blktap2-optimize.diff
trunk/xen/debian/patches/tools-flask-abiname.diff
trunk/xen/debian/patches/tools-libxl-link.diff
trunk/xen/debian/patches/tools-libxl-sxp.diff
trunk/xen/debian/patches/upstream-23936:cdb34816a40a-rework
trunk/xen/debian/patches/upstream-23937:5173834e8476
trunk/xen/debian/patches/upstream-23938:fa04fbd56521-rework
trunk/xen/debian/patches/upstream-23939:51288f69523f-rework
trunk/xen/debian/patches/upstream-23940:187d59e32a58
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/libxen-dev.install
trunk/xen/debian/libxenstore3.0.symbols
trunk/xen/debian/patches/config-prefix.diff
trunk/xen/debian/patches/docs-pdflatex.patch
trunk/xen/debian/patches/series
trunk/xen/debian/patches/tools-blktap2-prefix.diff
trunk/xen/debian/patches/tools-console-prefix.diff
trunk/xen/debian/patches/tools-disable.diff
trunk/xen/debian/patches/tools-examples-xend-disable-network.diff
trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff
trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff
trunk/xen/debian/patches/tools-hotplug-udevrules.diff
trunk/xen/debian/patches/tools-libfsimage-abiname.diff
trunk/xen/debian/patches/tools-libxc-abiname.diff
trunk/xen/debian/patches/tools-libxl-abiname.diff
trunk/xen/debian/patches/tools-libxl-nopidfile.diff
trunk/xen/debian/patches/tools-libxl-prefix.diff
trunk/xen/debian/patches/tools-misc-prefix.diff
trunk/xen/debian/patches/tools-misc-rpath.diff
trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
trunk/xen/debian/patches/tools-python-rpath.diff
trunk/xen/debian/patches/tools-python-xen-relative-path.diff
trunk/xen/debian/patches/tools-rpath.diff
trunk/xen/debian/patches/tools-xcutils-rpath.diff
trunk/xen/debian/patches/tools-xenmon-install.diff
trunk/xen/debian/patches/tools-xenmon-prefix.diff
trunk/xen/debian/patches/tools-xenmon-rpath.diff
trunk/xen/debian/patches/tools-xenpaging-prefix.diff
trunk/xen/debian/patches/tools-xenstat-prefix.diff
trunk/xen/debian/patches/tools-xenstat-rpath.diff
trunk/xen/debian/patches/tools-xenstore-compatibility.diff
trunk/xen/debian/patches/tools-xenstore-prefix.diff
trunk/xen/debian/patches/tools-xentrace-prefix.diff
trunk/xen/debian/patches/tools-xentrace-rpath.diff
trunk/xen/debian/patches/version.patch
trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff
trunk/xen/debian/rules.real
trunk/xen/debian/templates/control.source.in
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/changelog Mon Jun 18 19:43:47 2012 (r1042)
@@ -1,3 +1,11 @@
+xen (4.2~hg-20120617.32034d1914a6-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Build-depend against libglib2.0-dev and libyajl-dev.
+ * Disable seabios build for now.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 13 May 2012 12:21:10 +0000
+
xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-3) UNRELEASED; urgency=low
* Remove /usr/lib/xen-default.
Modified: trunk/xen/debian/libxen-dev.install
=============================================================================---
trunk/xen/debian/libxen-dev.install Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/libxen-dev.install Mon Jun 18 19:43:47 2012 (r1042)
@@ -6,8 +6,8 @@
usr/lib/libxenstore.so
usr/include/xenctrl.h
usr/include/xenguest.h
-usr/include/xs.h
-usr/include/xs_lib.h
+usr/include/xenstore*.h
+usr/include/xenstore-compat/xs* usr/include
usr/include/xentoollog.h
usr/include/xenctrlosdep.h
usr/include/xen
Modified: trunk/xen/debian/libxenstore3.0.symbols
=============================================================================---
trunk/xen/debian/libxenstore3.0.symbols Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/libxenstore3.0.symbols Mon Jun 18 19:43:47 2012 (r1042)
@@ -3,6 +3,7 @@
sanitise_value at Base 3.2.0
unsanitise_value at Base 3.2.0
xprintf at Base 3.2.0
+ xs_check_watch at Base 4.2~
xs_close at Base 4.1.0~rc6
xs_count_strings at Base 3.2.0
xs_daemon_close at Base 3.2.0
@@ -25,6 +26,7 @@
xs_is_domain_introduced at Base 3.2.0
xs_mkdir at Base 3.2.0
xs_open at Base 4.1.0~rc6
+ xs_path_is_subpath at Base 4.2~
xs_perm_to_string at Base 3.2.0
xs_read at Base 3.2.0
xs_read_watch at Base 3.2.0
Added: trunk/xen/debian/patches/config-etherboot.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/config-etherboot.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -0,0 +1,11 @@
+--- a/Config.mk
++++ b/Config.mk
+@@ -206,7 +206,7 @@
+ # Sun Mar 11 09:27:07 2012 -0400
+ # Update version to 1.6.3.2
+
+-ETHERBOOT_NICS ?= rtl8139 8086100e
++ETHERBOOT_NICS ?= rtl8139 e1000_82540
+
+ # Specify which qemu-dm to use. This may be `ioemu'' to use the old
+ # Mercurial in-tree version, or a local directory, or a git URL.
Modified: trunk/xen/debian/patches/config-prefix.diff
=============================================================================---
trunk/xen/debian/patches/config-prefix.diff Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/config-prefix.diff Mon Jun 18 19:43:47 2012 (r1042)
@@ -1,6 +1,6 @@
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
-@@ -26,22 +26,19 @@
+@@ -32,22 +32,19 @@
PREFIX ?= /usr
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
@@ -45,7 +45,7 @@
LDFLAGS_DIRECT += -melf_x86_64_obsd
--- a/Config.mk
+++ b/Config.mk
-@@ -49,14 +49,14 @@
+@@ -67,11 +67,11 @@
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
@@ -53,9 +53,6 @@
+EXTRA_LIB += $(EXTRA_LIBDIR)
endif
- BISON ?= bison
- FLEX ?= flex
-
PYTHON ?= python
-PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
+PYTHON_PREFIX_ARG ?= --home="$(PRIVATE_PREFIX)"
Modified: trunk/xen/debian/patches/docs-pdflatex.patch
=============================================================================---
trunk/xen/debian/patches/docs-pdflatex.patch Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/docs-pdflatex.patch Mon Jun 18 19:43:47 2012
(r1042)
@@ -10,130 +10,6 @@
LATEX2HTML := latex2html
DOXYGEN := doxygen
POD2MAN := pod2man
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -11,28 +11,24 @@
- DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(DOC_MAN1SRC))
- DOC_MAN5 := $(patsubst man/%.pod.5,man5/%.5,$(DOC_MAN5SRC))
- DOC_TEX := src/user.tex src/interface.tex
--DOC_PS := $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX))
--DOC_PDF := $(patsubst src/%.tex,pdf/%.pdf,$(DOC_TEX))
-+DOC_PDF := $(patsubst src/%.tex,%.pdf,$(DOC_TEX))
- DOC_HTML := $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX))
-
--GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
-+GFX = $(patsubst %.eps, %.pdf, $(wildcard figs/*.eps))
-
- .PHONY: all
- all: build
-
- .PHONY: build
--build: ps pdf html man-pages
-+build: pdf html man-pages
- @if which $(DOT) 1>/dev/null 2>/dev/null ; then \
- $(MAKE) -C xen-api build ; else \
- echo "Graphviz (dot) not installed; skipping xen-api." ; fi
-- rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
-+ rm -f *.aux *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
-
- .PHONY: dev-docs
- dev-docs: python-dev-docs
-
--.PHONY: ps
--ps: $(DOC_PS)
--
- .PHONY: pdf
- pdf: $(DOC_PDF)
-
-@@ -68,9 +64,9 @@
- .PHONY: clean
- clean:
- $(MAKE) -C xen-api clean
-- rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~
-- rm -rf *.ilg *.log *.ind *.toc *.bak core
-- rm -rf $(GFX) ps pdf html
-+ rm -rf .word_count *.aux *.bbl *.blg *.glo *.idx *~
-+ rm -rf *.ilg *.log *.ind *.pdf *.toc *.bak core
-+ rm -rf $(GFX) html
- rm -rf api
- rm -rf man5
- rm -rf man1
-@@ -85,29 +81,18 @@
-
- $(MAKE) -C xen-api install
-
-- cp -dR ps $(DESTDIR)$(DOCDIR)
-- cp -dR pdf $(DESTDIR)$(DOCDIR)
-+ cp -dR *.pdf $(DESTDIR)$(DOCDIR)
- $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
- cp -dR man1 $(DESTDIR)$(MANDIR)
- cp -dR man5 $(DESTDIR)$(MANDIR)
- [ ! -d html ] || cp -dR html $(DESTDIR)$(DOCDIR)
-
--pdf/%.pdf: ps/%.ps
-- $(INSTALL_DIR) $(@D)
-- $(PS2PDF) $< $@.new
-- mv $@.new $@
--
--ps/%.ps: %.dvi
-- $(INSTALL_DIR) $(@D)
-- $(DVIPS) -Ppdf -G0 -o $@.new $<
-- mv $@.new $@
--
--%.dvi: src/%.tex $(GFX)
-- $(LATEX) $< >/dev/null
-- if [ -e $*.toc ] ; then $(LATEX) $< >/dev/null ; fi
-+%.pdf: src/%.tex $(GFX)
-+ $(PDFLATEX) $<
-+ if [ -e $*.toc ] ; then $(PDFLATEX) $< ; fi
-
--%.eps: %.fig
-- $(FIG2DEV) -L eps $< $@
-+%.pdf: %.eps
-+ $(EPSTOPDF) $<
-
- html/%/index.html: src/%.tex
- $(INSTALL_DIR) $(@D)
---- a/docs/src/interface.tex
-+++ b/docs/src/interface.tex
-@@ -13,7 +13,7 @@
- \pagestyle{empty}
- \begin{center}
- \vspace*{\fill}
--\includegraphics{figs/xenlogo.eps}
-+\includegraphics{figs/xenlogo}
- \vfill
- \vfill
- \vfill
---- a/docs/src/user.tex
-+++ b/docs/src/user.tex
-@@ -16,7 +16,7 @@
- \pagestyle{empty}
- \begin{center}
- \vspace*{\fill}
--\includegraphics{figs/xenlogo.eps}
-+\includegraphics{figs/xenlogo}
- \vfill
- \vfill
- \vfill
-@@ -2143,7 +2143,7 @@
-
- \begin{figure}
- \centering
--\includegraphics[width=13cm]{figs/acm_overview.eps}
-+\includegraphics[width=13cm]{figs/acm_overview}
- \caption{Overview of activating sHype workload protection in Xen.
- Section numbers point to representative examples.}
- \label{fig:acmoverview}
-@@ -2309,7 +2309,7 @@
-
- \begin{figure}[htb]
- \centering
--\includegraphics[width=13cm]{figs/acm_ezpolicy_gui.eps}
-+\includegraphics[width=13cm]{figs/acm_ezpolicy_gui}
- \caption{Final layout including workload definition and Run-time Exclusion
rules.}
- \label{fig:acmezpolicy}
- \end{figure}
--- a/docs/xen-api/Makefile
+++ b/docs/xen-api/Makefile
@@ -6,35 +6,30 @@
Modified: trunk/xen/debian/patches/series
=============================================================================---
trunk/xen/debian/patches/series Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/series Mon Jun 18 19:43:47 2012 (r1042)
@@ -1,29 +1,20 @@
-upstream-23936:cdb34816a40a-rework
-upstream-23937:5173834e8476
-upstream-23938:fa04fbd56521-rework
-upstream-23939:51288f69523f-rework
-upstream-23940:187d59e32a58
-
xen-x86-interrupt-pointer-missmatch.diff
version.patch
docs-pdflatex.patch
-docs-texlive.patch
-tools-blktap2-link.diff
-tools-blktap2-optimize.diff
-tools-flask-abiname.diff
+config-etherboot.diff
+config-prefix.diff
+
tools-libfsimage-abiname.diff
tools-libxc-abiname.diff
tools-libxl-abiname.diff
-tools-libxl-link.diff
+tools-xenstat-abiname.diff
-config-prefix.diff
tools-rpath.diff
tools-blktap2-prefix.diff
tools-console-prefix.diff
-tools-flask-prefix.diff
tools-libfsimage-prefix.diff
tools-libfsimage-rpath.diff
tools-libxl-prefix.diff
@@ -42,7 +33,6 @@
tools-xenstore-rpath.diff
tools-xentrace-prefix.diff
tools-xentrace-rpath.diff
-qemu-prefix.diff
tools-python-xen-relative-path.diff
tools-misc-xend-startup.diff
@@ -52,7 +42,7 @@
tools-examples-xend-disable-network.diff
tools-examples-xend-disable-relocation.diff
tools-firmware-etherboot-packaged.diff
-qemu-disable.diff
+#tools-firmware-seabios-packaged.diff
tools-pygrub-remove-static-solaris-support.patch
@@ -64,6 +54,5 @@
tools-python-shebang.diff
-tools-libxl-sxp.diff
-tools-ocaml-fix-build.diff
+#tools-ocaml-fix-build.diff
tools-xenstore-compatibility.diff
Modified: trunk/xen/debian/patches/tools-blktap2-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-blktap2-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-blktap2-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -10,7 +10,7 @@
CFLAGS += -fPIC
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
-@@ -2,15 +2,9 @@
+@@ -2,26 +2,20 @@
BLKTAP_ROOT := ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -23,11 +23,10 @@
-LIBVHD-BUILD := libvhd.a
-
-INST-DIR = $(LIBDIR)
-+LIBVHD-BUILD := libvhd.so
-
+-
CFLAGS += -Werror
CFLAGS += -Wno-unused
-@@ -18,10 +12,12 @@
+ CFLAGS += -I../../include
CFLAGS += -D_GNU_SOURCE
CFLAGS += -fPIC
CFLAGS += -g
@@ -38,39 +37,42 @@
endif
+LDFLAGS += $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH)
- # Get gcc to generate the dependencies for us.
- CFLAGS += -Wp,-MD,.$(@F).d
-@@ -48,24 +44,22 @@
- LIB-OBJS = $(patsubst %.c,%.o,$(LIB-SRCS))
- LIB-OBJS += $(LVM-UTIL-OBJ)
+ ifeq ($(CONFIG_LIBICONV),y)
+ LIBS += -liconv
+@@ -51,27 +45,23 @@
+
+ LIB-PICOBJS = $(patsubst %.o,%.opic,$(LIB-OBJS))
-LIBVHD = libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
+LIBVHD = libvhd.a libvhd.so
all: build
--build: $(LIBVHD-BUILD)
-+build: $(LIBVHD)
-+
-+libvhd.so: $(LIB-OBJS)
-+ $(CC) $(CFLAGS) $(SHLIB_LDFLAGS) \
-+ $(LDFLAGS) -o $@ $(LIBS) $^
+-build: libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
++build: libvhd.a libvhd.so
libvhd.a: $(LIB-OBJS)
-- $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \
-- $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(LIBS) $^
+ $(AR) rc $@ $^
+
+-libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR): $(LIB-PICOBJS)
+- $(CC) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \
+- $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS)
- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR)
- ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so
- $(AR) rc $@ $^
++libvhd.so: $(LIB-PICOBJS)
++ $(CC) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) \
++ $(LDFLAGS) -o $@ $^ $(LIBS)
install: all
$(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
- $(INSTALL_PROG) $(LIBVHD) $(DESTDIR)$(INST-DIR)
+ $(INSTALL_PROG) libvhd.a $(DESTDIR)$(INST-DIR)
+- $(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
$(DESTDIR)$(INST-DIR)
- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
$(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
- ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
++ $(INSTALL_PROG) libvhd.so $(DESTDIR)$(INST-DIR)
clean:
- rm -rf *.a *.so* *.o *~ $(DEPS) $(LIBVHD)
+ rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -1,10 +1,7 @@
@@ -84,7 +86,7 @@
IBIN = tap-ctl
-@@ -41,35 +38,29 @@
+@@ -38,39 +35,32 @@
PICS = $(CTL_PICS)
LIB_STATIC = $(LIBNAME).a
@@ -103,22 +105,22 @@
- ln -sf $< $@
-
tap-ctl: tap-ctl.o $(LIBNAME).so
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^
$(LIB_STATIC): $(CTL_OBJS)
$(AR) r $@ $^
$(LIB_SHARED): $(CTL_PICS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME)
$(SHLIB_LDFLAGS) -rdynamic $^ -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@
+- $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME)
$(SHLIB_LDFLAGS) -rdynamic $^ -o $@
++ $(CC) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@
install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
- $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
- $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_SBINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(IBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_SBINDIR)
+ $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
- $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR)
@@ -128,3 +130,7 @@
clean:
rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+- rm -f $(LIBNAME).so $(LIBSONAME)
+ rm -f *~
+
+ .PHONY: all build clean install
Modified: trunk/xen/debian/patches/tools-console-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-console-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-console-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,13 +1,13 @@
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
-@@ -11,6 +11,7 @@
- LDLIBS += $(UTIL_LIBS)
+@@ -8,6 +8,7 @@
+ LDLIBS += $(LDLIBS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenstore)
LDLIBS += $(SOCKET_LIBS)
- LDLIBS += -lrt
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
- BIN = xenconsoled xenconsole
-
+ LDLIBS_xenconsoled += $(UTIL_LIBS)
+ LDLIBS_xenconsoled += -lrt
@@ -30,9 +31,7 @@
.PHONY: install
Modified: trunk/xen/debian/patches/tools-disable.diff
=============================================================================---
trunk/xen/debian/patches/tools-disable.diff Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-disable.diff Mon Jun 18 19:43:47 2012 (r1042)
@@ -1,22 +1,32 @@
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -19,9 +19,7 @@
- SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
- SUBDIRS-$(VTPM_TOOLS) += vtpm
+@@ -1,10 +1,6 @@
+ XEN_ROOT = $(CURDIR)/..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-ifneq ($(CONFIG_SYSTEM_LIBAIO),y)
+-SUBDIRS-libaio := libaio
+-endif
+-
+ SUBDIRS-y :+ SUBDIRS-y += include
+ SUBDIRS-y += libxc
+@@ -23,7 +19,6 @@
SUBDIRS-y += xenstat
--SUBDIRS-$(CONFIG_Linux) += libaio
+ SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio)
SUBDIRS-$(CONFIG_Linux) += memshr
-SUBDIRS-$(CONFIG_Linux) += blktap
SUBDIRS-$(CONFIG_Linux) += blktap2
- SUBDIRS-$(CONFIG_NetBSD) += libaio
+ SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio)
SUBDIRS-$(CONFIG_NetBSD) += blktap2
-@@ -31,8 +29,11 @@
+@@ -34,9 +29,12 @@
# do not recurse in to a dir we are about to delete
ifneq "$(MAKECMDGOALS)" "distclean"
+CONFIG_QEMU = $(CURDIR)/../qemu
+ifneq ($(wildcard $(CONFIG_QEMU)),)
- SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
+ SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
+ SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
endif
+endif
Modified: trunk/xen/debian/patches/tools-examples-xend-disable-network.diff
=============================================================================---
trunk/xen/debian/patches/tools-examples-xend-disable-network.diff Sun Jun 17
22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-examples-xend-disable-network.diff Mon Jun 18
19:43:47 2012 (r1042)
@@ -1,6 +1,6 @@
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
-@@ -130,6 +130,11 @@
+@@ -132,6 +132,11 @@
#(console-limit 1024)
##
@@ -12,7 +12,7 @@
# To bridge network traffic, like this:
#
# dom0: ----------------- bridge -> real eth0 -> the network
-@@ -154,7 +159,6 @@
+@@ -170,7 +175,6 @@
# two fake interfaces per guest domain. To do things like this, write
# yourself a wrapper script, and call network-bridge from it, as appropriate.
#
Modified: trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff
=============================================================================---
trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff Sun Jun 17
22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-examples-xend-disable-relocation.diff Mon Jun
18 19:43:47 2012 (r1042)
@@ -8,7 +8,7 @@
#(xend-relocation-ssl-server no)
#(xend-udev-event-server no)
-@@ -124,7 +123,6 @@
+@@ -126,7 +125,6 @@
# (xend-relocation-hosts-allow ''^localhost$
^.*\\.example\\.org$'')
#
#(xend-relocation-hosts-allow '''')
Modified: trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff
=============================================================================---
trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff Sun Jun 17
22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-firmware-etherboot-packaged.diff Mon Jun 18
19:43:47 2012 (r1042)
@@ -1,65 +1,31 @@
---- a/tools/firmware/etherboot/Makefile
-+++ b/tools/firmware/etherboot/Makefile
-@@ -14,50 +14,19 @@
+--- a/tools/firmware/Makefile
++++ b/tools/firmware/Makefile
+@@ -10,7 +10,6 @@
+ SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
+ SUBDIRS-$(CONFIG_ROMBIOS) += rombios
+ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
+-SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
+ SUBDIRS-y += hvmloader
- IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
-
--D=ipxe
--T=ipxe.tar.gz
--
--ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(NICS)))
-+ROMS = $(addprefix /usr/lib/ipxe/, $(addsuffix .rom, $(NICS)))
-
- .NOTPARALLEL:
-
- .PHONY: all
- all: eb-roms.h
-
--%.rom: $D/src/arch/i386/Makefile
-- $(MAKE) -C $D/src bin/$(*F).rom
--
--eb-roms.h.new: $(ROMS)
-+eb-roms.h: $(ROMS)
- cat $^ | ../hvmloader/mkhex etherboot >$@
+ ovmf:
+@@ -46,9 +45,6 @@
+ .PHONY: distclean
+ distclean: subdirs-distclean
--eb-roms.h: Config
-- $(MAKE) NO_WERROR=1 $@.new
-- mv -f $@.new $@
--
--$T:
-- if ! wget -O _$T $(IPXE_TARBALL_URL); then \
-- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
-- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
-- $(IPXE_GIT_TAG) | gzip >../_$T); \
-- rm -rf $D.git; \
-- fi
-- mv _$T $T
--
--$D/src/arch/i386/Makefile: $T Config
-- rm -rf $D
-- gzip -dc $T | tar xf -
-- for i in $$(cat patches/series) ; do \
-- patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
-- done
-- cat Config >>$@
+-subdir-distclean-etherboot: .phony
+- $(MAKE) -C etherboot distclean
-
--$D/src/bin/NIC: $D/src/arch/i386/Makefile
-- $(MAKE) -C $D/src bin/NIC
--
- .PHONY: clean
- clean:
-- rm -rf $D $D.git *~ eb-roms.h _$T
-+ rm -rf *~ eb-roms.h
-
- .PHONY: distclean
- distclean: clean
-- rm -rf $T
---- a/tools/firmware/etherboot/Config
-+++ b/tools/firmware/etherboot/Config
-@@ -1,5 +1,5 @@
+ subdir-distclean-ovmf: .phony
+ rm -rf ovmf ovmf-remote
--NICS = rtl8139 8086100e
-+NICS = rtl8139 e1000_82540
+--- a/tools/firmware/hvmloader/Makefile
++++ b/tools/firmware/hvmloader/Makefile
+@@ -48,7 +48,7 @@
+ else
+ CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
+ endif
+-ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom,
$(ETHERBOOT_NICS)))
++ETHERBOOT_ROMS := $(addprefix /usr/lib/ipxe/, $(addsuffix .rom,
$(ETHERBOOT_NICS)))
+ endif
- CFLAGS += -UPXE_DHCP_STRICT
- CFLAGS += -DPXE_DHCP_STRICT
+ ROMS :=
Added: trunk/xen/debian/patches/tools-firmware-seabios-packaged.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-firmware-seabios-packaged.diff Mon Jun 18
19:43:47 2012 (r1042)
@@ -0,0 +1,40 @@
+--- a/tools/firmware/Makefile
++++ b/tools/firmware/Makefile
+@@ -7,7 +7,6 @@
+
+ SUBDIRS-y :+ SUBDIRS-$(CONFIG_OVMF) += ovmf
+-SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
+ SUBDIRS-$(CONFIG_ROMBIOS) += rombios
+ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
+ SUBDIRS-y += hvmloader
+@@ -48,9 +47,6 @@
+ subdir-distclean-ovmf: .phony
+ rm -rf ovmf ovmf-remote
+
+-subdir-distclean-seabios-dir: .phony
+- rm -rf seabios-dir seabios-dir-remote
+-
+ .PHONY: ovmf-find
+ ovmf-find:
+ if test -d $(OVMF_UPSTREAM_URL) ; then \
+--- a/tools/firmware/hvmloader/Makefile
++++ b/tools/firmware/hvmloader/Makefile
+@@ -39,7 +39,7 @@
+
+ OVMF_DIR := ../ovmf
+ ROMBIOS_DIR := ../rombios
+-SEABIOS_DIR := ../seabios-dir
++SEABIOS_DIR := /usr/share/seabios
+
+ ifeq ($(CONFIG_ROMBIOS),y)
+ STDVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.bin
+@@ -70,7 +70,7 @@
+ ifeq ($(CONFIG_SEABIOS),y)
+ OBJS += seabios.o
+ CFLAGS += -DENABLE_SEABIOS
+-SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin
++SEABIOS_ROM := $(SEABIOS_DIR)/bios.bin
+ ROMS += $(SEABIOS_ROM)
+ endif
+
Modified: trunk/xen/debian/patches/tools-hotplug-udevrules.diff
=============================================================================---
trunk/xen/debian/patches/tools-hotplug-udevrules.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-hotplug-udevrules.diff Mon Jun 18 19:43:47
2012 (r1042)
@@ -11,4 +11,4 @@
-KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
-KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
-KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m",
MODE="0600"
--SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add",
RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
+-SUBSYSTEM=="net", KERNEL=="vif*-emu",
ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION}
type_if=tap"
Modified: trunk/xen/debian/patches/tools-libfsimage-abiname.diff
=============================================================================---
trunk/xen/debian/patches/tools-libfsimage-abiname.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-libfsimage-abiname.diff Mon Jun 18 19:43:47
2012 (r1042)
@@ -10,7 +10,7 @@
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
LDFLAGS = $(LDFLAGS-y)
-@@ -12,7 +9,7 @@
+@@ -15,7 +12,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
@@ -19,7 +19,7 @@
.PHONY: all
all: $(LIB)
-@@ -21,9 +18,7 @@
+@@ -24,9 +21,7 @@
install: all
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -30,7 +30,7 @@
$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
-@@ -31,13 +26,8 @@
+@@ -34,13 +29,8 @@
clean distclean:
rm -f $(PIC_OBJS) $(LIB) $(DEPS)
@@ -40,9 +40,9 @@
- ln -sf $< $@
-
-libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR)
$(SHLIB_LDFLAGS) -o $@ $^ -lpthread
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR)
$(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
+libfsimage.so: $(PIC_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lpthread
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^
$(PTHREAD_LIBS)
-include $(DEPS)
Modified: trunk/xen/debian/patches/tools-libxc-abiname.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxc-abiname.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-libxc-abiname.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -4,22 +4,13 @@
XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
--MAJOR = 4.0
+-MAJOR = 4.2
-MINOR = 0
-
CTRL_SRCS-y : CTRL_SRCS-y += xc_core.c
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -77,8 +74,6 @@
- # libraries.
- #CFLAGS += -DVALGRIND -O0 -ggdb3
-
--LDFLAGS += -L.
--
- CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y))
- CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y))
-
-@@ -90,12 +85,12 @@
+@@ -96,12 +93,12 @@
LIB := libxenctrl.a
ifneq ($(stubdom),y)
@@ -34,7 +25,7 @@
endif
ifneq ($(stubdom),y)
-@@ -116,15 +111,13 @@
+@@ -122,15 +119,13 @@
install: build
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -54,7 +45,7 @@
$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
.PHONY: TAGS
-@@ -153,22 +146,18 @@
+@@ -159,22 +154,18 @@
libxenctrl.a: $(CTRL_LIB_OBJS)
$(AR) rc $@ $^
@@ -65,9 +56,9 @@
ln -sf $< $@
-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR)
$(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
+- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG)
-Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS)
$(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+libxenctrl-$(XEN_VERSION).so: $(CTRL_PIC_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname=$@ $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o
$@ $^ $(PTHREAD_LIBS)
++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS)
-o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
# libxenguest
@@ -81,21 +72,16 @@
ln -sf $< $@
ifeq ($(CONFIG_MiniOS),y)
-@@ -193,12 +182,12 @@
+@@ -186,9 +177,9 @@
xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
-libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl
$(PTHREAD_LIBS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR)
$(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz
$(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+libxenguest-$(XEN_VERSION).so: COMPRESSION_LIBS = $(call zlib-options,l)
+libxenguest-$(XEN_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(XEN_VERSION).so
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname=$@ $(SHLIB_LDFLAGS) -o $@ $^
$(COMPRESSION_LIBS) -lz $(PTHREAD_LIBS)
-
--xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
-- $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS)
-lxenctrl
-+xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl-$(XEN_VERSION).so
-+ $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^
-
- -include $(DEPS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@
$(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS)
$(APPEND_LDFLAGS)
+ xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
+ $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS)
$(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
Modified: trunk/xen/debian/patches/tools-libxl-abiname.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxl-abiname.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-libxl-abiname.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -4,18 +4,18 @@
XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
--MAJOR = 1.0
+-MAJOR = 2.0
-MINOR = 0
-
-XLUMAJOR = 1.0
-XLUMINOR = 0
-
- CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations
+ CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
+ -Wno-declaration-after-statement -Wformat-nonliteral
CFLAGS += -I. -fPIC
- CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
$(CFLAGS_libblktapctl)
-@@ -74,26 +68,14 @@
- mv __libxl_$*.h _libxl_$*.h
- mv __libxl_$*.c _libxl_$*.c
+@@ -131,26 +125,14 @@
+ $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h)
+ $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c)
-libxenlight.so: libxenlight.so.$(MAJOR)
- ln -sf $< $@
@@ -24,9 +24,9 @@
- ln -sf $< $@
-
-libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR)
$(SHLIB_LDFLAGS) -o $@ $^
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR)
$(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+libxenlight.so: $(LIBXL_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^
$(LIBXL_LIBS) $(APPEND_LDFLAGS)
libxenlight.a: $(LIBXL_OBJS)
$(AR) rcs libxenlight.a $^
@@ -38,15 +38,15 @@
- ln -sf $< $@
-
-libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR)
$(SHLIB_LDFLAGS) -o $@ $^
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR)
$(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS)
+libxlutil.so: $(LIBXLU_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^
$(LIBXLU_LIBS) $(APPEND_LDFLAGS)
libxlutil.a: $(LIBXLU_OBJS)
$(AR) rcs libxlutil.a $^
-@@ -108,13 +90,9 @@
- $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+@@ -169,13 +151,9 @@
$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
$(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
- $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
- ln -sf libxenlight.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
@@ -58,5 +58,5 @@
- ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so
+ $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR)
$(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_DATA) libxl.h _libxl_types.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h
_libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h
$(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
Modified: trunk/xen/debian/patches/tools-libxl-nopidfile.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxl-nopidfile.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-libxl-nopidfile.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,29 +1,29 @@
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
-@@ -43,20 +43,12 @@
-
- int libxl_ctx_init(libxl_ctx *ctx, int version, xentoollog_logger *lg)
+@@ -25,7 +25,6 @@
+ unsigned flags, xentoollog_logger * lg)
{
+ libxl_ctx *ctx = NULL;
- struct stat stat_buf;
--
- if (version != LIBXL_VERSION)
- return ERROR_VERSION;
- memset(ctx, 0, sizeof(libxl_ctx));
- ctx->lg = lg;
- memset(&ctx->version_info, 0, sizeof(libxl_version_info));
+ int rc;
+
+ if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; }
+@@ -79,12 +78,6 @@
+ rc = libxl__poller_init(ctx, &ctx->poller_app);
+ if (rc) goto out;
- if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon
running?\n"
- "failed to stat %s", XENSTORE_PID_FILE);
-- return ERROR_FAIL;
+- rc = ERROR_FAIL; goto out;
- }
-
ctx->xch = xc_interface_open(lg,lg,0);
if (!ctx->xch) {
- LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
+ LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
-@@ -110,7 +110,6 @@
+@@ -347,7 +347,6 @@
#define AUTO_PHP_SLOT 0x100
#define SYSFS_PCI_DEV "/sys/bus/pci/devices"
#define SYSFS_PCIBACK_DRIVER "/sys/bus/pci/drivers/pciback"
Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxl-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-libxl-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,29 +1,32 @@
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
-@@ -16,6 +16,8 @@
- LDLIBS_XL += -luuid
- LDLIBS_LIBXL += -lutil
+@@ -12,6 +12,8 @@
+ ifeq ($(CONFIG_Linux),y)
+ LIBUUID_LIBS += -luuid
endif
+LDFLAGS_XL = $(call LDFLAGS_RPATH,../lib)
+LDFLAGS_LIBXL = $(call LDFLAGS_RPATH)
- LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o
- ifeq ($(LIBXL_BLKTAP),y)
-@@ -70,7 +72,7 @@
- mv __libxl_$*.c _libxl_$*.c
+ LIBXL_LIBS + LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
$(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS)
+@@ -126,7 +128,7 @@
+ $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c)
libxenlight.so: $(LIBXL_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_LIBXL) $(LDLIBS_LIBXL) $(SHLIB_LDFLAGS)
-o $@ $^
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^
$(LIBXL_LIBS) $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(LDFLAGS_LIBXL) $(SHLIB_LDFLAGS) -o
$@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
libxenlight.a: $(LIBXL_OBJS)
$(AR) rcs libxenlight.a $^
-@@ -82,18 +84,19 @@
+@@ -138,22 +140,23 @@
$(AR) rcs libxlutil.a $^
xl: $(XL_OBJS) libxlutil.so libxenlight.so
-- $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_XL)
-+ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $^ $(LDLIBS_XL)
+- $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight)
$(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $(XL_OBJS) libxlutil.so
$(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+
+ testidl: testidl.o libxlutil.so libxenlight.so
+ $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight)
$(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
.PHONY: install
install: all
@@ -33,6 +36,7 @@
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
- $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
- $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR)
@@ -41,5 +45,16 @@
- $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_DATA) libxl.h _libxl_types.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h
_libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h
$(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
+@@ -53,7 +53,7 @@
+ install: all
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+- $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(PRIVATE_LIBDIR)
+
+ PYLIB=bindings/swig/python/_xenstat.so
+ PYMOD=bindings/swig/python/xenstat.py
Modified: trunk/xen/debian/patches/tools-misc-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-misc-prefix.diff Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-misc-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,29 +1,37 @@
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
-@@ -37,10 +37,8 @@
+@@ -42,12 +42,8 @@
.PHONY: install
install: build
- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
- $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
-+ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN)
$(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN)
$(DESTDIR)$(PRIVATE_BINDIR)
set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
.PHONY: clean
--- a/tools/misc/lomount/Makefile
+++ b/tools/misc/lomount/Makefile
-@@ -16,7 +16,7 @@
+@@ -11,7 +11,7 @@
.PHONY: install
install install-recurse: build
-- $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
-+ $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PROG) lomount $(SCRIPTS) $(DESTDIR)$(BINDIR)
++ $(INSTALL_PROG) lomount $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
.PHONY: clean
clean:
+@@ -20,4 +20,4 @@
+ lomount: lomount.o
+ $(CC) $(CFLAGS) -o $@ $<
+
+--include $(DEPS)
+\ No newline at end of file
++-include $(DEPS)
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -33,6 +33,8 @@
Modified: trunk/xen/debian/patches/tools-misc-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-misc-rpath.diff Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-misc-rpath.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,11 +1,11 @@
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
-@@ -50,7 +50,7 @@
- $(CC) -c $(CFLAGS) -o $@ $<
+@@ -33,6 +33,8 @@
+ # Include configure output (config.h) to headers search path
+ CFLAGS += -I$(XEN_ROOT)/tools
- xen-hvmctx xen-hvmcrash xenperf xenpm gtracestat xenlockprof xen-hptool
xenwatchdogd: %: %.o Makefile
-- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl)
$(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
-+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl)
$(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib)
++APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
+ .PHONY: all
+ all: build
- gtraceview: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CURSES_LIBS)
Modified:
trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
=============================================================================---
trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch Sun
Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
Mon Jun 18 19:43:47 2012 (r1042)
@@ -8,7 +8,7 @@
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
-@@ -585,48 +584,6 @@
+@@ -622,51 +621,6 @@
return grubcfg
@@ -23,7 +23,8 @@
-# If nothing has been specified, look for a Solaris domU. If found, perform
the
-# necessary tweaks.
-def sniff_solaris(fs, cfg):
-- if not fs.file_exists("/platform/i86xpv/kernel/unix"):
+- if not fs.file_exists("/platform/i86xpv/kernel/unix") and \
+- not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
- return cfg
-
- if not cfg["kernel"]:
@@ -31,9 +32,11 @@
- fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
- cfg["kernel"] =
"/platform/i86xpv/kernel/amd64/unix"
- cfg["ramdisk"] =
"/platform/i86pc/amd64/boot_archive"
-- else:
+- elif fs.file_exists("/platform/i86xpv/kernel/unix"):
- cfg["kernel"] = "/platform/i86xpv/kernel/unix"
- cfg["ramdisk"] =
"/platform/i86pc/boot_archive"
+- else:
+- return cfg
-
- # Unpleasant. Typically we''ll have ''root=foo
-k'' or ''root=foo /kernel -k'',
- # and we need to maintain Xen properties (root= and ip=) and the kernel
@@ -57,7 +60,7 @@
def sniff_netware(fs, cfg):
if not fs.file_exists("/nwserver/xnloader.sys"):
return cfg
-@@ -751,10 +708,7 @@
+@@ -797,10 +751,7 @@
try:
fs = fsimage.open(file, offset, bootfsoptions)
Modified: trunk/xen/debian/patches/tools-python-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-python-rpath.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-python-rpath.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -6,77 +6,77 @@
extra_compile_args = [ "-fno-strict-aliasing", "-Werror"
]
+extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
- include_dirs = [ XEN_ROOT + "/tools/libxc",
- XEN_ROOT + "/tools/xenstore",
-@@ -37,6 +38,7 @@
+ PATH_XEN = XEN_ROOT + "/tools/include"
+ PATH_LIBXC = XEN_ROOT + "/tools/libxc"
+@@ -13,6 +14,7 @@
xc = Extension("xc",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -45,6 +47,7 @@
+ include_dirs = [ PATH_XEN, PATH_LIBXC,
"xen/lowlevel/xc" ],
+ library_dirs = [ PATH_LIBXC ],
+ libraries = [ "xenctrl",
"xenguest" ],
+@@ -21,6 +23,7 @@
xs = Extension("xs",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/xs" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -53,6 +56,7 @@
+ include_dirs = [ PATH_XEN, PATH_XENSTORE,
"xen/lowlevel/xs" ],
+ library_dirs = [ PATH_XENSTORE ],
+ libraries = [ "xenstore" ],
+@@ -29,6 +32,7 @@
scf = Extension("scf",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/scf" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -69,6 +73,7 @@
-
- acm = Extension("acm",
+ include_dirs = [ "xen/lowlevel/scf" ],
+ library_dirs = [ ],
+ libraries = [ ],
+@@ -37,6 +41,7 @@
+
+ process = Extension("process",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/acm" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -77,6 +82,7 @@
+ include_dirs = [ "xen/lowlevel/process" ],
+ library_dirs = [ ],
+ libraries = [ "contract" ],
+@@ -45,6 +50,7 @@
flask = Extension("flask",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/flask" ] +
- [
"../flask/libflask/include" ],
- library_dirs = library_dirs + [
"../flask/libflask" ],
-@@ -86,6 +92,7 @@
+ include_dirs = [ PATH_XEN, PATH_LIBXC,
"xen/lowlevel/flask" ],
+ library_dirs = [ PATH_LIBXC ],
+ libraries = [ "xenctrl" ],
+@@ -53,6 +59,7 @@
ptsname = Extension("ptsname",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [ "ptsname" ],
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -94,6 +101,7 @@
+ include_dirs = [ "ptsname" ],
+ library_dirs = [ ],
+ libraries = [ ],
+@@ -61,6 +68,7 @@
checkpoint = Extension("checkpoint",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs,
- library_dirs = library_dirs,
- libraries = libraries + [ "rt" ],
-@@ -103,6 +111,7 @@
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ PATH_XEN, PATH_LIBXC, PATH_XENSTORE ],
+ library_dirs = [ PATH_LIBXC, PATH_XENSTORE ],
+ libraries = [ "xenctrl",
"xenguest", "xenstore", "rt" ],
+@@ -72,6 +80,7 @@
netlink = Extension("netlink",
- extra_compile_args = extra_compile_args,
-+ extra_link_args = extra_link_args,
- include_dirs = include_dirs,
- library_dirs = library_dirs,
- libraries = libraries,
-@@ -112,6 +121,7 @@
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ ],
+ library_dirs = [ ],
+ libraries = [ ],
+@@ -81,6 +90,7 @@
xl = Extension("xl",
extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
- include_dirs = include_dirs + [
"xen/lowlevel/xl" ],
- library_dirs = library_dirs,
- libraries = libraries + ["xenlight" ] +
blktap_ctl_libs + uuid_libs,
+ include_dirs = [ PATH_XEN, PATH_LIBXL, PATH_LIBXC,
"xen/lowlevel/xl" ],
+ library_dirs = [ PATH_LIBXL ],
+ libraries = [ "xenlight" ],
Modified: trunk/xen/debian/patches/tools-python-xen-relative-path.diff
=============================================================================---
trunk/xen/debian/patches/tools-python-xen-relative-path.diff Sun Jun 17 22:00:57
2012 (r1041)
+++ trunk/xen/debian/patches/tools-python-xen-relative-path.diff Mon Jun 18
19:43:47 2012 (r1042)
@@ -1,6 +1,6 @@
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
-@@ -708,45 +708,39 @@
+@@ -713,45 +713,39 @@
return None
config_image = [ vals.builder ]
if vals.kernel:
@@ -56,7 +56,7 @@
else:
raise ValueError(''Cannot find loader
"%s"'' % vals.loader)
if vals.cmdline_ip:
-@@ -1076,7 +1070,7 @@
+@@ -1081,7 +1075,7 @@
args = [ ''acpi'', ''apic'',
''boot'',
''cpuid'', ''cpuid_check'',
@@ -65,7 +65,7 @@
''fda'', ''fdb'',
''gfx_passthru'',
''guest_os_type'',
''hap'', ''hpet'',
-@@ -1098,6 +1092,8 @@
+@@ -1103,6 +1097,8 @@
for a in args:
if a in vals.__dict__ and vals.__dict__[a] is not None:
config_image.append([a, vals.__dict__[a]])
@@ -74,7 +74,7 @@
if vals.vncpasswd is not None:
config_image.append([''vncpasswd'', vals.vncpasswd])
-@@ -1166,10 +1162,9 @@
+@@ -1171,10 +1167,9 @@
config_image = configure_image(vals)
if vals.bootloader:
@@ -109,7 +109,7 @@
log.debug("[xc_restore]: %s", string.join(cmd))
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
-@@ -493,11 +493,11 @@
+@@ -494,11 +494,11 @@
if self.is_hvm() or self.has_rfb():
if ''device_model'' not in
self[''platform'']:
@@ -123,7 +123,7 @@
# If the device_model is not set the os.path.exists() would raise
# an exception so we return our error message instead if
applicable
if not
self[''platform''][''device_model'']:
-@@ -528,14 +528,14 @@
+@@ -529,14 +529,14 @@
# Old configs may have hvmloader set as PV_kernel param
if self.has_key(''PV_kernel'') and
self[''PV_kernel''] != '''':
if self[''PV_kernel''] ==
''hvmloader'':
@@ -141,7 +141,7 @@
if not
os.path.exists(self[''platform''][''loader'']):
raise VmError("kernel ''%s'' not
found" %
str(self[''platform''][''loader'']))
-@@ -1662,7 +1662,7 @@
+@@ -1663,7 +1663,7 @@
# is invoked for pvfb services
if ''device_model'' not in
target[''platform'']:
target[''platform''][''device_model''] = \
@@ -152,7 +152,7 @@
# as well that is not really exposed to Xen API
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
-@@ -3233,7 +3233,7 @@
+@@ -3239,7 +3239,7 @@
else:
# Boot using bootloader
if not blexec or blexec == ''pygrub'':
Modified: trunk/xen/debian/patches/tools-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-rpath.diff Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/tools-rpath.diff Mon Jun 18 19:43:47 2012 (r1042)
@@ -1,11 +1,11 @@
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
-@@ -8,6 +8,8 @@
+@@ -9,6 +9,8 @@
export _INSTALL := $(INSTALL)
INSTALL = $(XEN_ROOT)/tools/cross-install
+LDFLAGS_RPATH = -Wl,-rpath,''$${ORIGIN}$(if $(1),/$(1))''
+
XEN_INCLUDE = $(XEN_ROOT)/tools/include
- XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
XEN_LIBXC = $(XEN_ROOT)/tools/libxc
+ XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl
Modified: trunk/xen/debian/patches/tools-xcutils-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-xcutils-rpath.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xcutils-rpath.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,11 +1,11 @@
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
-@@ -16,7 +16,7 @@
-
- PROGRAMS = xc_restore xc_save readnotes lsevtchn
-
--LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
-+LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
$(call LDFLAGS_RPATH,../lib)
+@@ -20,6 +20,8 @@
+ CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+ CFLAGS_lsevtchn.o := $(CFLAGS_libxenctrl)
++APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
.PHONY: all
all: build
+
Modified: trunk/xen/debian/patches/tools-xenmon-install.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenmon-install.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenmon-install.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -9,9 +9,9 @@
+INSTALL_PYTHON_PROG = $(XEN_ROOT)/tools/python/install-wrap
"$(PYTHON_PATH)" $(INSTALL_PROG)
+
CFLAGS += -Werror
- CFLAGS += -I $(XEN_XC)
CFLAGS += $(CFLAGS_libxenctrl)
-@@ -33,7 +37,7 @@
+ LDLIBS += $(LDLIBS_libxenctrl)
+@@ -31,7 +35,7 @@
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PROG) xenbaked $(DESTDIR)$(PRIVATE_BINDIR)/xenbaked
$(INSTALL_PROG) xentrace_setmask
$(DESTDIR)$(PRIVATE_BINDIR)/xentrace_setmask
Modified: trunk/xen/debian/patches/tools-xenmon-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenmon-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenmon-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,6 +1,6 @@
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
-@@ -29,10 +29,10 @@
+@@ -27,10 +27,10 @@
.PHONY: install
install: build
Modified: trunk/xen/debian/patches/tools-xenmon-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenmon-rpath.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenmon-rpath.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,10 +1,10 @@
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
-@@ -17,6 +17,7 @@
- CFLAGS += -I $(XEN_XC)
+@@ -16,6 +16,7 @@
+ CFLAGS += -Werror
CFLAGS += $(CFLAGS_libxenctrl)
LDLIBS += $(LDLIBS_libxenctrl)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
- BIN = xentrace_setmask xenbaked
SCRIPTS = xenmon.py
+
Modified: trunk/xen/debian/patches/tools-xenpaging-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenpaging-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenpaging-prefix.diff Mon Jun 18 19:43:47
2012 (r1042)
@@ -1,20 +1,20 @@
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
-@@ -4,7 +4,7 @@
- CFLAGS += -I $(XEN_XC)
- CFLAGS += -I ./
- CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore)
--LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)
-+LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(call
LDFLAGS_RPATH,../lib)
+@@ -3,7 +3,7 @@
+
+ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS)
+ LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS)
+-LDFLAGS += $(PTHREAD_LDFLAGS)
++LDFLAGS += $(PTHREAD_LDFLAGS) $(call LDFLAGS_RPATH,../lib)
POLICY = default
-@@ -28,8 +28,8 @@
+@@ -25,8 +25,8 @@
install: all
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/xenpaging
-- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-- $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_PAGING_DIR)
+- $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
+- $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(PRIVATE_BINDIR)
Added: trunk/xen/debian/patches/tools-xenstat-abiname.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-xenstat-abiname.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -0,0 +1,52 @@
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
+@@ -22,17 +22,13 @@
+ LDCONFIG=ldconfig
+ MAKE_LINK=ln -sf
+
+-MAJOR=0
+-MINOR=0
+-
+ LIB=src/libxenstat.a
+-SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR)
+-SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so
++SHLIB=src/libxenstat.so
+ OBJECTS-y=src/xenstat.o
+ OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
+ OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
+ OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
+-SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
++SONAME_FLAGS=-Wl,$(SONAME_LDFLAG),libxenstat.so
+
+ WARN_FLAGS=-Wall -Werror
+
+@@ -43,7 +39,7 @@
+ LDLIBS-$(CONFIG_SunOS) += -lkstat
+
+ .PHONY: all
+-all: $(LIB) $(SHLIB) $(SHLIB_LINKS)
++all: $(LIB) $(SHLIB)
+
+ $(LIB): $(OBJECTS-y)
+ $(AR) rc $@ $^
+@@ -53,19 +49,11 @@
+ $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \
+ $(OBJECTS-y) $(LDLIBS-y) $(APPEND_LDFLAGS)
+
+-src/libxenstat.so.$(MAJOR): $(SHLIB)
+- $(MAKE_LINK) $(<F) $@
+-
+-src/libxenstat.so: src/libxenstat.so.$(MAJOR)
+- $(MAKE_LINK) $(<F) $@
+-
+ .PHONY: install
+ install: all
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+- $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libxenstat.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR)
+- ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so
++ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
+
+ PYLIB=bindings/swig/python/_xenstat.so
+ PYMOD=bindings/swig/python/xenstat.py
Modified: trunk/xen/debian/patches/tools-xenstat-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenstat-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenstat-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,6 +1,6 @@
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
-@@ -28,8 +28,8 @@
+@@ -30,8 +30,8 @@
.PHONY: install
install: xentop xentop.1
@@ -11,3 +11,13 @@
$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
$(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
+@@ -51,6 +51,7 @@
+
+ .PHONY: install
+ install: all
++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(PRIVATE_LIBDIR)
Modified: trunk/xen/debian/patches/tools-xenstat-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenstat-rpath.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenstat-rpath.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,34 +1,12 @@
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
-@@ -19,8 +19,9 @@
+@@ -19,7 +19,9 @@
else
- CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
--LDFLAGS += -L$(XEN_LIBXENSTAT)
--LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
+ CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
-+LDLIBS += ../libxenstat/src/libxenstat.a $(CURSES_LIBS) $(SOCKET_LIBS)
+ LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
+LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)
CFLAGS += -DHOST_$(XEN_OS)
- .PHONY: all
---- a/tools/xenstat/libxenstat/Makefile
-+++ b/tools/xenstat/libxenstat/Makefile
-@@ -40,16 +40,12 @@
- LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
- LDLIBS-y = -lxenstore -lxenctrl
- LDLIBS-$(CONFIG_SunOS) += -lkstat
--ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so
--ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so
--ARLIBS-x86_32 = /usr/lib/libkstat.so
--ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH))
-
- .PHONY: all
- all: $(LIB)
-
- $(LIB): $(OBJECTS-y)
-- $(AR) rc $@ $^ $(ARLIBS-y)
-+ $(AR) rc $@ $^
- $(RANLIB) $@
-
- $(SHLIB): $(OBJECTS-y)
+ # Include configure output (config.h) to headers search path
Modified: trunk/xen/debian/patches/tools-xenstore-compatibility.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenstore-compatibility.diff Sun Jun 17 22:00:57
2012 (r1041)
+++ trunk/xen/debian/patches/tools-xenstore-compatibility.diff Mon Jun 18
19:43:47 2012 (r1042)
@@ -1,6 +1,5 @@
-diff -r dbf2ddf652dc tools/xenstore/xenstore_client.c
---- a/tools/xenstore/xenstore_client.c Thu Apr 07 15:26:58 2011 +0100
-+++ b/tools/xenstore/xenstore_client.c Mon Apr 11 22:15:41 2011 +0200
+--- a/tools/xenstore/xenstore_client.c
++++ b/tools/xenstore/xenstore_client.c
@@ -633,7 +633,7 @@
max_width = ws.ws_col - 2;
}
@@ -10,10 +9,9 @@
if (xsh == NULL) err(1, "xs_open");
again:
-diff -r dbf2ddf652dc tools/xenstore/xs.c
---- a/tools/xenstore/xs.c Thu Apr 07 15:26:58 2011 +0100
-+++ b/tools/xenstore/xs.c Mon Apr 11 22:15:41 2011 +0200
-@@ -250,17 +250,19 @@
+--- a/tools/xenstore/xs.c
++++ b/tools/xenstore/xs.c
+@@ -264,17 +264,19 @@
struct xs_handle *xs_domain_open(void)
{
@@ -25,22 +23,17 @@
{
struct xs_handle *xsh = NULL;
-- if (flags & XS_OPEN_READONLY)
-- xsh = get_handle(xs_daemon_socket_ro(), flags);
-- else
-- xsh = get_handle(xs_daemon_socket(), flags);
+ if (!(flags & XS_OPEN_DOMAINONLY)) {
-+ if (flags & XS_OPEN_READONLY)
-+ xsh = get_handle(xs_daemon_socket_ro(), flags);
-+ else
-+ xsh = get_handle(xs_daemon_socket(), flags);
+ if (flags & XS_OPEN_READONLY)
+ xsh = get_handle(xs_daemon_socket_ro());
+ else
+ xsh = get_handle(xs_daemon_socket());
+ }
if (!xsh && !(flags & XS_OPEN_SOCKETONLY))
- xsh = get_handle(xs_domain_dev(), flags);
-diff -r dbf2ddf652dc tools/xenstore/xs.h
---- a/tools/xenstore/xs.h Thu Apr 07 15:26:58 2011 +0100
-+++ b/tools/xenstore/xs.h Mon Apr 11 22:15:41 2011 +0200
+ xsh = get_handle(xs_domain_dev());
+--- a/tools/xenstore/xenstore.h
++++ b/tools/xenstore/xenstore.h
@@ -26,6 +26,7 @@
#define XS_OPEN_READONLY 1UL<<0
Modified: trunk/xen/debian/patches/tools-xenstore-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-xenstore-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xenstore-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,15 +1,19 @@
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
-@@ -47,7 +47,7 @@
- endif
-
+@@ -55,10 +55,10 @@
+ init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest)
+
+ init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE)
+- $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
$(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
$(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
+
xenstored: $(XENSTORED_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(call
LDFLAGS_RPATH,../lib) $(SOCKET_LIBS) -o $@
+- $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@
$(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) $(call
LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
- $(CLIENTS): xenstore
- ln -f xenstore $@
-@@ -92,16 +92,16 @@
+ xenstored.a: $(XENSTORED_OBJS)
+ $(AR) cr $@ $^
+@@ -106,17 +106,17 @@
.PHONY: install
install: all
@@ -17,6 +21,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
Modified: trunk/xen/debian/patches/tools-xentrace-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-xentrace-prefix.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xentrace-prefix.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -1,6 +1,6 @@
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
-@@ -35,13 +35,11 @@
+@@ -20,13 +20,11 @@
.PHONY: install
install: build
Modified: trunk/xen/debian/patches/tools-xentrace-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-xentrace-rpath.diff Sun Jun 17 22:00:57 2012
(r1041)
+++ trunk/xen/debian/patches/tools-xentrace-rpath.diff Mon Jun 18 19:43:47 2012
(r1042)
@@ -2,9 +2,9 @@
+++ b/tools/xentrace/Makefile
@@ -5,6 +5,7 @@
- CFLAGS += $(CFLAGS_libxenctrl)
+ CFLAGS += $(CFLAGS_libxenctrl)
LDLIBS += $(LDLIBS_libxenctrl)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
- HDRS = $(wildcard *.h)
- OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+ BIN = xentrace xentrace_setsize
+ LIBBIN = xenctx
Modified: trunk/xen/debian/patches/version.patch
=============================================================================---
trunk/xen/debian/patches/version.patch Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/version.patch Mon Jun 18 19:43:47 2012 (r1042)
@@ -7,14 +7,18 @@
@DPATCH@
--- a/xen/Makefile
+++ b/xen/Makefile
-@@ -86,17 +86,16 @@
- include/xen/compile.h: include/xen/compile.h.in .banner
+@@ -97,20 +97,19 @@
+ @rm -f $@1 $@2
+
+ # compile.h contains dynamic build info. Rebuilt on every
''make'' invocation.
+-include/xen/compile.h: include/xen/compile.h.in .banner
++include/xen/compile.h: include/xen/compile.h.in
@sed -e ''s/@@date@@/$(shell LC_ALL=C date)/g'' \
-e ''s/@@time@@/$(shell LC_ALL=C date +%T)/g'' \
- -e ''s/@@whoami@@/$(XEN_WHOAMI)/g'' \
- -e ''s/@@domain@@/$(XEN_DOMAIN)/g'' \
- -e ''s/@@hostname@@/$(shell hostname)/g'' \
- -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | tail
-1)!g'' \
+ -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep
version | tail -1)!g'' \
-e ''s/@@version@@/$(XEN_VERSION)/g'' \
-e ''s/@@subversion@@/$(XEN_SUBVERSION)/g'' \
-e ''s/@@extraversion@@/$(XEN_EXTRAVERSION)/g'' \
@@ -85,7 +89,7 @@
-}
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
-@@ -574,14 +574,11 @@
+@@ -566,14 +566,11 @@
serial_set_rx_handler(sercon_handle, serial_rx);
/* HELLO WORLD --- start-of-day banner text. */
Modified: trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff
=============================================================================---
trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff Sun Jun 17
22:00:57 2012 (r1041)
+++ trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff Mon Jun 18
19:43:47 2012 (r1042)
@@ -6,9 +6,9 @@
Forwarded: no
Last-Update: 2012-06-15
---- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/arch/x86/i8259.c
-+++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/arch/x86/i8259.c
-@@ -62,7 +62,7 @@
+--- a/xen/arch/x86/i8259.c
++++ b/xen/arch/x86/i8259.c
+@@ -64,7 +64,7 @@
IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)
@@ -17,8 +17,8 @@
IRQLIST_16(0x0), IRQLIST_16(0x1), IRQLIST_16(0x2), IRQLIST_16(0x3),
IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7),
IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb),
----
xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/include/asm-x86/hvm/svm/intr.h
-+++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/include/asm-x86/hvm/svm/intr.h
+--- a/xen/include/asm-x86/hvm/svm/intr.h
++++ b/xen/include/asm-x86/hvm/svm/intr.h
@@ -21,6 +21,8 @@
#ifndef __ASM_X86_HVM_SVM_INTR_H__
#define __ASM_X86_HVM_SVM_INTR_H__
@@ -29,8 +29,8 @@
+asmlinkage void svm_intr_assist(void);
#endif /* __ASM_X86_HVM_SVM_INTR_H__ */
----
xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/include/asm-x86/hvm/vmx/vmx.h
-+++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/include/asm-x86/hvm/vmx/vmx.h
+--- a/xen/include/asm-x86/hvm/vmx/vmx.h
++++ b/xen/include/asm-x86/hvm/vmx/vmx.h
@@ -63,7 +63,7 @@
void vmx_asm_vmexit_handler(struct cpu_user_regs);
Modified: trunk/xen/debian/rules.real
=============================================================================---
trunk/xen/debian/rules.real Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/rules.real Mon Jun 18 19:43:47 2012 (r1042)
@@ -39,6 +39,7 @@
@rm -rf $(DIR)
mkdir -p $(DIR)
cp -al $(SOURCE_FILES) $(DIR)
+ cd $(DIR); ./configure
@$(stamp)
$(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): SOURCE_FILES = $(filter-out
debian, $(wildcard *))
@@ -56,6 +57,8 @@
@rm -rf $(DIR)
mkdir -p $(DIR)
cp -al $(SOURCE_FILES) $(DIR)
+ cd $(DIR); ./configure \
+ --disable-seabios
@$(stamp)
$(STAMPS_DIR)/build-docs: DIR=$(BUILD_DIR)/build-docs
Modified: trunk/xen/debian/templates/control.source.in
=============================================================================---
trunk/xen/debian/templates/control.source.in Sun Jun 17 22:00:57 2012 (r1041)
+++ trunk/xen/debian/templates/control.source.in Mon Jun 18 19:43:47 2012
(r1042)
@@ -11,10 +11,12 @@
iasl,
ipxe-qemu,
libaio-dev,
+ libglib2.0-dev,
libgnutls-dev,
liblzma-dev,
libncurses5-dev,
libpci-dev,
+ libyajl-dev,
pkg-config,
uuid-dev,
zlib1g-dev,