New library: xentoolcore

There's a new library in Xen 4.10. It's xentoolcore, which centralizes
handling of open file descriptors for qemu.

Also see upstream b08da5859b,
"xentoolcore, _restrict_all: Introduce new library and implementation"

So:
- just apply the same patch magic for it as seen in other Makefiles
- include relevant things in libxen-dev

Signed-off-by: Hans van Kranenburg <hans@knorrie.org>

diff --git a/debian/libxen-dev.install b/debian/libxen-dev.install
index dd7f6007cee9906eb3864f19d21e9eb35c6def8b..473a9157fafe6353a6ed67a3cad2e5abb21be596 100644 (file)
--- a/debian/libxen-dev.install
+++ b/debian/libxen-dev.install
@@ -20,12 +20,15 @@ usr/lib/*/libxentoollog.a
 usr/lib/*/libxentoollog.so
 usr/lib/*/libxendevicemodel.a
 usr/lib/*/libxendevicemodel.so
+usr/lib/*/libxentoolcore.a
+usr/lib/*/libxentoolcore.so
 usr/include/_libxl*.h
 usr/include/libxl*.h
 usr/include/xenctrl.h
 usr/include/xenguest.h
 usr/include/xenstore*.h
 usr/include/xenstore-compat/xs* usr/include
+usr/include/xentoolcore.h
 usr/include/xentoollog.h
 usr/include/xendevicemodel.h
 usr/include/xen

diff --git a/debian/patches/series b/debian/patches/series
index 59862c9e16b9cee11cc3bec5244ee13bb39b9485..767a39c7197233dfcfdfdd8117fd7f8c0667828d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ tools-xenstore-compatibility.diff
 ubuntu-tools-libs-abiname.diff
 toolstestsx86_emulator-pass--no-pie--fno.patch
 tools-fake-xs-restrict.patch
+tools-xentoolcore-abiname.patch

diff --git a/debian/patches/tools-xentoolcore-abiname.patch b/debian/patches/tools-xentoolcore-abiname.patch
new file mode 100644 (file)
index 0000000..11a2653
--- /dev/null
+++ b/debian/patches/tools-xentoolcore-abiname.patch
@@ -0,0 +1,52 @@
+--- a/tools/libs/toolcore/Makefile
++++ b/tools/libs/toolcore/Makefile
+@@ -59,22 +59,22 @@ include/_xentoolcore_list.h: $(XEN_INCLU
+ libxentoolcore.a: $(LIB_OBJS)
+       $(AR) rc $@ $^
+ 
+-libxentoolcore.so: libxentoolcore.so.$(MAJOR)
++libxentoolcore.so: libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR)
+       $(SYMLINK_SHLIB) $< $@
+-libxentoolcore.so.$(MAJOR): libxentoolcore.so.$(MAJOR).$(MINOR)
++libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR): libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR)
+       $(SYMLINK_SHLIB) $< $@
+ 
+-libxentoolcore.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoolcore.map
+-      $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoolcore.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS)
++libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoolcore.map
++      $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoolcore-$(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) libxentoolcore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
++      $(INSTALL_SHLIB) libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       $(INSTALL_DATA) libxentoolcore.a $(DESTDIR)$(libdir)
+-      $(SYMLINK_SHLIB) libxentoolcore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoolcore.so.$(MAJOR)
+-      $(SYMLINK_SHLIB) libxentoolcore.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoolcore.so
++      $(SYMLINK_SHLIB) libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR)
++      $(SYMLINK_SHLIB) libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoolcore.so
+       $(INSTALL_DATA) include/xentoolcore.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) xentoolcore.pc $(DESTDIR)$(PKG_INSTALLDIR)
+ 
+@@ -83,8 +83,8 @@ uninstall:
+       rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xentoolcore.pc
+       rm -f $(DESTDIR)$(includedir)/xentoolcore.h
+       rm -f $(DESTDIR)$(libdir)/libxentoolcore.so
+-      rm -f $(DESTDIR)$(libdir)/libxentoolcore.so.$(MAJOR)
+-      rm -f $(DESTDIR)$(libdir)/libxentoolcore.so.$(MAJOR).$(MINOR)
++      rm -f $(DESTDIR)$(libdir)/libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR)
++      rm -f $(DESTDIR)$(libdir)/libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR)
+       rm -f $(DESTDIR)$(libdir)/libxentoolcore.a
+ 
+ .PHONY: TAGS
+@@ -94,7 +94,7 @@ TAGS:
+ .PHONY: clean
+ clean:
+       rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS)
+-      rm -f libxentoolcore.so.$(MAJOR).$(MINOR) libxentoolcore.so.$(MAJOR)
++      rm -f libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR).$(MINOR) libxentoolcore-$(PACKAGE_VERSION).so.$(MAJOR)
+       rm -f headers.chk
+       rm -f xentoolcore.pc
+