[Xen-changelog] [xen-unstable] Revert 16560:822d4ec5cfb1.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1197135121 0
# Node ID 47efaa78e3aca8c7f82f20d39cd04c99dcb3a46b
# Parent  5db00aad6b40782d411d3c32165dff31e9aaec27
Revert 16560:822d4ec5cfb1.

Preference seems to be to update library versions only when the ABI
changes. Only libxenctrl/libxenguest have their version number changed
to 3.2.0, as a reminder that they change on pretty much every major
release.

libfsimage/libxenstore/libblktap have not changed substantially
recently, hence the ABI has not changed, and version number stays the
same as in Xen 3.1 (and before).

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 Config.mk                        |    3 ---
 tools/blktap/lib/Makefile        |    4 ++--
 tools/libfsimage/common/Makefile |    4 ++--
 tools/libxc/Makefile             |    4 ++--
 tools/xenstore/Makefile          |    4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff -r 5db00aad6b40 -r 47efaa78e3ac Config.mk
--- a/Config.mk Sat Dec 08 17:27:10 2007 +0000
+++ b/Config.mk Sat Dec 08 17:32:01 2007 +0000
@@ -12,9 +12,6 @@ ifeq ($(XEN_TARGET_ARCH),x86_32)
 ifeq ($(XEN_TARGET_ARCH),x86_32)
 XEN_TARGET_X86_PAE  ?= y
 endif
-
-LIBRARIES_VERSION_MAJOR = 3.2
-LIBRARIES_VERSION_MINOR = 0
 
 CONFIG_$(XEN_OS) := y
 
diff -r 5db00aad6b40 -r 47efaa78e3ac tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Sat Dec 08 17:27:10 2007 +0000
+++ b/tools/blktap/lib/Makefile Sat Dec 08 17:32:01 2007 +0000
@@ -1,8 +1,8 @@ XEN_ROOT = ../../..
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR    = 3.0
+MINOR    = 0
 SONAME   = libblktap.so.$(MAJOR)
 
 BLKTAP_INSTALL_DIR = /usr/sbin
diff -r 5db00aad6b40 -r 47efaa78e3ac tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile  Sat Dec 08 17:27:10 2007 +0000
+++ b/tools/libfsimage/common/Makefile  Sat Dec 08 17:32:01 2007 +0000
@@ -1,8 +1,8 @@ XEN_ROOT = ../../..
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 1.0
+MINOR = 0
 
 CFLAGS += -Werror -Wp,-MD,.$(@F).d
 DEPS = .*.d
diff -r 5db00aad6b40 -r 47efaa78e3ac tools/libxc/Makefile
--- a/tools/libxc/Makefile      Sat Dec 08 17:27:10 2007 +0000
+++ b/tools/libxc/Makefile      Sat Dec 08 17:32:01 2007 +0000
@@ -1,8 +1,8 @@ XEN_ROOT = ../..
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR    = 3.2
+MINOR    = 0
 
 CTRL_SRCS-y       :=
 CTRL_SRCS-y       += xc_core.c
diff -r 5db00aad6b40 -r 47efaa78e3ac tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Sat Dec 08 17:27:10 2007 +0000
+++ b/tools/xenstore/Makefile   Sat Dec 08 17:32:01 2007 +0000
@@ -2,8 +2,8 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
-MAJOR = $(LIBRARIES_VERSION_MAJOR)
-MINOR = $(LIBRARIES_VERSION_MINOR)
+MAJOR = 3.0
+MINOR = 0
 
 PROFILE=#-pg
 BASECFLAGS=-Werror

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog