From 345afd2270a39c9237531b4e0926d99babf36d40 Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Tue, 19 Dec 2017 23:24:03 +0100 Subject: [PATCH] Update to 4.9.2~pre+1.32e364c4e7 So, to reiterate... the orig tar will just be made from commit 32e364c4e7 in the upstream repo. And if we advance to a later point before 4.9.3 is released, then it'll get 4.9.2~pre+2. etc... Update the packaging for Xen 4.9. I took these changes from the Xen 4.9 packaging in Ubuntu done by Stefan Bader. Thanks! --- debian/changelog | 18 +++++ debian/libxen-dev.install | 3 + debian/libxenstore3.0.symbols | 1 + debian/patches/config-prefix.diff | 2 +- debian/patches/rerun-autogen.sh-stretch.patch | 30 +++---- debian/patches/series | 1 + debian/patches/tools-blktap2-prefix.diff | 19 +++-- debian/patches/tools-fake-xs-restrict.patch | 37 +++++++++ debian/patches/tools-libxc-abiname.diff | 29 ++++--- debian/patches/tools-libxl-abiname.diff | 55 ++++++++----- debian/patches/tools-libxl-prefix.diff | 27 +++---- debian/patches/tools-xenstat-abiname.diff | 17 +++- debian/patches/tools-xenstat-prefix.diff | 6 +- debian/patches/tools-xenstore-prefix.diff | 6 +- ...stestsx86_emulator-pass--no-pie--fno.patch | 8 +- debian/patches/ubuntu-tools-libs-abiname.diff | 81 ++++++++++++++----- debian/patches/version.diff | 8 +- debian/rules.real | 4 + 18 files changed, 245 insertions(+), 107 deletions(-) create mode 100644 debian/patches/tools-fake-xs-restrict.patch diff --git a/debian/changelog b/debian/changelog index 6f85ded7d5..62e98ecd83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +xen (4.9.2~pre+1.32e364c4e7-1) UNRELEASED; urgency=medium + + * Update to upstream release 4.9.1 plus latest security patches. This is + upstream commit 32e364c4e72157f144574796ac9ea021e3417d47 + * Merge changes for 4.9 from the ubuntu packaging: + - Rebase patches against upstream source (line numbers etc). + - debian/rules.real: + - Add a call to build common tool headers. + - Add a call to install common tool headers. + - debian/libxen-dev.install, d/p/ubuntu-tools-libs-abiname.diff: + - Add additional modifications for new libxendevicemodel. + - debian/patches/tools-fake-xs-restrict.patch: + - Re-introduce (fake) xs_restrict call to keep libxenstore version at + 3.0 for now. + - debian/libxenstore3.0.symbols: add xs_control_command + + -- Hans van Kranenburg Tue, 19 Dec 2017 18:44:47 +0100 + xen (4.8.2+xsa245-0+deb9u1) stretch-security; urgency=high * Update to upstream stable 4.8 branch, which is currently at Xen 4.8.2 diff --git a/debian/libxen-dev.install b/debian/libxen-dev.install index df5b859e4d..dd7f6007ce 100644 --- a/debian/libxen-dev.install +++ b/debian/libxen-dev.install @@ -18,6 +18,8 @@ usr/lib/*/libxengnttab.a usr/lib/*/libxengnttab.so usr/lib/*/libxentoollog.a usr/lib/*/libxentoollog.so +usr/lib/*/libxendevicemodel.a +usr/lib/*/libxendevicemodel.so usr/include/_libxl*.h usr/include/libxl*.h usr/include/xenctrl.h @@ -25,6 +27,7 @@ usr/include/xenguest.h usr/include/xenstore*.h usr/include/xenstore-compat/xs* usr/include usr/include/xentoollog.h +usr/include/xendevicemodel.h usr/include/xen usr/lib/*/pkgconfig/*.pc # New headers in xen-4.8 diff --git a/debian/libxenstore3.0.symbols b/debian/libxenstore3.0.symbols index 5b60ffdac6..d41fd6ab9c 100644 --- a/debian/libxenstore3.0.symbols +++ b/debian/libxenstore3.0.symbols @@ -5,6 +5,7 @@ libxenstore.so.3.0 libxenstore3.0 #MINVER# xprintf@Base 3.2.0 xs_check_watch@Base 4.2~ xs_close@Base 4.1.0~rc6 + xs_control_command@Base 4.9.0 xs_count_strings@Base 3.2.0 xs_daemon_close@Base 3.2.0 xs_daemon_destroy_postfork@Base 4.0.1~rc4 diff --git a/debian/patches/config-prefix.diff b/debian/patches/config-prefix.diff index 03711eec63..c7a7d60dee 100644 --- a/debian/patches/config-prefix.diff +++ b/debian/patches/config-prefix.diff @@ -8,7 +8,7 @@ Patch-Name: config-prefix.diff --- a/Config.mk +++ b/Config.mk -@@ -82,7 +82,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib +@@ -77,7 +77,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib endif PYTHON ?= python diff --git a/debian/patches/rerun-autogen.sh-stretch.patch b/debian/patches/rerun-autogen.sh-stretch.patch index 19d17330d8..8fdd5aed65 100644 --- a/debian/patches/rerun-autogen.sh-stretch.patch +++ b/debian/patches/rerun-autogen.sh-stretch.patch @@ -10,7 +10,7 @@ Signed-off-by: Ian Jackson --- a/configure +++ b/configure -@@ -641,6 +641,7 @@ infodir +@@ -643,6 +643,7 @@ infodir docdir oldincludedir includedir @@ -18,7 +18,7 @@ Signed-off-by: Ian Jackson localstatedir sharedstatedir sysconfdir -@@ -717,6 +718,7 @@ datadir='${datarootdir}' +@@ -720,6 +721,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' @@ -26,7 +26,7 @@ Signed-off-by: Ian Jackson includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -969,6 +971,15 @@ do +@@ -972,6 +974,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -42,7 +42,7 @@ Signed-off-by: Ian Jackson -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1106,7 +1117,7 @@ fi +@@ -1109,7 +1120,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ @@ -51,7 +51,7 @@ Signed-off-by: Ian Jackson do eval ac_val=\$$ac_var # Remove trailing slashes. -@@ -1259,6 +1270,7 @@ Fine tuning of the installation director +@@ -1262,6 +1273,7 @@ Fine tuning of the installation director --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] @@ -61,7 +61,7 @@ Signed-off-by: Ian Jackson --oldincludedir=DIR C header files for non-gcc [/usr/include] --- a/docs/configure +++ b/docs/configure -@@ -632,6 +632,7 @@ infodir +@@ -634,6 +634,7 @@ infodir docdir oldincludedir includedir @@ -69,7 +69,7 @@ Signed-off-by: Ian Jackson localstatedir sharedstatedir sysconfdir -@@ -707,6 +708,7 @@ datadir='${datarootdir}' +@@ -710,6 +711,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' @@ -77,7 +77,7 @@ Signed-off-by: Ian Jackson includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -959,6 +961,15 @@ do +@@ -962,6 +964,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -93,7 +93,7 @@ Signed-off-by: Ian Jackson -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1096,7 +1107,7 @@ fi +@@ -1099,7 +1110,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ @@ -102,7 +102,7 @@ Signed-off-by: Ian Jackson do eval ac_val=\$$ac_var # Remove trailing slashes. -@@ -1249,6 +1260,7 @@ Fine tuning of the installation director +@@ -1252,6 +1263,7 @@ Fine tuning of the installation director --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] @@ -163,7 +163,7 @@ Signed-off-by: Ian Jackson --oldincludedir=DIR C header files for non-gcc [/usr/include] --- a/tools/configure +++ b/tools/configure -@@ -767,6 +767,7 @@ infodir +@@ -769,6 +769,7 @@ infodir docdir oldincludedir includedir @@ -171,7 +171,7 @@ Signed-off-by: Ian Jackson localstatedir sharedstatedir sysconfdir -@@ -889,6 +890,7 @@ datadir='${datarootdir}' +@@ -892,6 +893,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' @@ -179,7 +179,7 @@ Signed-off-by: Ian Jackson includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1141,6 +1143,15 @@ do +@@ -1144,6 +1146,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -195,7 +195,7 @@ Signed-off-by: Ian Jackson -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1278,7 +1289,7 @@ fi +@@ -1281,7 +1292,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ @@ -204,7 +204,7 @@ Signed-off-by: Ian Jackson do eval ac_val=\$$ac_var # Remove trailing slashes. -@@ -1431,6 +1442,7 @@ Fine tuning of the installation director +@@ -1434,6 +1445,7 @@ Fine tuning of the installation director --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] diff --git a/debian/patches/series b/debian/patches/series index 70a4717517..a33021e33d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,3 +26,4 @@ tools-xenmon-install.diff tools-xenstore-compatibility.diff ubuntu-tools-libs-abiname.diff toolstestsx86_emulator-pass--no-pie--fno.patch +tools-fake-xs-restrict.patch diff --git a/debian/patches/tools-blktap2-prefix.diff b/debian/patches/tools-blktap2-prefix.diff index fac2e87159..c13f1538d6 100644 --- a/debian/patches/tools-blktap2-prefix.diff +++ b/debian/patches/tools-blktap2-prefix.diff @@ -19,7 +19,7 @@ Patch-Name: tools-blktap2-prefix.diff IBIN = tap-ctl -@@ -38,39 +35,32 @@ OBJS = $(CTL_OBJS) tap-ctl.o +@@ -38,11 +35,11 @@ OBJS = $(CTL_OBJS) tap-ctl.o PICS = $(CTL_PICS) LIB_STATIC = $(LIBNAME).a @@ -27,9 +27,15 @@ Patch-Name: tools-blktap2-prefix.diff +LIB_SHARED = $(LIBNAME).so IBIN = tap-ctl - all: build + PKG_CONFIG := xenblktapctl.pc +-PKG_CONFIG_VERSION := $(MAJOR).$(MINOR) ++PKG_CONFIG_VERSION := $(PACKAGE_VERSION) + + ifneq ($(CONFIG_LIBXC_MINIOS),y) + PKG_CONFIG_INST := $(PKG_CONFIG) +@@ -62,33 +59,26 @@ all: build - build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) + build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) -$(LIBNAME).so: $(LIBSONAME) - ln -sf $< $@ @@ -46,9 +52,9 @@ Patch-Name: tools-blktap2-prefix.diff $(LIB_SHARED): $(CTL_PICS) - $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS) -+ $(CC) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS) - install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) + install: build - $(INSTALL_DIR) -p $(DESTDIR)$(sbindir) - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir) + $(INSTALL_DIR) -p $(DESTDIR)$(libdir) @@ -60,13 +66,14 @@ Patch-Name: tools-blktap2-prefix.diff - ln -sf $(LIBSONAME) $(DESTDIR)$(libdir)/$(LIBNAME).so - ln -sf $(LIB_SHARED) $(DESTDIR)$(libdir)/$(LIBSONAME) + $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBEXEC_LIB) + $(INSTALL_DATA) xenblktapctl.pc $(DESTDIR)$(PKG_INSTALLDIR) clean: rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) - rm -f $(LIBNAME).so $(LIBSONAME) rm -f *~ + rm -f xenblktapctl.pc - distclean: clean --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -12,6 +12,7 @@ CFLAGS += -Werror diff --git a/debian/patches/tools-fake-xs-restrict.patch b/debian/patches/tools-fake-xs-restrict.patch new file mode 100644 index 0000000000..8551419846 --- /dev/null +++ b/debian/patches/tools-fake-xs-restrict.patch @@ -0,0 +1,37 @@ +Description: Re-introduce fake xs_restrict API call + libxenstore cannot remove an API function without changing its version + number. As long as we want to remain with 3.0 we have to keep it around. + Debian might decide to increment the version at some point but we do not + know how and when. So for now keep the version stable. +Author: Stefan Bader +Forwarded: No + +--- a/tools/xenstore/include/xenstore.h ++++ b/tools/xenstore/include/xenstore.h +@@ -133,6 +133,11 @@ bool xs_mkdir(struct xs_handle *h, xs_tr + bool xs_rm(struct xs_handle *h, xs_transaction_t t, + const char *path); + ++/* Fake function which will always return false (required to let ++ * libxenstore remain at 3.0 version. ++ */ ++bool xs_restrict(struct xs_handle *h, unsigned domid); ++ + /* Get permissions of node (first element is owner, first perms is "other"). + * Returns malloced array, or NULL: call free() after use. + */ +--- a/tools/xenstore/xs.c ++++ b/tools/xenstore/xs.c +@@ -771,6 +771,12 @@ unwind: + return false; + } + ++/* Always return false a functionality has been removed in Xen 4.9 */ ++bool xs_restrict(struct xs_handle *h, unsigned domid) ++{ ++ return false; ++} ++ + /* Watch a node for changes (poll on fd to detect, or call read_watch()). + * When the node (or any child) changes, fd will become readable. + * Token is returned when watch is read, to allow matching. diff --git a/debian/patches/tools-libxc-abiname.diff b/debian/patches/tools-libxc-abiname.diff index 5a5a8fa7e1..e3de892b21 100644 --- a/debian/patches/tools-libxc-abiname.diff +++ b/debian/patches/tools-libxc-abiname.diff @@ -12,13 +12,13 @@ Patch-Name: tools-libxc-abiname.diff XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk --MAJOR = 4.8 +-MAJOR = 4.9 -MINOR = 0 - ifeq ($(CONFIG_LIBXC_MINIOS),y) # Save/restore of a domain is currently incompatible with a stubdom environment override CONFIG_MIGRATE := n -@@ -132,12 +129,12 @@ $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAG +@@ -134,12 +131,12 @@ $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAG LIB := libxenctrl.a ifneq ($(nosharedlibs),y) @@ -33,7 +33,16 @@ Patch-Name: tools-libxc-abiname.diff endif genpath-target = $(call buildmakevars2header,_paths.h) -@@ -171,15 +168,13 @@ libs: $(LIB) +@@ -160,7 +157,7 @@ $(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \ + $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): xc_private.h + + PKG_CONFIG := xencontrol.pc xenguest.pc +-PKG_CONFIG_VERSION := $(MAJOR).$(MINOR) ++PKG_CONFIG_VERSION := $(PACKAGE_VERSION) + + ifneq ($(CONFIG_LIBXC_MINIOS),y) + PKG_CONFIG_INST := $(PKG_CONFIG) +@@ -190,15 +187,13 @@ libs: $(LIB) $(PKG_CONFIG_INST) $(PKG_CO install: build $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) @@ -51,9 +60,9 @@ Patch-Name: tools-libxc-abiname.diff - $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenguest.so $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) - - .PHONY: TAGS -@@ -211,22 +206,18 @@ rpm: build + $(INSTALL_DATA) xencontrol.pc $(DESTDIR)$(PKG_INSTALLDIR) + $(INSTALL_DATA) xenguest.pc $(DESTDIR)$(PKG_INSTALLDIR) +@@ -233,22 +228,18 @@ rpm: build libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ @@ -64,9 +73,9 @@ Patch-Name: tools-libxc-abiname.diff $(SYMLINK_SHLIB) $< $@ -libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) -- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxengntshr) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) +- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) +libxenctrl-$(PACKAGE_VERSION).so: $(CTRL_PIC_OBJS) -+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxengntshr) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) # libxenguest @@ -80,14 +89,14 @@ Patch-Name: tools-libxc-abiname.diff $(SYMLINK_SHLIB) $< $@ ifeq ($(CONFIG_MiniOS),y) -@@ -238,9 +229,9 @@ endif +@@ -260,9 +251,9 @@ endif xc_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options)) xc_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options)) -libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) -libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) -+libxenguest-$(PACKAGE_VERSION).so: COMPRESSION_LIBS = $(call zlib-options,l) ++libxenguest-$(PACKAGE_VERSION).so: COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) +libxenguest-$(PACKAGE_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(PACKAGE_VERSION).so + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) diff --git a/debian/patches/tools-libxl-abiname.diff b/debian/patches/tools-libxl-abiname.diff index 2aeda4e331..ddb8e258cc 100644 --- a/debian/patches/tools-libxl-abiname.diff +++ b/debian/patches/tools-libxl-abiname.diff @@ -3,7 +3,6 @@ Date: Sat, 5 Jul 2014 11:46:49 +0200 Subject: tools-libxl-abiname.diff Patch-Name: tools-libxl-abiname.diff - --- --- a/tools/libxl/Makefile @@ -12,18 +11,45 @@ Patch-Name: tools-libxl-abiname.diff XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk --MAJOR = 4.8 +-MAJOR = 4.9 -MINOR = 0 - --XLUMAJOR = 4.8 +-XLUMAJOR = 4.9 -XLUMINOR = 0 - CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS += -I. -fPIC -@@ -258,29 +252,23 @@ _libxl_type%.h _libxl_type%_json.h _libx - $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) - $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) +@@ -189,12 +183,12 @@ SAVE_HELPER_OBJS = libxl_save_helper.o _ + $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtchn) + + PKG_CONFIG = xenlight.pc xlutil.pc +-PKG_CONFIG_VERSION := $(MAJOR).$(MINOR) ++PKG_CONFIG_VERSION := $(PACKAGE_VERSION) + + ifneq ($(CONFIG_LIBXC_MINIOS),y) + PKG_CONFIG_INST := $(PKG_CONFIG) +-xenlight.pc: PKG_CONFIG_VERSION = $(MAJOR).$(MINOR) +-xlutil.pc: PKG_CONFIG_VERSION = $(XLUMAJOR).$(XLUMINOR) ++xenlight.pc: PKG_CONFIG_VERSION = $(PACKAGE_VERSION) ++xlutil.pc: PKG_CONFIG_VERSION = $(PACKAGE_VERSION) + $(PKG_CONFIG_INST): PKG_CONFIG_PREFIX = $(prefix) + $(PKG_CONFIG_INST): PKG_CONFIG_INCDIR = $(includedir) + $(PKG_CONFIG_INST): PKG_CONFIG_LIBDIR = $(libdir) +@@ -202,8 +196,8 @@ endif + + PKG_CONFIG_LOCAL := $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) + +-$(PKG_CONFIG_DIR)/xenlight.pc: PKG_CONFIG_VERSION = $(MAJOR).$(MINOR) +-$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_VERSION = $(XLUMAJOR).$(XLUMINOR) ++$(PKG_CONFIG_DIR)/xenlight.pc: PKG_CONFIG_VERSION = $(PACKAGE_VERSION) ++$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_VERSION = $(PACKAGE_VERSION) + $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX = $(XEN_ROOT) + $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(CURDIR) + $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) +@@ -273,29 +267,23 @@ _libxl_type%.h _libxl_type%_json.h _libx + $(call move-if-changed,__libxl_type$(stem)_json.h,_libxl_type$(stem)_json.h) + $(call move-if-changed,__libxl_type$(stem).c,_libxl_type$(stem).c) -libxenlight.so: libxenlight.so.$(MAJOR) - $(SYMLINK_SHLIB) $< $@ @@ -58,18 +84,9 @@ Patch-Name: tools-libxl-abiname.diff libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ -@@ -298,7 +286,7 @@ testidl: testidl.o libxlutil.so libxenli - $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) - - $(PKG_CONFIG): % : %.in Makefile -- @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < $< > $@.new -+ @sed -e 's/@@version@@/$(PACKAGE_VERSION)/g' < $< > $@.new - @mv -f $@.new $@ - - .PHONY: install -@@ -311,13 +299,11 @@ install: all - $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR) - $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) +@@ -315,13 +303,11 @@ install: all + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR) @@ -84,4 +101,4 @@ Patch-Name: tools-libxl-abiname.diff + $(SYMLINK_SHLIB) libxlutil-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir) $(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 libxlutil.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(PKG_INSTALLDIR) diff --git a/debian/patches/tools-libxl-prefix.diff b/debian/patches/tools-libxl-prefix.diff index a9fe903257..dd07fdbfda 100644 --- a/debian/patches/tools-libxl-prefix.diff +++ b/debian/patches/tools-libxl-prefix.diff @@ -4,6 +4,7 @@ Subject: tools-libxl-prefix.diff Patch-Name: tools-libxl-prefix.diff +Note: SMB: Added change for LIBEXEC_BIN for tools/xl/Makefile --- --- a/tools/libxl/Makefile @@ -17,7 +18,7 @@ Patch-Name: tools-libxl-prefix.diff LIBXL_LIBS = LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) -@@ -256,7 +258,7 @@ libxenlight.so: libxenlight-$(PACKAGE_VE +@@ -271,7 +273,7 @@ libxenlight.so: libxenlight-$(PACKAGE_VE $(SYMLINK_SHLIB) $< $@ libxenlight-$(PACKAGE_VERSION).so: $(LIBXL_OBJS) @@ -26,27 +27,17 @@ Patch-Name: tools-libxl-prefix.diff libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) -@@ -274,7 +276,7 @@ libxlutil.a: $(LIBXLU_OBJS) - $(AR) rcs libxlutil.a $^ - - xl: $(XL_OBJS) libxlutil.so libxenlight.so -- $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) -+ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) - - test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) -@@ -291,13 +293,12 @@ $(PKG_CONFIG): % : %.in Makefile +--- a/tools/xl/Makefile ++++ b/tools/xl/Makefile +@@ -39,9 +39,9 @@ xl: $(XL_OBJS) .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_DIR) $(DESTDIR)$(includedir) ++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR) - $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xl $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_SHLIB) libxenlight-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir) - $(SYMLINK_SHLIB) libxenlight-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libxenlight.so + $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + + .PHONY: clean diff --git a/debian/patches/tools-xenstat-abiname.diff b/debian/patches/tools-xenstat-abiname.diff index 6b46a1f8f8..e6ef3bca5f 100644 --- a/debian/patches/tools-xenstat-abiname.diff +++ b/debian/patches/tools-xenstat-abiname.diff @@ -33,13 +33,22 @@ Patch-Name: tools-xenstat-abiname.diff @@ -38,7 +34,7 @@ LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIB LDLIBS-$(CONFIG_SunOS) += -lkstat + PKG_CONFIG := xenstat.pc +-PKG_CONFIG_VERSION := $(MAJOR).$(MINOR) ++PKG_CONFIG_VERSION := $(PACKAGE_VERSION) + + ifneq ($(CONFIG_LIBXC_MINIOS),y) + PKG_CONFIG_INST := $(PKG_CONFIG) +@@ -54,7 +50,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = + $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) + .PHONY: all --all: $(LIB) $(SHLIB) $(SHLIB_LINKS) -+all: $(LIB) $(SHLIB) +-all: $(LIB) $(SHLIB) $(SHLIB_LINKS) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) ++all: $(LIB) $(SHLIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) $(OBJECTS-y): src/_paths.h -@@ -50,19 +46,11 @@ $(SHLIB): $(OBJECTS-y) +@@ -66,19 +62,11 @@ $(SHLIB): $(OBJECTS-y) $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \ $(OBJECTS-y) $(LDLIBS-y) $(APPEND_LDFLAGS) @@ -57,6 +66,6 @@ Patch-Name: tools-xenstat-abiname.diff - 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) + $(INSTALL_DATA) xenstat.pc $(DESTDIR)$(PKG_INSTALLDIR) PYLIB=bindings/swig/python/_xenstat.so - PYMOD=bindings/swig/python/xenstat.py diff --git a/debian/patches/tools-xenstat-prefix.diff b/debian/patches/tools-xenstat-prefix.diff index f1e2478ca1..b179a8dae4 100644 --- a/debian/patches/tools-xenstat-prefix.diff +++ b/debian/patches/tools-xenstat-prefix.diff @@ -17,7 +17,7 @@ Patch-Name: tools-xenstat-prefix.diff OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o -@@ -48,9 +48,11 @@ $(SHLIB): $(OBJECTS-y) +@@ -64,9 +64,11 @@ $(SHLIB): $(OBJECTS-y) .PHONY: install install: all @@ -27,9 +27,9 @@ Patch-Name: tools-xenstat-prefix.diff $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a - $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(libdir) + $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBEXEC_LIB) + $(INSTALL_DATA) xenstat.pc $(DESTDIR)$(PKG_INSTALLDIR) PYLIB=bindings/swig/python/_xenstat.so - PYMOD=bindings/swig/python/xenstat.py --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -19,7 +19,9 @@ all install xentop: @@ -37,7 +37,7 @@ Patch-Name: tools-xenstat-prefix.diff CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) +LDFLAGS += $(call LDFLAGS_RPATH,../lib) - LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm -lyajl + LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm +LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) CFLAGS += -DHOST_$(XEN_OS) diff --git a/debian/patches/tools-xenstore-prefix.diff b/debian/patches/tools-xenstore-prefix.diff index 977c2f2576..ff0ec53879 100644 --- a/debian/patches/tools-xenstore-prefix.diff +++ b/debian/patches/tools-xenstore-prefix.diff @@ -28,16 +28,16 @@ Patch-Name: tools-xenstore-prefix.diff CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS += xenstore-write xenstore-ls xenstore-watch -@@ -74,7 +76,7 @@ endif +@@ -76,7 +78,7 @@ endif $(XENSTORED_OBJS): CFLAGS += $(CFLAGS_libxengnttab) xenstored: $(XENSTORED_OBJS) - $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenctrl) $(LDLIBS_xenstored) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) -+ $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) $(LDLIBS_xenstored) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS) ++ $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenctrl) $(LDLIBS_xenstored) $(SOCKET_LIBS) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS) xenstored.a: $(XENSTORED_OBJS) $(AR) cr $@ $^ -@@ -127,13 +129,13 @@ tarball: clean +@@ -149,13 +151,13 @@ tarball: clean install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(includedir) diff --git a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch index d1e2bae5bc..b98cab3213 100644 --- a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch +++ b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch @@ -34,14 +34,14 @@ Signed-off-by: Ian Jackson --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile -@@ -45,6 +45,10 @@ x86_emulate/x86_emulate.c x86_emulate/x8 +@@ -100,6 +100,10 @@ asm/%: asm ; - HOSTCFLAGS += $(CFLAGS_xeninclude) + HOSTCFLAGS += $(CFLAGS_xeninclude) -I. +ifeq ($(XEN_TARGET_ARCH),x86_32) +HOSTCFLAGS += -no-pie -fno-pic +endif + - x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h - $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< + x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h + x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h) diff --git a/debian/patches/ubuntu-tools-libs-abiname.diff b/debian/patches/ubuntu-tools-libs-abiname.diff index 6094f1ee17..017fa16ccd 100644 --- a/debian/patches/ubuntu-tools-libs-abiname.diff +++ b/debian/patches/ubuntu-tools-libs-abiname.diff @@ -7,7 +7,7 @@ Subject: ubuntu-tools-libs-abiname --- a/tools/libs/call/Makefile +++ b/tools/libs/call/Makefile -@@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h) +@@ -56,22 +56,22 @@ headers.chk: $(wildcard include/*.h) libxencall.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -35,20 +35,20 @@ Subject: ubuntu-tools-libs-abiname + $(SYMLINK_SHLIB) libxencall-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxencall-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) libxencall-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxencall.so $(INSTALL_DATA) include/xencall.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) xencall.pc $(DESTDIR)$(PKG_INSTALLDIR) - .PHONY: TAGS -@@ -64,7 +64,7 @@ TAGS: +@@ -82,7 +82,7 @@ TAGS: .PHONY: clean clean: rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) - rm -f libxencall.so.$(MAJOR).$(MINOR) libxencall.so.$(MAJOR) + rm -f libxencall-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxencall-$(PACKAGE_VERSION).so.$(MAJOR) rm -f headers.chk + rm -f xencall.pc - .PHONY: distclean --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile -@@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h) +@@ -55,22 +55,22 @@ headers.chk: $(wildcard include/*.h) libxenevtchn.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -76,20 +76,20 @@ Subject: ubuntu-tools-libs-abiname + $(SYMLINK_SHLIB) libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxenevtchn.so $(INSTALL_DATA) include/xenevtchn.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) xenevtchn.pc $(DESTDIR)$(PKG_INSTALLDIR) - .PHONY: TAGS -@@ -64,7 +64,7 @@ TAGS: +@@ -81,7 +81,7 @@ TAGS: .PHONY: clean clean: rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) - rm -f libxenevtchn.so.$(MAJOR).$(MINOR) libxenevtchn.so.$(MAJOR) + rm -f libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR) rm -f headers.chk + rm -f xenevtchn.pc - .PHONY: distclean --- a/tools/libs/foreignmemory/Makefile +++ b/tools/libs/foreignmemory/Makefile -@@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h) +@@ -56,22 +56,22 @@ headers.chk: $(wildcard include/*.h) libxenforeignmemory.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -117,20 +117,20 @@ Subject: ubuntu-tools-libs-abiname + $(SYMLINK_SHLIB) libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxenforeignmemory.so $(INSTALL_DATA) include/xenforeignmemory.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) xenforeignmemory.pc $(DESTDIR)$(PKG_INSTALLDIR) - .PHONY: TAGS -@@ -64,7 +64,7 @@ TAGS: +@@ -82,7 +82,7 @@ TAGS: .PHONY: clean clean: rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) - rm -f libxenforeignmemory.so.$(MAJOR).$(MINOR) libxenforeignmemory.so.$(MAJOR) + rm -f libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR) rm -f headers.chk + rm -f xenforeignmemory.pc - .PHONY: distclean --- a/tools/libs/gnttab/Makefile +++ b/tools/libs/gnttab/Makefile -@@ -41,22 +41,22 @@ headers.chk: $(wildcard include/*.h) +@@ -58,22 +58,22 @@ headers.chk: $(wildcard include/*.h) libxengnttab.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -158,20 +158,20 @@ Subject: ubuntu-tools-libs-abiname + $(SYMLINK_SHLIB) libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxengnttab.so $(INSTALL_DATA) include/xengnttab.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) xengnttab.pc $(DESTDIR)$(PKG_INSTALLDIR) - .PHONY: TAGS -@@ -66,7 +66,7 @@ TAGS: +@@ -84,7 +84,7 @@ TAGS: .PHONY: clean clean: rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) - rm -f libxengnttab.so.$(MAJOR).$(MINOR) libxengnttab.so.$(MAJOR) + rm -f libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR) rm -f headers.chk + rm -f xengnttab.pc - .PHONY: distclean --- a/tools/libs/toollog/Makefile +++ b/tools/libs/toollog/Makefile -@@ -34,22 +34,22 @@ headers.chk: $(wildcard include/*.h) +@@ -50,22 +50,22 @@ headers.chk: $(wildcard include/*.h) libxentoollog.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -199,14 +199,55 @@ Subject: ubuntu-tools-libs-abiname + $(SYMLINK_SHLIB) libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so $(INSTALL_DATA) include/xentoollog.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) xentoollog.pc $(DESTDIR)$(PKG_INSTALLDIR) - .PHONY: TAGS -@@ -59,7 +59,7 @@ TAGS: +@@ -76,7 +76,7 @@ TAGS: .PHONY: clean clean: rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) - rm -f libxentoollog.so.$(MAJOR).$(MINOR) libxentoollog.so.$(MAJOR) + rm -f libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) rm -f headers.chk + rm -f xentoollog.pc + +--- a/tools/libs/devicemodel/Makefile ++++ b/tools/libs/devicemodel/Makefile +@@ -57,22 +57,22 @@ headers.chk: $(wildcard include/*.h) + libxendevicemodel.a: $(LIB_OBJS) + $(AR) rc $@ $^ + +-libxendevicemodel.so: libxendevicemodel.so.$(MAJOR) ++libxendevicemodel.so: libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) $< $@ +-libxendevicemodel.so.$(MAJOR): libxendevicemodel.so.$(MAJOR).$(MINOR) ++libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR): libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) + $(SYMLINK_SHLIB) $< $@ + +-libxendevicemodel.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxendevicemodel.map +- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxendevicemodel.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxencall) $(APPEND_LDFLAGS) ++libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxendevicemodel.map ++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxencall) $(APPEND_LDFLAGS) + + .PHONY: install + install: build + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) +- $(INSTALL_SHLIB) libxendevicemodel.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) ++ $(INSTALL_SHLIB) libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxendevicemodel.a $(DESTDIR)$(libdir) +- $(SYMLINK_SHLIB) libxendevicemodel.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxendevicemodel.so.$(MAJOR) +- $(SYMLINK_SHLIB) libxendevicemodel.so.$(MAJOR) $(DESTDIR)$(libdir)/libxendevicemodel.so ++ $(SYMLINK_SHLIB) libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR) ++ $(SYMLINK_SHLIB) libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxendevicemodel.so + $(INSTALL_DATA) include/xendevicemodel.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) xendevicemodel.pc $(DESTDIR)$(PKG_INSTALLDIR) + +@@ -83,7 +83,7 @@ TAGS: + .PHONY: clean + clean: + rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) +- rm -f libxendevicemodel.so.$(MAJOR).$(MINOR) libxendevicemodel.so.$(MAJOR) ++ rm -f libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR) + rm -f headers.chk + rm -f xendevicemodel.pc - .PHONY: distclean diff --git a/debian/patches/version.diff b/debian/patches/version.diff index 7295d9def1..4cc5bf61a1 100644 --- a/debian/patches/version.diff +++ b/debian/patches/version.diff @@ -8,7 +8,7 @@ Patch-Name: version.diff --- a/xen/Makefile +++ b/xen/Makefile -@@ -160,7 +160,7 @@ delete-unfresh-files: +@@ -161,7 +161,7 @@ delete-unfresh-files: @mv -f $@.tmp $@ # compile.h contains dynamic build info. Rebuilt on every 'make' invocation. @@ -17,7 +17,7 @@ Patch-Name: version.diff @sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ -e 's/@@time@@/$(XEN_BUILD_TIME)/g' \ -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -@@ -171,9 +171,11 @@ include/xen/compile.h: include/xen/compi +@@ -172,9 +172,11 @@ include/xen/compile.h: include/xen/compi -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \ @@ -33,7 +33,7 @@ Patch-Name: version.diff include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s --- a/xen/common/kernel.c +++ b/xen/common/kernel.c -@@ -252,8 +252,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL +@@ -270,8 +270,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL memset(&info, 0, sizeof(info)); safe_strcpy(info.compiler, deny ? xen_deny() : xen_compiler()); @@ -91,7 +91,7 @@ Patch-Name: version.diff return ""; --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c -@@ -732,14 +732,11 @@ void __init console_init_preirq(void) +@@ -776,14 +776,11 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); /* HELLO WORLD --- start-of-day banner text. */ diff --git a/debian/rules.real b/debian/rules.real index a617cefa40..95dfaba518 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -107,6 +107,7 @@ $(STAMPS_DIR)/install-utils_$(ARCH): CONFIG = \ $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH) $(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH) + +$(MAKE_CLEAN) -C $(DIR) $(CONFIG) build-tools-public-headers +$(MAKE_CLEAN) -C $(DIR)/tools $(CONFIG) touch $@ @@ -115,6 +116,8 @@ $(STAMPS_DIR)/install-utils_$(ARCH): INSTALL_DIR = $(BUILD_DIR)/install-utils_$( $(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH) @rm -rf $(INSTALL_DIR) mkdir -p $(INSTALL_DIR)/$(OCAML_DLL_DIR) + +$(MAKE_CLEAN) -C $(DIR) install-tools-public-headers \ + DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG) +$(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG) ifneq ($(filter i386 amd64,$(ARCH)),) # hvmloader @@ -218,6 +221,7 @@ install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH dh_prep install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian + cp $(DIR)/usr/sbin/* $(DIR)/usr/lib/xen-$(VERSION)/bin/ dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION) dh_install debian/templates/xen-utils.bug/* usr/share/bug/$(PACKAGE_NAME) dh_lintian -- 2.30.2