Bastian Blank
2012-Aug-13 20:01 UTC
[Pkg-xen-changes] r1090 - in trunk/xen/debian: . patches
Author: waldi
Date: Mon Aug 13 20:01:17 2012
New Revision: 1090
Log:
* debian/changelog: Update version to 4.2.0~rc2-1.
* debian/patches: Update.
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/patches/config-prefix.diff
trunk/xen/debian/patches/tools-blktap2-prefix.diff
trunk/xen/debian/patches/tools-hotplug-udevrules.diff
trunk/xen/debian/patches/tools-libfsimage-abiname.diff
trunk/xen/debian/patches/tools-libfsimage-prefix.diff
trunk/xen/debian/patches/tools-libfsimage-rpath.diff
trunk/xen/debian/patches/tools-libxl-abiname.diff
trunk/xen/debian/patches/tools-libxl-nopidfile.diff
trunk/xen/debian/patches/tools-libxl-prefix.diff
trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
trunk/xen/debian/patches/version.patch
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Thu Aug 9 20:26:55 2012 (r1089)
+++ trunk/xen/debian/changelog Mon Aug 13 20:01:17 2012 (r1090)
@@ -1,4 +1,4 @@
-xen (4.2~hg-20120617.32034d1914a6-1) UNRELEASED; urgency=low
+xen (4.2.0~rc2-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Build-depend against libglib2.0-dev and libyajl-dev.
Modified: trunk/xen/debian/patches/config-prefix.diff
=============================================================================---
trunk/xen/debian/patches/config-prefix.diff Thu Aug 9 20:26:55 2012 (r1089)
+++ trunk/xen/debian/patches/config-prefix.diff Mon Aug 13 20:01:17 2012 (r1090)
@@ -1,23 +1,17 @@
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
-@@ -32,22 +32,19 @@
+@@ -32,16 +32,19 @@
PREFIX ?= /usr
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
--LIBLEAFDIR = lib
--LIBLEAFDIR_x86_32 = lib
--LIBLEAFDIR_x86_64 ?= lib64
--LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
--LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32)
--LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)
--LIBEXEC = $(LIBDIR_x86_32)/xen/bin
+-LIBEXEC = $(PREFIX)/lib/xen/bin
+LIBDIR = $(PREFIX)/lib
SHAREDIR = $(PREFIX)/share
MANDIR = $(SHAREDIR)/man
MAN1DIR = $(MANDIR)/man1
MAN8DIR = $(MANDIR)/man8
SBINDIR = $(PREFIX)/sbin
--XENFIRMWAREDIR = $(LIBDIR_x86_32)/xen/boot
+-XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
-PRIVATE_PREFIX = $(LIBDIR)/xen
+PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
@@ -29,28 +23,9 @@
ifeq ($(PREFIX),/usr)
CONFIG_DIR = /etc
---- a/config/x86_64.mk
-+++ b/config/x86_64.mk
-@@ -10,11 +10,6 @@
-
- CFLAGS += -m64
-
--LIBLEAFDIR = $(LIBLEAFDIR_x86_64)
--LIBDIR = $(LIBDIR_x86_64)
--
--SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
--
- # Use only if calling $(LD) directly.
- ifeq ($(XEN_OS),OpenBSD)
- LDFLAGS_DIRECT += -melf_x86_64_obsd
--- a/Config.mk
+++ b/Config.mk
-@@ -67,11 +67,11 @@
-
- ifneq ($(EXTRA_PREFIX),)
- EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
--EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR)
-+EXTRA_LIB += $(EXTRA_LIBDIR)
+@@ -71,7 +71,7 @@
endif
PYTHON ?= python
Modified: trunk/xen/debian/patches/tools-blktap2-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-blktap2-prefix.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-blktap2-prefix.diff Mon Aug 13 20:01:17 2012
(r1090)
@@ -39,7 +39,7 @@
ifeq ($(CONFIG_LIBICONV),y)
LIBS += -liconv
-@@ -51,27 +45,23 @@
+@@ -51,27 +45,24 @@
LIB-PICOBJS = $(patsubst %.o,%.opic,$(LIB-OBJS))
@@ -64,12 +64,15 @@
+ $(LDFLAGS) -o $@ $^ $(LIBS)
install: all
- $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
- $(INSTALL_PROG) libvhd.a $(DESTDIR)$(INST-DIR)
+- $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
+- $(INSTALL_PROG) libvhd.a $(DESTDIR)$(INST-DIR)
- $(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
$(DESTDIR)$(INST-DIR)
- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
$(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
- ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
-+ $(INSTALL_PROG) libvhd.so $(DESTDIR)$(INST-DIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR)
++ $(INSTALL_PROG) libvhd.a $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libvhd.so $(DESTDIR)$(PRIVATE_LIBDIR)
clean:
rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
Modified: trunk/xen/debian/patches/tools-hotplug-udevrules.diff
=============================================================================---
trunk/xen/debian/patches/tools-hotplug-udevrules.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-hotplug-udevrules.diff Mon Aug 13 20:01:17
2012 (r1090)
@@ -1,9 +1,9 @@
--- a/tools/hotplug/Linux/xen-backend.rules
+++ b/tools/hotplug/Linux/xen-backend.rules
@@ -6,11 +6,4 @@
- SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline
type_if=vif"
+ SUBSYSTEM=="xen-backend", KERNEL=="vif-*",
ENV{UDEV_CALL}="1", ACTION=="offline",
RUN+="/etc/xen/scripts/vif-setup offline type_if=vif"
SUBSYSTEM=="xen-backend", KERNEL=="vscsi*",
RUN+="/etc/xen/scripts/vscsi $env{ACTION}"
- SUBSYSTEM=="xen-backend", ACTION=="remove",
RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
+ SUBSYSTEM=="xen-backend", ACTION=="remove",
ENV{UDEV_CALL}="1",
RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
-KERNEL=="evtchn", NAME="xen/%k"
-SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*",
NAME="xen/%k", MODE="0600"
-SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*",
NAME="xen/blktap-2/%k", MODE="0600"
@@ -11,4 +11,4 @@
-KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
-KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
-KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m",
MODE="0600"
- SUBSYSTEM=="net", KERNEL=="vif*-emu",
ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION}
type_if=tap"
+ SUBSYSTEM=="net", KERNEL=="vif*-emu",
ACTION=="add", ENV{UDEV_CALL}="1",
RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
Modified: trunk/xen/debian/patches/tools-libfsimage-abiname.diff
=============================================================================---
trunk/xen/debian/patches/tools-libfsimage-abiname.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-libfsimage-abiname.diff Mon Aug 13 20:01:17
2012 (r1090)
@@ -2,7 +2,7 @@
+++ b/tools/libfsimage/common/Makefile
@@ -1,9 +1,6 @@
XEN_ROOT = $(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
+ include $(XEN_ROOT)/tools/libfsimage/Rules.mk
-MAJOR = 1.0
-MINOR = 0
Modified: trunk/xen/debian/patches/tools-libfsimage-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-libfsimage-prefix.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-libfsimage-prefix.diff Mon Aug 13 20:01:17
2012 (r1090)
@@ -1,16 +1,11 @@
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
-@@ -6,12 +6,7 @@
+@@ -6,7 +6,7 @@
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
--FSDIR-$(CONFIG_Linux) = $(LIBDIR)/fs/$(FS)
--FSDIR-$(CONFIG_SunOS)-x86_64 = $(PREFIX)/lib/fs/$(FS)/64
--FSDIR-$(CONFIG_SunOS)-x86_32 = $(PREFIX)/lib/fs/$(FS)/
--FSDIR-$(CONFIG_SunOS) = $(FSDIR-$(CONFIG_SunOS)-$(XEN_TARGET_ARCH))
--FSDIR-$(CONFIG_NetBSD) = $(LIBDIR)/fs/$(FS)
--FSDIR = $(FSDIR-y)
-+FSDIR = $(PRIVATE_LIBDIR)/fs/$(FS)
+-FSDIR = $(LIBDIR)/fs
++FSDIR = $(PRIVATE_LIBDIR)/fs
FSLIB = fsimage.so
@@ -18,14 +13,14 @@
+++ b/tools/libfsimage/common/Makefile
@@ -1,6 +1,8 @@
XEN_ROOT = $(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
+ include $(XEN_ROOT)/tools/libfsimage/Rules.mk
+CFLAGS += -DFSDIR="\"$(PRIVATE_LIBDIR)/fs\""
+
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
LDFLAGS = $(LDFLAGS-y)
-@@ -16,9 +18,9 @@
+@@ -19,9 +21,9 @@
.PHONY: install
install: all
@@ -37,33 +32,3 @@
$(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
---- a/tools/libfsimage/common/fsimage_plugin.c
-+++ b/tools/libfsimage/common/fsimage_plugin.c
-@@ -131,26 +131,8 @@
- int err;
- int ret = -1;
-
--#if defined(FSIMAGE_FSDIR)
- if (fsdir == NULL)
-- fsdir = FSIMAGE_FSDIR;
--#elif defined(__sun__)
-- if (fsdir == NULL)
-- fsdir = "/usr/lib/fs";
--
-- if (sizeof(void *) == 8)
-- isadir = "64/";
--#elif defined(__ia64__)
-- if (fsdir == NULL)
-- fsdir = "/usr/lib/fs";
--#else
-- if (fsdir == NULL) {
-- if (sizeof(void *) == 8)
-- fsdir = "/usr/lib64/fs";
-- else
-- fsdir = "/usr/lib/fs";
-- }
--#endif
-+ fsdir = FSDIR;
-
- if ((name_max = pathconf(fsdir, _PC_NAME_MAX)) == -1)
- goto fail;
Modified: trunk/xen/debian/patches/tools-libfsimage-rpath.diff
=============================================================================---
trunk/xen/debian/patches/tools-libfsimage-rpath.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-libfsimage-rpath.diff Mon Aug 13 20:01:17
2012 (r1090)
@@ -1,7 +1,7 @@
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -3,6 +3,7 @@
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/
+ CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/
-DFSIMAGE_FSDIR=\"$(FSDIR)\"
CFLAGS += -Werror -D_GNU_SOURCE
LDFLAGS += -L../common/
+LDFLAGS += $(call LDFLAGS_RPATH,../..)
Modified: trunk/xen/debian/patches/tools-libxl-abiname.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxl-abiname.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-libxl-abiname.diff Mon Aug 13 20:01:17 2012
(r1090)
@@ -13,7 +13,7 @@
CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
-Wno-declaration-after-statement -Wformat-nonliteral
CFLAGS += -I. -fPIC
-@@ -131,26 +125,14 @@
+@@ -153,26 +147,14 @@
$(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h)
$(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c)
@@ -44,10 +44,10 @@
libxlutil.a: $(LIBXLU_OBJS)
$(AR) rcs libxlutil.a $^
-@@ -169,13 +151,9 @@
- $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
- $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
+@@ -196,13 +178,9 @@
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
+ $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
- ln -sf libxenlight.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
- ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
Modified: trunk/xen/debian/patches/tools-libxl-nopidfile.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxl-nopidfile.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-libxl-nopidfile.diff Mon Aug 13 20:01:17 2012
(r1090)
@@ -8,7 +8,7 @@
int rc;
if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; }
-@@ -79,12 +78,6 @@
+@@ -82,12 +81,6 @@
rc = libxl__poller_init(ctx, &ctx->poller_app);
if (rc) goto out;
@@ -23,7 +23,7 @@
LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
-@@ -347,7 +347,6 @@
+@@ -373,7 +373,6 @@
#define AUTO_PHP_SLOT 0x100
#define SYSFS_PCI_DEV "/sys/bus/pci/devices"
#define SYSFS_PCIBACK_DRIVER "/sys/bus/pci/drivers/pciback"
Modified: trunk/xen/debian/patches/tools-libxl-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-libxl-prefix.diff Thu Aug 9 20:26:55 2012
(r1089)
+++ trunk/xen/debian/patches/tools-libxl-prefix.diff Mon Aug 13 20:01:17 2012
(r1090)
@@ -9,7 +9,7 @@
LIBXL_LIBS LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
$(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS)
-@@ -126,7 +128,7 @@
+@@ -148,7 +150,7 @@
$(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c)
libxenlight.so: $(LIBXL_OBJS)
@@ -18,15 +18,16 @@
libxenlight.a: $(LIBXL_OBJS)
$(AR) rcs libxenlight.a $^
-@@ -138,22 +140,23 @@
+@@ -160,7 +162,7 @@
$(AR) rcs libxlutil.a $^
xl: $(XL_OBJS) libxlutil.so libxenlight.so
- $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight)
$(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $(XL_OBJS) libxlutil.so
$(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
- testidl: testidl.o libxlutil.so libxenlight.so
- $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight)
$(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
+ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so
+ $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl)
$(LDLIBS_libxenguest) $(APPEND_LDFLAGS)
+@@ -170,17 +172,18 @@
.PHONY: install
install: all
@@ -37,9 +38,11 @@
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
-- $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
+- $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_PROG) libxenlight.so $(DESTDIR)$(PRIVATE_LIBDIR)
$(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_PROG) libxlutil.so $(DESTDIR)$(LIBDIR)
Modified:
trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
=============================================================================---
trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch Thu
Aug 9 20:26:55 2012 (r1089)
+++ trunk/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
Mon Aug 13 20:01:17 2012 (r1090)
@@ -8,7 +8,7 @@
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
-@@ -622,51 +621,6 @@
+@@ -627,51 +626,6 @@
return grubcfg
@@ -60,7 +60,7 @@
def sniff_netware(fs, cfg):
if not fs.file_exists("/nwserver/xnloader.sys"):
return cfg
-@@ -797,10 +751,7 @@
+@@ -833,10 +787,7 @@
try:
fs = fsimage.open(file, offset, bootfsoptions)
Modified: trunk/xen/debian/patches/version.patch
=============================================================================---
trunk/xen/debian/patches/version.patch Thu Aug 9 20:26:55 2012 (r1089)
+++ trunk/xen/debian/patches/version.patch Mon Aug 13 20:01:17 2012 (r1090)
@@ -18,7 +18,7 @@
- -e ''s/@@whoami@@/$(XEN_WHOAMI)/g'' \
- -e ''s/@@domain@@/$(XEN_DOMAIN)/g'' \
- -e ''s/@@hostname@@/$(shell hostname)/g'' \
- -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep
version | tail -1)!g'' \
+ -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1
| head -1)!g'' \
-e ''s/@@version@@/$(XEN_VERSION)/g'' \
-e ''s/@@subversion@@/$(XEN_SUBVERSION)/g'' \
-e ''s/@@extraversion@@/$(XEN_EXTRAVERSION)/g'' \