From: Hans van Kranenburg Date: Sun, 7 Jan 2018 23:56:30 +0000 (+0100) Subject: Refresh existing patches for 4.10 X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~117 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7640735dcdb90d78635de67639fb66c1728d0ef9;p=xen.git Refresh existing patches for 4.10 First part of dealing with the upstream changes... - drop rerun-autogen.sh-stretch.patch, it's in the upstream code - also include the new uninstall sections (regardless of the fact if it's used or not, let's keep things neat and tidy) Signed-off-by: Hans van Kranenburg --- diff --git a/debian/patches/config-prefix.diff b/debian/patches/config-prefix.diff index c7a7d60dee..03711eec63 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 -@@ -77,7 +77,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib +@@ -82,7 +82,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 deleted file mode 100644 index 8fdd5aed65..0000000000 --- a/debian/patches/rerun-autogen.sh-stretch.patch +++ /dev/null @@ -1,214 +0,0 @@ -From: Ian Jackson -Date: Fri, 28 Oct 2016 14:52:13 +0100 -Subject: Rerun autogen.sh (stretch) - -Using autoconf 2.69-10 (amd64) - -Signed-off-by: Ian Jackson - ---- - ---- a/configure -+++ b/configure -@@ -643,6 +643,7 @@ infodir - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -720,6 +721,7 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -972,6 +974,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -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 \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -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] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] ---- a/docs/configure -+++ b/docs/configure -@@ -634,6 +634,7 @@ infodir - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -710,6 +711,7 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -962,6 +964,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -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 \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -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] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] ---- a/stubdom/configure -+++ b/stubdom/configure -@@ -659,6 +659,7 @@ infodir - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -748,6 +749,7 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1000,6 +1002,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1137,7 +1148,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 \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1290,6 +1301,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] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] ---- a/tools/configure -+++ b/tools/configure -@@ -769,6 +769,7 @@ infodir - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -892,6 +893,7 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1144,6 +1146,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -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 \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -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] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/debian/patches/series b/debian/patches/series index a33021e33d..59862c9e16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -rerun-autogen.sh-stretch.patch version.diff config-prefix.diff tools-libfsimage-abiname.diff diff --git a/debian/patches/tools-blktap2-prefix.diff b/debian/patches/tools-blktap2-prefix.diff index c13f1538d6..d6ea7da478 100644 --- a/debian/patches/tools-blktap2-prefix.diff +++ b/debian/patches/tools-blktap2-prefix.diff @@ -33,7 +33,7 @@ Patch-Name: tools-blktap2-prefix.diff ifneq ($(CONFIG_LIBXC_MINIOS),y) PKG_CONFIG_INST := $(PKG_CONFIG) -@@ -62,33 +59,26 @@ all: build +@@ -62,43 +59,34 @@ all: build build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) @@ -69,11 +69,23 @@ Patch-Name: tools-blktap2-prefix.diff $(INSTALL_DATA) xenblktapctl.pc $(DESTDIR)$(PKG_INSTALLDIR) clean: - rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) + rm -f $(OBJS) $(PICS) $(DEPS_RM) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) - rm -f $(LIBNAME).so $(LIBSONAME) rm -f *~ rm -f xenblktapctl.pc + uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenblktapctl.pc +- rm -f $(DESTDIR)$(libdir)/$(LIBSONAME) +- rm -f $(DESTDIR)$(libdir)/$(LIBNAME).so +- rm -f $(addprefix $(DESTDIR)$(libdir)/, $(LIB_SHARED)) ++ rm -f $(addprefix $(DESTDIR)$(LIBEXEC_LIB)/, $(LIB_SHARED)) + rm -f $(addprefix $(DESTDIR)$(libdir)/, $(LIB_STATIC)) +- rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(IBIN)) ++ rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(IBIN)) + + distclean: clean + --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -12,6 +12,7 @@ CFLAGS += -Werror @@ -114,7 +126,7 @@ Patch-Name: tools-blktap2-prefix.diff ifeq ($(CONFIG_LIBICONV),y) LIBS += -liconv -@@ -50,27 +44,22 @@ LIB-OBJS += $(LVM-UTIL-OBJ) +@@ -50,33 +44,26 @@ LIB-OBJS += $(LVM-UTIL-OBJ) LIB-PICOBJS = $(patsubst %.o,%.opic,$(LIB-OBJS)) @@ -147,5 +159,13 @@ Patch-Name: tools-blktap2-prefix.diff + $(INSTALL_DATA) libvhd.a $(DESTDIR)$(libdir) + $(INSTALL_PROG) libvhd.so $(DESTDIR)$(libdir) + uninstall: +- rm -f $(DESTDIR)$(INST-DIR)/libvhd.so +- rm -f $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR) +- rm -f $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) +- rm -f $(DESTDIR)$(INST-DIR)/libvhd.a ++ rm -f $(DESTDIR)$(libdir)/libvhd.so ++ rm -f $(DESTDIR)$(libdir)/libvhd.a + clean: - rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD) + rm -rf *.a *.so* *.o *.opic *~ $(DEPS_RM) $(LIBVHD) diff --git a/debian/patches/tools-console-prefix.diff b/debian/patches/tools-console-prefix.diff index 6736fff4d5..147be925ab 100644 --- a/debian/patches/tools-console-prefix.diff +++ b/debian/patches/tools-console-prefix.diff @@ -16,14 +16,20 @@ Patch-Name: tools-console-prefix.diff LDLIBS_xenconsoled += $(UTIL_LIBS) LDLIBS_xenconsoled += -lrt -@@ -44,9 +45,7 @@ $(eval $(genpath-target)) +@@ -45,14 +46,13 @@ $(eval $(genpath-target)) .PHONY: install install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(sbindir) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) -- $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) -+ $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) ++ $(INSTALL_PROG) xenconsoled $(DESTDIR)$(LIBEXEC_BIN) - -include $(DEPS) + .PHONY: uninstall + uninstall: + rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole +- rm -f $(DESTDIR)$(sbindir)/xenconsoled ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsoled + + -include $(DEPS_INCLUDE) diff --git a/debian/patches/tools-fake-xs-restrict.patch b/debian/patches/tools-fake-xs-restrict.patch index 8551419846..4c5d37e9ca 100644 --- a/debian/patches/tools-fake-xs-restrict.patch +++ b/debian/patches/tools-fake-xs-restrict.patch @@ -22,7 +22,7 @@ Forwarded: No */ --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c -@@ -771,6 +771,12 @@ unwind: +@@ -792,6 +792,12 @@ unwind: return false; } diff --git a/debian/patches/tools-libfsimage-abiname.diff b/debian/patches/tools-libfsimage-abiname.diff index 82715e312e..a5dd479e7f 100644 --- a/debian/patches/tools-libfsimage-abiname.diff +++ b/debian/patches/tools-libfsimage-abiname.diff @@ -38,7 +38,13 @@ Patch-Name: tools-libfsimage-abiname.diff $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) -@@ -34,13 +29,8 @@ install: all +@@ -37,19 +32,12 @@ uninstall: + rm -f $(DESTDIR)$(includedir)/fsimage_plugin.h + rm -f $(DESTDIR)$(includedir)/fsimage.h + rm -f $(DESTDIR)$(libdir)/libfsimage.so +- rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR).$(MINOR) + clean distclean:: rm -f $(LIB) @@ -52,5 +58,5 @@ Patch-Name: tools-libfsimage-abiname.diff +libfsimage.so: $(PIC_OBJS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS) - -include $(DEPS) + -include $(DEPS_INCLUDE) diff --git a/debian/patches/tools-libfsimage-prefix.diff b/debian/patches/tools-libfsimage-prefix.diff index ee15d59ac0..c6ceea754e 100644 --- a/debian/patches/tools-libfsimage-prefix.diff +++ b/debian/patches/tools-libfsimage-prefix.diff @@ -44,3 +44,12 @@ Patch-Name: tools-libfsimage-prefix.diff $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) +@@ -31,7 +33,7 @@ uninstall: + rm -f $(DESTDIR)$(includedir)/fsimage_grub.h + rm -f $(DESTDIR)$(includedir)/fsimage_plugin.h + rm -f $(DESTDIR)$(includedir)/fsimage.h +- rm -f $(DESTDIR)$(libdir)/libfsimage.so ++ rm -f $(DESTDIR)$(LIBEXEC_LIB)/libfsimage.so + + clean distclean:: + rm -f $(LIB) diff --git a/debian/patches/tools-libxc-abiname.diff b/debian/patches/tools-libxc-abiname.diff index e3de892b21..4f95cfd397 100644 --- a/debian/patches/tools-libxc-abiname.diff +++ b/debian/patches/tools-libxc-abiname.diff @@ -12,7 +12,7 @@ Patch-Name: tools-libxc-abiname.diff XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk --MAJOR = 4.9 +-MAJOR = 4.10 -MINOR = 0 - ifeq ($(CONFIG_LIBXC_MINIOS),y) @@ -62,7 +62,25 @@ Patch-Name: tools-libxc-abiname.diff $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) $(INSTALL_DATA) xencontrol.pc $(DESTDIR)$(PKG_INSTALLDIR) $(INSTALL_DATA) xenguest.pc $(DESTDIR)$(PKG_INSTALLDIR) -@@ -233,22 +228,18 @@ rpm: build +@@ -208,15 +203,13 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenguest.pc + rm -f $(DESTDIR)$(includedir)/xenguest.h + rm -f $(DESTDIR)$(libdir)/libxenguest.so +- rm -f $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxenguest-$(PACKAGE_VERSION).so + rm -f $(DESTDIR)$(libdir)/libxenguest.a + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xencontrol.pc + rm -f $(DESTDIR)$(includedir)/xenctrl.h + rm -f $(DESTDIR)$(includedir)/xenctrl_compat.h + rm -f $(DESTDIR)$(libdir)/libxenctrl.so +- rm -f $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxenctrl-$(PACKAGE_VERSION).so + rm -f $(DESTDIR)$(libdir)/libxenctrl.a + + .PHONY: TAGS +@@ -249,22 +242,18 @@ rpm: build libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ @@ -89,7 +107,7 @@ Patch-Name: tools-libxc-abiname.diff $(SYMLINK_SHLIB) $< $@ ifeq ($(CONFIG_MiniOS),y) -@@ -260,9 +251,9 @@ endif +@@ -276,9 +265,9 @@ endif xc_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options)) xc_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options)) @@ -100,5 +118,5 @@ Patch-Name: tools-libxc-abiname.diff +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) - -include $(DEPS) + -include $(DEPS_INCLUDE) diff --git a/debian/patches/tools-libxl-abiname.diff b/debian/patches/tools-libxl-abiname.diff index ddb8e258cc..d27e686d3b 100644 --- a/debian/patches/tools-libxl-abiname.diff +++ b/debian/patches/tools-libxl-abiname.diff @@ -11,16 +11,16 @@ Patch-Name: tools-libxl-abiname.diff XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk --MAJOR = 4.9 +-MAJOR = 4.10 -MINOR = 0 - --XLUMAJOR = 4.9 +-XLUMAJOR = 4.10 -XLUMINOR = 0 - CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS += -I. -fPIC -@@ -189,12 +183,12 @@ SAVE_HELPER_OBJS = libxl_save_helper.o _ +@@ -190,12 +184,12 @@ SAVE_HELPER_OBJS = libxl_save_helper.o _ $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtchn) PKG_CONFIG = xenlight.pc xlutil.pc @@ -36,7 +36,7 @@ Patch-Name: tools-libxl-abiname.diff $(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 +@@ -203,8 +197,8 @@ endif PKG_CONFIG_LOCAL := $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) @@ -47,7 +47,7 @@ Patch-Name: tools-libxl-abiname.diff $(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 +@@ -274,29 +268,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) @@ -84,7 +84,7 @@ Patch-Name: tools-libxl-abiname.diff libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ -@@ -315,13 +303,11 @@ install: all +@@ -316,13 +304,11 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) @@ -102,3 +102,18 @@ Patch-Name: tools-libxl-abiname.diff $(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) xenlight.pc $(DESTDIR)$(PKG_INSTALLDIR) +@@ -334,12 +320,10 @@ uninstall: + rm -f $(addprefix $(DESTDIR)$(includedir)/,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) + rm -f $(DESTDIR)$(libdir)/libxlutil.a + rm -f $(DESTDIR)$(libdir)/libxlutil.so +- rm -f $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR) +- rm -f $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR).$(XLUMINOR) ++ rm -f $(DESTDIR)$(libdir)/libxlutil-$(PACKAGE_VERSION).so + rm -f $(DESTDIR)$(libdir)/libxenlight.a + rm -f $(DESTDIR)$(libdir)/libxenlight.so +- rm -f $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxenlight-$(PACKAGE_VERSION).so + rm -f $(DESTDIR)$(LIBEXEC_BIN)/libxl-save-helper + + .PHONY: clean diff --git a/debian/patches/tools-libxl-prefix.diff b/debian/patches/tools-libxl-prefix.diff index dd07fdbfda..ea329b4138 100644 --- a/debian/patches/tools-libxl-prefix.diff +++ b/debian/patches/tools-libxl-prefix.diff @@ -9,16 +9,17 @@ Note: SMB: Added change for LIBEXEC_BIN for tools/xl/Makefile --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile -@@ -12,6 +12,8 @@ CFLAGS += -I. -fPIC - ifeq ($(CONFIG_Linux),y) +@@ -13,6 +13,9 @@ ifeq ($(CONFIG_Linux),y) LIBUUID_LIBS += -luuid endif + +LDFLAGS_XL = $(call LDFLAGS_RPATH,../lib) +LDFLAGS_LIBXL = $(call LDFLAGS_RPATH) - ++ LIBXL_LIBS = - LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) -@@ -271,7 +273,7 @@ libxenlight.so: libxenlight-$(PACKAGE_VE + LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(LDLIBS_libxentoolcore) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) + ifeq ($(CONFIG_LIBNL),y) +@@ -272,7 +275,7 @@ libxenlight.so: libxenlight-$(PACKAGE_VE $(SYMLINK_SHLIB) $< $@ libxenlight-$(PACKAGE_VERSION).so: $(LIBXL_OBJS) @@ -29,7 +30,7 @@ Note: SMB: Added change for LIBEXEC_BIN for tools/xl/Makefile $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) --- a/tools/xl/Makefile +++ b/tools/xl/Makefile -@@ -39,9 +39,9 @@ xl: $(XL_OBJS) +@@ -41,15 +41,15 @@ xl: $(XL_OBJS) .PHONY: install install: all @@ -40,4 +41,11 @@ Note: SMB: Added change for LIBEXEC_BIN for tools/xl/Makefile + $(INSTALL_PROG) xl $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + .PHONY: uninstall + uninstall: + rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh +- rm -f $(DESTDIR)$(sbindir)/xl ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xl + .PHONY: clean + clean: diff --git a/debian/patches/tools-misc-prefix.diff b/debian/patches/tools-misc-prefix.diff index 0ae3358f91..9674a3e0f6 100644 --- a/debian/patches/tools-misc-prefix.diff +++ b/debian/patches/tools-misc-prefix.diff @@ -8,7 +8,7 @@ Patch-Name: tools-misc-prefix.diff --- a/tools/misc/Makefile +++ b/tools/misc/Makefile -@@ -54,12 +54,8 @@ all build: $(TARGETS_BUILD) +@@ -55,18 +55,16 @@ all build: $(TARGETS_BUILD) .PHONY: install install: build @@ -17,8 +17,17 @@ Patch-Name: tools-misc-prefix.diff $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(bindir) - $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(sbindir) -- $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) -+ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) ++ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(LIBEXEC_BIN) ++ $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) + + .PHONY: uninstall + uninstall: + rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(INSTALL_PRIVBIN)) +- rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(INSTALL_SBIN)) +- rm -f $(addprefix $(DESTDIR)$(bindir)/, $(INSTALL_BIN)) ++ rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(INSTALL_SBIN)) ++ rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(INSTALL_BIN)) .PHONY: clean clean: diff --git a/debian/patches/tools-pygrub-prefix.diff b/debian/patches/tools-pygrub-prefix.diff index 3b05289be6..bcb8770e25 100644 --- a/debian/patches/tools-pygrub-prefix.diff +++ b/debian/patches/tools-pygrub-prefix.diff @@ -8,18 +8,18 @@ Patch-Name: tools-pygrub-prefix.diff --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile -@@ -16,11 +16,6 @@ install: all +@@ -18,11 +18,6 @@ install: all CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \ - setup.py install $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ - --install-scripts=$(LIBEXEC_BIN) --force + setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ + --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force - set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ - "`readlink -f $(DESTDIR)/$(bindir)`" != \ - "`readlink -f $(LIBEXEC_BIN)`" ]; then \ - ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(bindir); \ - fi - .PHONY: clean - clean: + .PHONY: uninstall + uninstall: --- a/tools/pygrub/setup.py +++ b/tools/pygrub/setup.py @@ -4,11 +4,13 @@ import os diff --git a/debian/patches/tools-rpath.diff b/debian/patches/tools-rpath.diff index f6ecd2c108..8c2c7099e5 100644 --- a/debian/patches/tools-rpath.diff +++ b/debian/patches/tools-rpath.diff @@ -15,5 +15,5 @@ Patch-Name: tools-rpath.diff +LDFLAGS_RPATH = -Wl,-rpath,'$${ORIGIN}$(if $(1),/$(1))' + XEN_INCLUDE = $(XEN_ROOT)/tools/include + XEN_LIBXENTOOLCORE = $(XEN_ROOT)/tools/libs/toolcore XEN_LIBXENTOOLLOG = $(XEN_ROOT)/tools/libs/toollog - XEN_LIBXENEVTCHN = $(XEN_ROOT)/tools/libs/evtchn diff --git a/debian/patches/tools-xenmon-prefix.diff b/debian/patches/tools-xenmon-prefix.diff index 6579a72e16..d42909df68 100644 --- a/debian/patches/tools-xenmon-prefix.diff +++ b/debian/patches/tools-xenmon-prefix.diff @@ -16,7 +16,7 @@ Patch-Name: tools-xenmon-prefix.diff SCRIPTS = xenmon.py -@@ -29,10 +30,10 @@ build: xentrace_setmask xenbaked +@@ -29,16 +30,16 @@ build: xentrace_setmask xenbaked .PHONY: install install: build @@ -29,5 +29,14 @@ Patch-Name: tools-xenmon-prefix.diff + $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(LIBEXEC_BIN)/xentrace_setmask + $(INSTALL_PROG) xenmon.py $(DESTDIR)$(LIBEXEC_BIN)/xenmon.py + .PHONY: uninstall + uninstall: +- rm -f $(DESTDIR)$(sbindir)/xenbaked +- rm -f $(DESTDIR)$(sbindir)/xentrace_setmask +- rm -f $(DESTDIR)$(sbindir)/xenmon.py ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenbaked ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xentrace_setmask ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenmon.py + .PHONY: clean clean: diff --git a/debian/patches/tools-xenpmd-prefix.diff b/debian/patches/tools-xenpmd-prefix.diff index 62219358ef..80cefffe06 100644 --- a/debian/patches/tools-xenpmd-prefix.diff +++ b/debian/patches/tools-xenpmd-prefix.diff @@ -19,3 +19,12 @@ Patch-Name: tools-xenpmd-prefix.diff .PHONY: clean clean: +@@ -23,7 +23,7 @@ distclean: clean + + .PHONY: uninstall + uninstall: +- rm -f $(DESTDIR)$(sbindir)/xenpmd ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenpmd + + xenpmd: xenpmd.o Makefile + $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS) diff --git a/debian/patches/tools-xenstat-abiname.diff b/debian/patches/tools-xenstat-abiname.diff index e6ef3bca5f..f01d9cff8c 100644 --- a/debian/patches/tools-xenstat-abiname.diff +++ b/debian/patches/tools-xenstat-abiname.diff @@ -48,7 +48,7 @@ Patch-Name: tools-xenstat-abiname.diff $(OBJECTS-y): src/_paths.h -@@ -66,19 +62,11 @@ $(SHLIB): $(OBJECTS-y) +@@ -66,27 +62,17 @@ $(SHLIB): $(OBJECTS-y) $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \ $(OBJECTS-y) $(LDLIBS-y) $(APPEND_LDFLAGS) @@ -68,4 +68,12 @@ Patch-Name: tools-xenstat-abiname.diff + $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(libdir) $(INSTALL_DATA) xenstat.pc $(DESTDIR)$(PKG_INSTALLDIR) - PYLIB=bindings/swig/python/_xenstat.so + .PHONY: uninstall + uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenstat.pc + rm -f $(DESTDIR)$(libdir)/libxenstat.so +- rm -f $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxenstat.a + rm -f $(DESTDIR)$(includedir)/xenstat.h + diff --git a/debian/patches/tools-xenstat-prefix.diff b/debian/patches/tools-xenstat-prefix.diff index b179a8dae4..2847db4d83 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 -@@ -64,9 +64,11 @@ $(SHLIB): $(OBJECTS-y) +@@ -64,17 +64,19 @@ $(SHLIB): $(OBJECTS-y) .PHONY: install install: all @@ -29,10 +29,20 @@ Patch-Name: tools-xenstat-prefix.diff + $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBEXEC_LIB) $(INSTALL_DATA) xenstat.pc $(DESTDIR)$(PKG_INSTALLDIR) + .PHONY: uninstall + uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenstat.pc +- rm -f $(DESTDIR)$(libdir)/libxenstat.so ++ rm -f $(DESTDIR)$(LIBEXEC_LIB)/libxenstat.so + rm -f $(DESTDIR)$(libdir)/libxenstat.a +- rm -f $(DESTDIR)$(includedir)/xenstat.h ++ rm -f $(DESTDIR)$(LIBEXEC_LIB)/xenstat.h + 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: +@@ -19,7 +19,9 @@ all install xentop uninstall: else CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) @@ -42,7 +52,7 @@ Patch-Name: tools-xenstat-prefix.diff CFLAGS += -DHOST_$(XEN_OS) # Include configure output (config.h) -@@ -31,8 +33,8 @@ all: xentop +@@ -31,12 +33,12 @@ all: xentop .PHONY: install install: xentop @@ -51,5 +61,10 @@ Patch-Name: tools-xenstat-prefix.diff + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) xentop $(DESTDIR)$(LIBEXEC_BIN)/xentop + .PHONY: uninstall + uninstall: +- rm -f $(DESTDIR)$(sbindir)/xentop ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xentop + endif diff --git a/debian/patches/tools-xenstore-compatibility.diff b/debian/patches/tools-xenstore-compatibility.diff index 06ef66ec6b..4cb3f1e21d 100644 --- a/debian/patches/tools-xenstore-compatibility.diff +++ b/debian/patches/tools-xenstore-compatibility.diff @@ -29,7 +29,7 @@ Patch-Name: tools-xenstore-compatibility.diff again: --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c -@@ -281,17 +281,19 @@ struct xs_handle *xs_daemon_open_readonl +@@ -301,17 +301,19 @@ struct xs_handle *xs_daemon_open_readonl struct xs_handle *xs_domain_open(void) { diff --git a/debian/patches/tools-xenstore-prefix.diff b/debian/patches/tools-xenstore-prefix.diff index ff0ec53879..c56f24d1ce 100644 --- a/debian/patches/tools-xenstore-prefix.diff +++ b/debian/patches/tools-xenstore-prefix.diff @@ -19,7 +19,7 @@ Patch-Name: tools-xenstore-prefix.diff install: all --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile -@@ -20,6 +20,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_L +@@ -21,6 +21,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_L CFLAGS += $(CFLAGS-y) LDFLAGS += $(LDFLAGS-y) @@ -28,7 +28,7 @@ Patch-Name: tools-xenstore-prefix.diff CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS += xenstore-write xenstore-ls xenstore-watch -@@ -76,7 +78,7 @@ endif +@@ -77,7 +79,7 @@ endif $(XENSTORED_OBJS): CFLAGS += $(CFLAGS_libxengnttab) xenstored: $(XENSTORED_OBJS) @@ -37,7 +37,7 @@ Patch-Name: tools-xenstore-prefix.diff xenstored.a: $(XENSTORED_OBJS) $(AR) cr $@ $^ -@@ -149,13 +151,13 @@ tarball: clean +@@ -150,13 +152,13 @@ tarball: clean install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(includedir) @@ -54,3 +54,15 @@ Patch-Name: tools-xenstore-prefix.diff $(INSTALL_PROG) xenstore $(DESTDIR)$(bindir) set -e ; for c in $(CLIENTS) ; do \ ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ +@@ -189,9 +191,9 @@ uninstall: + rm -f $(DESTDIR)$(libdir)/libxenstore.so.$(MAJOR).$(MINOR) + rm -f $(addprefix $(DESTDIR)$(bindir)/, $(CLIENTS)) + rm -f $(DESTDIR)$(bindir)/xenstore +- rm -f $(DESTDIR)$(bindir)/xenstore-control ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenstore-control + ifeq ($(XENSTORE_XENSTORED),y) +- rm -f $(DESTDIR)$(sbindir)/xenstored ++ rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenstored + if [ -d $(DESTDIR)$(XEN_LIB_STORED) ]; then \ + rmdir --ignore-fail-on-non-empty $(DESTDIR)$(XEN_LIB_STORED); \ + fi diff --git a/debian/patches/tools-xentrace-prefix.diff b/debian/patches/tools-xentrace-prefix.diff index fc8261776e..02caac0cf0 100644 --- a/debian/patches/tools-xentrace-prefix.diff +++ b/debian/patches/tools-xentrace-prefix.diff @@ -16,22 +16,31 @@ Patch-Name: tools-xentrace-prefix.diff BIN-$(CONFIG_X86) = xenalyze BIN = $(BIN-y) -@@ -23,15 +24,9 @@ build: $(BIN) $(SBIN) $(LIBBIN) +@@ -23,21 +24,19 @@ build: $(BIN) $(SBIN) $(LIBBIN) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(sbindir) - [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) --ifneq ($(BIN),) ++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + ifneq ($(BIN),) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) --endif ++ $(INSTALL_PROG) $(BIN) $(DESTDIR)$(LIBEXEC_BIN) + endif - $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) -- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) -+ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) -+ $(INSTALL_PROG) $(BIN) $(SBIN) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) ++ $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(LIBEXEC_BIN) + [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) - .PHONY: clean - clean: + .PHONY: uninstall + uninstall: + rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(LIBBIN)) +- rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS)) +- rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(SBIN)) ++ rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(SCRIPTS)) ++ rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(SBIN)) + ifneq ($(BIN),) + rm -f $(addprefix $(DESTDIR)$(bindir)/, $(BIN)) + endif diff --git a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch index b98cab3213..9eee2b34c9 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 -@@ -100,6 +100,10 @@ asm/%: asm ; - - HOSTCFLAGS += $(CFLAGS_xeninclude) -I. +@@ -104,6 +104,10 @@ HOSTCFLAGS-x86_64 := -fno-PIE + $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) + HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) +ifeq ($(XEN_TARGET_ARCH),x86_32) +HOSTCFLAGS += -no-pie -fno-pic +endif + 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) + 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 017fa16ccd..2af18378a0 100644 --- a/debian/patches/ubuntu-tools-libs-abiname.diff +++ b/debian/patches/ubuntu-tools-libs-abiname.diff @@ -19,9 +19,9 @@ Subject: ubuntu-tools-libs-abiname $(SYMLINK_SHLIB) $< $@ -libxencall.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxencall.map -- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxencall.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) +- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxencall.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) +libxencall-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxencall.map -+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxencall-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxencall-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) .PHONY: install install: build @@ -37,15 +37,78 @@ Subject: ubuntu-tools-libs-abiname $(INSTALL_DATA) include/xencall.h $(DESTDIR)$(includedir) $(INSTALL_DATA) xencall.pc $(DESTDIR)$(PKG_INSTALLDIR) -@@ -82,7 +82,7 @@ TAGS: +@@ -80,8 +80,8 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xencall.pc + rm -f $(DESTDIR)$(includedir)/xencall.h + rm -f $(DESTDIR)$(libdir)/libxencall.so +- rm -f $(DESTDIR)$(libdir)/libxencall.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxencall.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxencall-$(PACKAGE_VERSION).so.$(MAJOR) ++ rm -f $(DESTDIR)$(libdir)/libxencall-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxencall.a + + .PHONY: TAGS +@@ -91,7 +91,7 @@ TAGS: .PHONY: clean clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) + rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(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 +--- a/tools/libs/toollog/Makefile ++++ b/tools/libs/toollog/Makefile +@@ -50,22 +50,22 @@ headers.chk: $(wildcard include/*.h) + libxentoollog.a: $(LIB_OBJS) + $(AR) rc $@ $^ + +-libxentoollog.so: libxentoollog.so.$(MAJOR) ++libxentoollog.so: libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) + $(SYMLINK_SHLIB) $< $@ +-libxentoollog.so.$(MAJOR): libxentoollog.so.$(MAJOR).$(MINOR) ++libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR): libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) + $(SYMLINK_SHLIB) $< $@ + +-libxentoollog.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map +- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) ++libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map ++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) + + .PHONY: install + install: build + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) +- $(INSTALL_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) ++ $(INSTALL_SHLIB) libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxentoollog.a $(DESTDIR)$(libdir) +- $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) +- $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so ++ $(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) + +@@ -74,8 +74,8 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xentoollog.pc + rm -f $(DESTDIR)$(includedir)/xentoollog.h + rm -f $(DESTDIR)$(libdir)/libxentoollog.so +- rm -f $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) ++ rm -f $(DESTDIR)$(libdir)/libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxentoollog.a + + .PHONY: TAGS +@@ -85,7 +85,7 @@ TAGS: + .PHONY: clean + clean: + rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(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/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -55,22 +55,22 @@ headers.chk: $(wildcard include/*.h) @@ -60,9 +123,9 @@ Subject: ubuntu-tools-libs-abiname $(SYMLINK_SHLIB) $< $@ -libxenevtchn.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxenevtchn.map -- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenevtchn.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) +- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenevtchn.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) +libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxenevtchn.map -+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) .PHONY: install install: build @@ -78,14 +141,14 @@ Subject: ubuntu-tools-libs-abiname $(INSTALL_DATA) include/xenevtchn.h $(DESTDIR)$(includedir) $(INSTALL_DATA) xenevtchn.pc $(DESTDIR)$(PKG_INSTALLDIR) -@@ -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 +@@ -79,7 +79,7 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenevtchn.pc + rm -f $(DESTDIR)$(includedir)/xenevtchn.h + rm -f $(DESTDIR)$(libdir)/libxenevtchn.so +- rm -f $(DESTDIR)$(libdir)/libxenevtchn.so.$(MAJOR) ++ rm -f $(DESTDIR)$(libdir)/libxenevtchn-$(PACKAGE_VERSION).so.$(MAJOR) + rm -f $(DESTDIR)$(libdir)/libxenevtchn.so.$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxenevtchn.a --- a/tools/libs/foreignmemory/Makefile +++ b/tools/libs/foreignmemory/Makefile @@ -101,9 +164,9 @@ Subject: ubuntu-tools-libs-abiname $(SYMLINK_SHLIB) $< $@ -libxenforeignmemory.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxenforeignmemory.map -- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenforeignmemory.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) +- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenforeignmemory.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) +libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxenforeignmemory.map -+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) .PHONY: install install: build @@ -119,10 +182,21 @@ Subject: ubuntu-tools-libs-abiname $(INSTALL_DATA) include/xenforeignmemory.h $(DESTDIR)$(includedir) $(INSTALL_DATA) xenforeignmemory.pc $(DESTDIR)$(PKG_INSTALLDIR) -@@ -82,7 +82,7 @@ TAGS: +@@ -80,8 +80,8 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenforeignmemory.pc + rm -f $(DESTDIR)$(includedir)/xenforeignmemory.h + rm -f $(DESTDIR)$(libdir)/libxenforeignmemory.so +- rm -f $(DESTDIR)$(libdir)/libxenforeignmemory.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxenforeignmemory.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR) ++ rm -f $(DESTDIR)$(libdir)/libxenforeignmemory-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxenforeignmemory.a + + .PHONY: TAGS +@@ -91,7 +91,7 @@ TAGS: .PHONY: clean clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) + rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(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 @@ -142,9 +216,9 @@ Subject: ubuntu-tools-libs-abiname $(SYMLINK_SHLIB) $< $@ -libxengnttab.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxengnttab.map -- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxengnttab.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) +- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxengnttab.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) +libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxengnttab.map -+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxengnttab-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) .PHONY: install install: build @@ -160,59 +234,29 @@ Subject: ubuntu-tools-libs-abiname $(INSTALL_DATA) include/xengnttab.h $(DESTDIR)$(includedir) $(INSTALL_DATA) xengnttab.pc $(DESTDIR)$(PKG_INSTALLDIR) -@@ -84,7 +84,7 @@ TAGS: +@@ -82,8 +82,8 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xengnttab.pc + rm -f $(DESTDIR)$(includedir)/xengnttab.h + rm -f $(DESTDIR)$(libdir)/libxengnttab.so +- rm -f $(DESTDIR)$(libdir)/libxengnttab.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxengnttab.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxengnttab.so-$(PACKAGE_VERSION).$(MAJOR) ++ rm -f $(DESTDIR)$(libdir)/libxengnttab.so-$(PACKAGE_VERSION).$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxengnttab.a + + .PHONY: TAGS +@@ -93,7 +93,7 @@ TAGS: .PHONY: clean clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) + rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(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 ---- a/tools/libs/toollog/Makefile -+++ b/tools/libs/toollog/Makefile -@@ -50,22 +50,22 @@ headers.chk: $(wildcard include/*.h) - libxentoollog.a: $(LIB_OBJS) - $(AR) rc $@ $^ - --libxentoollog.so: libxentoollog.so.$(MAJOR) -+libxentoollog.so: libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) - $(SYMLINK_SHLIB) $< $@ --libxentoollog.so.$(MAJOR): libxentoollog.so.$(MAJOR).$(MINOR) -+libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR): libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) - $(SYMLINK_SHLIB) $< $@ - --libxentoollog.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map -- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) -+libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map -+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) - - .PHONY: install - install: build - $(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_DIR) $(DESTDIR)$(includedir) -- $(INSTALL_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) -+ $(INSTALL_SHLIB) libxentoollog-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - $(INSTALL_DATA) libxentoollog.a $(DESTDIR)$(libdir) -- $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) -- $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so -+ $(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) - -@@ -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) +@@ -58,22 +58,22 @@ headers.chk: $(wildcard include/*.h) libxendevicemodel.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -224,7 +268,7 @@ Subject: ubuntu-tools-libs-abiname $(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) +- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxendevicemodel.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxencall) $(LDLIBS_libxentoolcore) $(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) @@ -242,10 +286,21 @@ Subject: ubuntu-tools-libs-abiname $(INSTALL_DATA) include/xendevicemodel.h $(DESTDIR)$(includedir) $(INSTALL_DATA) xendevicemodel.pc $(DESTDIR)$(PKG_INSTALLDIR) -@@ -83,7 +83,7 @@ TAGS: +@@ -82,8 +82,8 @@ uninstall: + rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xendevicemodel.pc + rm -f $(DESTDIR)$(includedir)/xendevicemodel.h + rm -f $(DESTDIR)$(libdir)/libxendevicemodel.so +- rm -f $(DESTDIR)$(libdir)/libxendevicemodel.so.$(MAJOR) +- rm -f $(DESTDIR)$(libdir)/libxendevicemodel.so.$(MAJOR).$(MINOR) ++ rm -f $(DESTDIR)$(libdir)/libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR) ++ rm -f $(DESTDIR)$(libdir)/libxendevicemodel-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) + rm -f $(DESTDIR)$(libdir)/libxendevicemodel.a + + .PHONY: TAGS +@@ -93,7 +93,7 @@ TAGS: .PHONY: clean clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) + rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(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 diff --git a/debian/patches/version.diff b/debian/patches/version.diff index 4cc5bf61a1..a6735a34be 100644 --- a/debian/patches/version.diff +++ b/debian/patches/version.diff @@ -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 -@@ -270,8 +270,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL +@@ -330,8 +330,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 -@@ -776,14 +776,11 @@ void __init console_init_preirq(void) +@@ -783,14 +783,11 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); /* HELLO WORLD --- start-of-day banner text. */