[Pkg-xen-changes] r920 - in trunk/xen/debian: . patches templates

Bastian Blank waldi at alioth.debian.org
Wed Oct 26 19:35:19 UTC 2011 

Author: waldi
Date: Wed Oct 26 19:35:18 2011
New Revision: 920

Log:
* debian/changelog: Update.
* debian/patches/series, debian/patches/tools-libxc-prefix.diff: Remove patch.
* debian/patches/tools-libxc-abiname.diff: Rename libs.
* debian/templates/control.main.in: Add libxen-$version package.
* debian/rules.real: Install libxen-$version package.

Deleted:
   trunk/xen/debian/patches/tools-libxc-prefix.diff
Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/patches/series
   trunk/xen/debian/patches/tools-libxc-abiname.diff
   trunk/xen/debian/rules.real
   trunk/xen/debian/templates/control.main.in

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Wed Oct 26 18:42:07 2011	(r919)
+++ trunk/xen/debian/changelog	Wed Oct 26 19:35:18 2011	(r920)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Build-depend on pkg-config.
+  * Add package libxen-4.1. Includes some shared libs.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 26 Oct 2011 15:01:06 +0200
 

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Wed Oct 26 18:42:07 2011	(r919)
+++ trunk/xen/debian/patches/series	Wed Oct 26 19:35:18 2011	(r920)
@@ -17,7 +17,6 @@
 tools-flask-prefix.diff
 tools-libfsimage-prefix.diff
 tools-libfsimage-rpath.diff
-tools-libxc-prefix.diff
 tools-libxl-prefix.diff
 tools-misc-prefix.diff
 tools-misc-rpath.diff

Modified: trunk/xen/debian/patches/tools-libxc-abiname.diff
==============================================================================
--- trunk/xen/debian/patches/tools-libxc-abiname.diff	Wed Oct 26 18:42:07 2011	(r919)
+++ trunk/xen/debian/patches/tools-libxc-abiname.diff	Wed Oct 26 19:35:18 2011	(r920)
@@ -10,52 +10,64 @@
  CTRL_SRCS-y       :=
  CTRL_SRCS-y       += xc_core.c
  CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -90,12 +87,12 @@
+@@ -77,8 +74,6 @@
+ # libraries.
+ #CFLAGS   += -DVALGRIND -O0 -ggdb3
+ 
+-LDFLAGS  += -L.
+-
+ CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y))
+ CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y))
+ 
+@@ -90,12 +85,12 @@
  
  LIB := libxenctrl.a
  ifneq ($(stubdom),y)
 -LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
-+LIB += libxenctrl.so
++LIB += libxenctrl.so libxenctrl-$(XEN_VERSION).so
  endif
  
  LIB += libxenguest.a
  ifneq ($(stubdom),y)
 -LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
-+LIB += libxenguest.so
++LIB += libxenguest.so libxenguest-$(XEN_VERSION).so
  endif
  
  ifneq ($(stubdom),y)
-@@ -116,15 +113,11 @@
+@@ -116,15 +111,13 @@
  install: build
  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
 -	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_PROG) libxenctrl.so $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) libxenctrl-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
 -	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
 -	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
++	ln -sf libxenctrl-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenctrl.so
  	$(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR)
 -	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_PROG) libxenguest.so $(DESTDIR)$(LIBDIR)
++	$(INSTALL_PROG) libxenguest-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
 -	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
 -	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
++	ln -sf libxenguest-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenguest.so
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
  
  .PHONY: TAGS
-@@ -153,24 +146,14 @@
+@@ -153,22 +146,18 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
 -libxenctrl.so: libxenctrl.so.$(MAJOR)
 -	ln -sf $< $@
 -libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
--	ln -sf $< $@
--
++libxenctrl.so: libxenctrl-$(XEN_VERSION).so
+ 	ln -sf $< $@
+ 
 -libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
 -	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
-+libxenctrl.so: $(CTRL_PIC_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
++libxenctrl-$(XEN_VERSION).so: $(CTRL_PIC_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname=$@ $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
  
  # libxenguest
  
@@ -65,21 +77,40 @@
 -libxenguest.so: libxenguest.so.$(MAJOR)
 -	ln -sf $< $@
 -libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
--	ln -sf $< $@
--
++libxenguest.so: libxenguest-$(XEN_VERSION).so
+ 	ln -sf $< $@
+ 
  ifeq ($(CONFIG_MiniOS),y)
- zlib-options =
- else
-@@ -193,9 +176,9 @@
+@@ -193,12 +182,12 @@
  xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
  xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
  
 -libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
 -libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
 -	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS)
-+libxenguest.so: COMPRESSION_LIBS = $(call zlib-options,l)
-+libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS)
++libxenguest-$(XEN_VERSION).so: COMPRESSION_LIBS = $(call zlib-options,l)
++libxenguest-$(XEN_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(XEN_VERSION).so
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname=$@ $(SHLIB_LDFLAGS) -o $@ $^ $(COMPRESSION_LIBS) -lz $(PTHREAD_LIBS)
+ 
+-xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
+-	$(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl
++xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl-$(XEN_VERSION).so
++	$(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^
+ 
+ -include $(DEPS)
+ 
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -18,10 +18,10 @@
+ CFLAGS_include = -I$(XEN_INCLUDE)
+ 
+ CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
+-LDLIBS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl $(DLOPEN_LIBS)
++LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl-$(XEN_VERSION).so $(DLOPEN_LIBS)
+ 
+ CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
+-LDLIBS_libxenguest = -L$(XEN_LIBXC) -lxenguest
++LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest-$(XEN_VERSION).so
  
- xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
- 	$(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl
+ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
+ LDLIBS_libxenstore = -L$(XEN_XENSTORE) -lxenstore

Modified: trunk/xen/debian/rules.real
==============================================================================
--- trunk/xen/debian/rules.real	Wed Oct 26 18:42:07 2011	(r919)
+++ trunk/xen/debian/rules.real	Wed Oct 26 19:35:18 2011	(r920)
@@ -13,7 +13,8 @@
 
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
-binary-arch-arch: install-lib-dev_$(ARCH)
+binary-arch-arch: install-libxen_$(ARCH)
+binary-arch-arch: install-libxen-dev_$(ARCH)
 binary-arch-arch: install-libxenstore_$(ARCH)
 binary-arch-arch: install-utils_$(ARCH)
 binary-arch-arch: install-xenstore-utils_$(ARCH)
@@ -119,10 +120,22 @@
 	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz
 	+$(MAKE_SELF) install-base
 
-install-lib-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
-install-lib-dev_$(ARCH): PACKAGE_NAME = libxen-dev
-install-lib-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-lib-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-libxen_$(ARCH): DH_OPTIONS = -plibxen-$(VERSION)
+install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_install --sourcedir=$(DIR) usr/lib/libxen*-$(VERSION).so
+	dh_strip
+	dh_makeshlibs -V
+	dh_shlibdeps
+	+$(MAKE_SELF) install-base
+
+install-libxen-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-libxen-dev_$(ARCH): PACKAGE_NAME = libxen-dev
+install-libxen-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-libxen-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
 	dh_testdir
 	dh_testroot
 	dh_prep

Modified: trunk/xen/debian/templates/control.main.in
==============================================================================
--- trunk/xen/debian/templates/control.main.in	Wed Oct 26 18:42:07 2011	(r919)
+++ trunk/xen/debian/templates/control.main.in	Wed Oct 26 19:35:18 2011	(r920)
@@ -7,6 +7,12 @@
  includes a description interface (both the API, and a nice explanation of
  how XEN works).
 
+Package: libxen- at version@
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Public libs for Xen
+ This package contains the shared libraries for Xen.
+
 Package: libxenstore3.0
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -15,7 +21,7 @@
 
 Package: libxen-dev
 Section: libdevel
-Depends: libxenstore3.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libxen- at version@ (= ${binary:Version}), libxenstore3.0 (= ${binary:Version}), ${misc:Depends}
 Description: Public headers and libs for Xen
  This package contains the public headers and static libraries for Xen.

More information about the Pkg-xen-changes mailing list