pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils Update xen 3.0 packages to 3.0.4.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb43cdea5ec0
branches:  trunk
changeset: 528303:eb43cdea5ec0
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Sat Apr 28 17:14:49 2007 +0000

description:
Update xen 3.0 packages to 3.0.4.
pksgrc changes: install man pages for xm, xend-config.sxp and xmdomain.cfg.
Should fix pkg/36190.

Main changes:
This is largely an opportunistic stabilising release for HVM guests, due to
the large amount of work in that area of the code since 3.0.3. These
enhancements have in particular improved support for SMP and ACPI Linux and
Windows operating systems.

diffstat:

 sysutils/xenkernel30/Makefile            |    8 +-
 sysutils/xenkernel30/distinfo            |    8 +-
 sysutils/xentools30-hvm/Makefile         |   15 +-
 sysutils/xentools30-hvm/distinfo         |   19 +-
 sysutils/xentools30-hvm/files/NetBSD.mk  |    2 +
 sysutils/xentools30-hvm/patches/patch-aa |   15 +-
 sysutils/xentools30-hvm/patches/patch-an |   20 +-
 sysutils/xentools30-hvm/patches/patch-ay |   51 ++++----
 sysutils/xentools30-hvm/patches/patch-bb |   14 +-
 sysutils/xentools30-hvm/patches/patch-bv |   27 +----
 sysutils/xentools30-hvm/patches/patch-ci |   16 ++
 sysutils/xentools30/Makefile             |   43 +++---
 sysutils/xentools30/PLIST                |   31 +++++-
 sysutils/xentools30/distinfo             |   39 +++---
 sysutils/xentools30/files/NetBSD.mk      |    2 +
 sysutils/xentools30/patches/patch-aa     |   15 +-
 sysutils/xentools30/patches/patch-ac     |   10 +-
 sysutils/xentools30/patches/patch-ad     |  175 +++++++++++++++++++++++++++---
 sysutils/xentools30/patches/patch-al     |   13 +-
 sysutils/xentools30/patches/patch-am     |   43 -------
 sysutils/xentools30/patches/patch-as     |   17 +-
 sysutils/xentools30/patches/patch-aw     |   21 +--
 sysutils/xentools30/patches/patch-ba     |   10 +-
 sysutils/xentools30/patches/patch-bb     |   19 +--
 sysutils/xentools30/patches/patch-bc     |   14 +-
 sysutils/xentools30/patches/patch-bd     |   13 --
 sysutils/xentools30/patches/patch-br     |    9 +-
 sysutils/xentools30/patches/patch-bs     |   60 ++--------
 sysutils/xentools30/patches/patch-bt     |   12 +-
 sysutils/xentools30/patches/patch-bv     |   33 -----
 sysutils/xentools30/patches/patch-ci     |   16 ++
 sysutils/xentools30/patches/patch-cj     |   23 ++++
 sysutils/xentools30/patches/patch-ck     |   16 ++
 sysutils/xentools30/patches/patch-cl     |   12 ++
 34 files changed, 468 insertions(+), 373 deletions(-)

diffs (truncated from 1375 to 300 lines):

diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xenkernel30/Makefile
--- a/sysutils/xenkernel30/Makefile     Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xenkernel30/Makefile     Sat Apr 28 17:14:49 2007 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2006/10/19 22:50:25 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/28 17:14:49 bouyer Exp $
 #
 
-DISTNAME=      xen-3.0.3_0-install-x86_32
-PKGNAME=       xenkernel30-3.0.3
+DISTNAME=      xen-3.0.4_1-install-x86_32
+PKGNAME=       xenkernel30-3.0.4
 CATEGORIES=    sysutils
 MASTER_SITES=  http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/ \
-               http://bits.xensource.com/oss-xen/release/3.0.3-0/bin.tgz/
+               http://bits.xensource.com/oss-xen/release/3.0.4-1/bin.tgz/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xenkernel30/distinfo
--- a/sysutils/xenkernel30/distinfo     Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xenkernel30/distinfo     Sat Apr 28 17:14:49 2007 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/10/19 22:50:25 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2007/04/28 17:14:50 bouyer Exp $
 
-SHA1 (xen-3.0.3_0-install-x86_32.tgz) = b9adf58a42289032a19b83d92c66616bdef4ab12
-RMD160 (xen-3.0.3_0-install-x86_32.tgz) = 4458bc9d7c43425e3c42712f49102d126e4cdb41
-Size (xen-3.0.3_0-install-x86_32.tgz) = 21401945 bytes
+SHA1 (xen-3.0.4_1-install-x86_32.tgz) = bf8eb7c0a4c510b4010505ea6f849893896fc556
+RMD160 (xen-3.0.4_1-install-x86_32.tgz) = c3c37d673d8a14e719a35ed1b8c84492614fe9d0
+Size (xen-3.0.4_1-install-x86_32.tgz) = 21490373 bytes
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/Makefile
--- a/sysutils/xentools30-hvm/Makefile  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/Makefile  Sat Apr 28 17:14:49 2007 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/28 17:14:53 bouyer Exp $
 #
 
-DISTNAME=              xen-3.0.3_0-src
-PKGNAME=               xentools30-hvm-3.0.3
+DISTNAME=              xen-3.0.4_1-src
+PKGNAME=               xentools30-hvm-3.0.4
 PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
-                       http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/
+                       http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            bouyer%NetBSD.org@localhost
@@ -22,7 +22,7 @@
 CONFLICTS+=            libxen-[0-9]*
 CONFLICTS+=            xentools20-[0-9]*
 
-WRKSRC=                        ${WRKDIR}/xen-3.0.3_0-src/tools
+WRKSRC=                        ${WRKDIR}/xen-3.0.4_1-src/tools
 CHECK_PORTABILITY_SKIP+=       examples/*
 
 EGDIR=                 ${PREFIX}/share/examples/xen
@@ -33,9 +33,7 @@
 MAKE_ENV+=             EGDIR=${EGDIR:Q}
 MAKE_ENV+=             MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
 MAKE_ENV+=             XEN_TARGET_ARCH="x86_32"
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-PY_PATCHPLIST=         yes
-PYTHON_PATCH_SCRIPTS=  ioemu/keymaps/convert-map
+PYTHON_VERSIONS_ACCEPTED= 24 23
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
@@ -67,6 +65,7 @@
        ${MKDIR} ${WRKSRC}/libxc/xen/NetBSD
        ${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio.h || ${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen/NetBSD
        ${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio3.h || ${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen/NetBSD
+       ${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/
 
 .if ${OPSYS} == "NetBSD"
 post-build:
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/distinfo
--- a/sysutils/xentools30-hvm/distinfo  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/distinfo  Sat Apr 28 17:14:49 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2006/10/21 12:43:06 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2007/04/28 17:14:53 bouyer Exp $
 
-SHA1 (xen-3.0.3_0-src.tgz) = 9505ae3a5a42bc969836de81f501341409291f78
-RMD160 (xen-3.0.3_0-src.tgz) = 528020035ee32144b52bcdfccc8c44708b0196ea
-Size (xen-3.0.3_0-src.tgz) = 5465968 bytes
-SHA1 (patch-aa) = 1da529f00c897ef39bad7d3816cd5df0a468c280
-SHA1 (patch-an) = eab8d3a62da0b13b89fa575d5c950b6d12a27758
+SHA1 (xen-3.0.4_1-src.tgz) = 7ca5af70996215229e143c7563e69b3719284a95
+RMD160 (xen-3.0.4_1-src.tgz) = f869eec35f6afe0bc9824ce2eb4a600f789d423b
+Size (xen-3.0.4_1-src.tgz) = 6473636 bytes
+SHA1 (patch-aa) = 6f953f5033860e4e14f73f72b28f59e0e29f3bb5
+SHA1 (patch-an) = ab9fa15be2a4caf84d78ca72463d02f1d2939a3f
 SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998
 SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
 SHA1 (patch-ar) = c45d8e7c34268f95f5dff0164adf093e52aa2950
@@ -14,7 +14,8 @@
 SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
 SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
 SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
-SHA1 (patch-ay) = 59d1f89972bfabeb27cb80b92710dafefe9e448e
+SHA1 (patch-ay) = cdfaa8d4a1720711261b476e5c046a778eaf27f2
 SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6
-SHA1 (patch-bb) = 4bfe5b1dad33244b3be3359d37ad1054cd876e7c
-SHA1 (patch-bv) = 4f3e34d75a073e55711ebbf6ddd805d5db097e42
+SHA1 (patch-bb) = 19e3d323efab335a50f0410d1197ecbee5b7798b
+SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a
+SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/files/NetBSD.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools30-hvm/files/NetBSD.mk   Sat Apr 28 17:14:49 2007 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: NetBSD.mk,v 1.1 2007/04/28 17:14:54 bouyer Exp $
+include $(XEN_ROOT)/config/StdGNU.mk
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/patches/patch-aa
--- a/sysutils/xentools30-hvm/patches/patch-aa  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/patches/patch-aa  Sat Apr 28 17:14:49 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- Makefile.orig      2006-10-04 04:27:58.000000000 +0200
-+++ Makefile   2006-10-18 17:33:39.000000000 +0200
-@@ -2,31 +2,11 @@
+--- Makefile.orig      2007-01-08 16:00:46.000000000 +0100
++++ Makefile   2007-04-26 21:56:16.000000000 +0200
+@@ -2,34 +2,11 @@
  include $(XEN_ROOT)/tools/Rules.mk
  
  SUBDIRS-y :=
@@ -22,6 +22,9 @@
 -SUBDIRS-y += xenstat
 -SUBDIRS-y += libaio
 -SUBDIRS-y += blktap
+-SUBDIRS-y += libfsimage
+-SUBDIRS-$(XENFB_TOOLS) += xenfb
+-SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 -
 -# These don't cross-compile
 -ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
@@ -36,7 +39,7 @@
        @set -e; for subdir in $(SUBDIRS-y); do \
                $(MAKE) -C $$subdir $@; \
        done
-@@ -53,18 +33,16 @@
+@@ -56,18 +33,16 @@
  
  .PHONY: check
  check:
@@ -47,7 +50,7 @@
 -      $(MAKE) -C check clean
  
  .PHONY: ioemu ioemuinstall ioemuclean
- ifdef CONFIG_IOEMU
+ ifeq ($(CONFIG_IOEMU),y)
  export IOEMU_DIR ?= ioemu
  ioemu ioemuinstall:
        [ -f $(IOEMU_DIR)/config-host.mak ] || \
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/patches/patch-an
--- a/sysutils/xentools30-hvm/patches/patch-an  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/patches/patch-an  Sat Apr 28 17:14:49 2007 +0000
@@ -1,24 +1,24 @@
-$NetBSD: patch-an,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-an,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- firmware/Makefile.orig     2006-10-04 04:28:02.000000000 +0200
-+++ firmware/Makefile  2006-10-18 17:34:43.000000000 +0200
+--- firmware/Makefile.orig     2007-01-08 16:00:48.000000000 +0100
++++ firmware/Makefile  2007-04-26 21:34:58.000000000 +0200
 @@ -4,7 +4,7 @@
  # hvmloader is a 32-bit protected mode binary.
  # It belongs in /usr/lib, not /usr/lib64.
  TARGET      := hvmloader/hvmloader
--INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot
-+INSTALL_DIR := $(PREFIX)/lib/xen/boot
+-INST_DIR := $(DESTDIR)/usr/lib/xen/boot
++INST_DIR := $(PREFIX)/lib/xen/boot
  
  SUBDIRS :=
  SUBDIRS += rombios
-@@ -29,8 +29,8 @@
+@@ -28,8 +28,8 @@
  
  .PHONY: install
  install: all
--      [ -d $(INSTALL_DIR) ] || install -d -m0755 $(INSTALL_DIR)
--      [ ! -e $(TARGET) ] || install -m0644 $(TARGET) $(INSTALL_DIR)
-+      $(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)
-+      $(BSD_INSTALL_DATA) $(TARGET) $(INSTALL_DIR)
+-      [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
+-      [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
++      $(BSD_INSTALL_DATA_DIR) $(INST_DIR)
++      $(BSD_INSTALL_DATA) $(TARGET) $(INST_DIR)
  
  .PHONY: clean
  clean: 
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/patches/patch-ay
--- a/sysutils/xentools30-hvm/patches/patch-ay  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/patches/patch-ay  Sat Apr 28 17:14:49 2007 +0000
@@ -1,28 +1,25 @@
-$NetBSD: patch-ay,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-ay,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- ioemu/patches/xen-build.orig       2006-10-04 04:28:11.000000000 +0200
-+++ ioemu/patches/xen-build    2006-10-18 17:57:53.000000000 +0200
-@@ -139,7 +139,7 @@
-  ifeq ($(ARCH),alpha)
-  # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
-  # the address space (31 bit so sign extending doesn't matter)
--@@ -528,10 +541,16 @@
-+@@ -528,10 +541,14 @@
-  clean:
-       rm -f *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o slirp/*.o fpu/*.o
-  
-@@ -147,12 +147,10 @@
- +     rm -rf config.mak config.h
- +
-  install: all 
--+     mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"
-++     $(BSD_INSTALL_PROGRAM_DIR) $(INSTALL_DIR)
-  ifneq ($(PROGS),)
--      $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
-+      $(BSD_INSTALL_PROGRAM) $(PROGS) $(INSTALL_DIR)
-  endif
--+     install -m 755 $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
--+     install -m 755 $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
-  
-  ifneq ($(wildcard .depend),)
-  include .depend
+--- ioemu/Makefile.orig        2007-04-26 21:45:35.000000000 +0200
++++ ioemu/Makefile     2007-04-26 21:49:09.000000000 +0200
+@@ -72,7 +72,7 @@
+ endif
+ 
+ install: all $(if $(BUILD_DOCS),install-doc)
+-      mkdir -p "$(DESTDIR)$(bindir)"
++      $(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
+ #     $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+ #     mkdir -p "$(DESTDIR)$(datadir)"
+ #     for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+@@ -80,9 +80,9 @@
+ #             $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+ #     done
+ ifndef CONFIG_WIN32
+-      mkdir -p "$(DESTDIR)$(datadir)/keymaps"
++      $(BSD_INSTALL_DATA_DIR) "$(datadir)/keymaps"
+       for x in $(KEYMAPS); do \
+-              $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
++              $(BSD_INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(datadir)/keymaps"; \
+       done
+ endif
+       for d in $(TARGET_DIRS); do \
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/patches/patch-bb
--- a/sysutils/xentools30-hvm/patches/patch-bb  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/patches/patch-bb  Sat Apr 28 17:14:49 2007 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-bb,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-bb,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- ioemu/Makefile.target.orig 2006-10-18 18:30:56.000000000 +0200
-+++ ioemu/Makefile.target      2006-10-18 18:32:08.000000000 +0200
-@@ -553,12 +553,8 @@
+--- ioemu/Makefile.target.orig 2007-01-08 16:00:48.000000000 +0100
++++ ioemu/Makefile.target      2007-04-26 21:38:21.000000000 +0200
+@@ -567,12 +567,8 @@
        rm -rf config.mak config.h
  
  install: all 
 -      mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"
 -ifneq ($(PROGS),)
--      $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+-      $(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"
 -endif
--      install -m 755 $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
--      install -m 755 $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
+-      $(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
+-      $(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
 +      $(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
 +      $(BSD_INSTALL_PROGRAM) $(PROGS) "$(DESTDIR)$(bindir)"
  
diff -r e63e110f1812 -r eb43cdea5ec0 sysutils/xentools30-hvm/patches/patch-bv
--- a/sysutils/xentools30-hvm/patches/patch-bv  Sat Apr 28 15:24:27 2007 +0000
+++ b/sysutils/xentools30-hvm/patches/patch-bv  Sat Apr 28 17:14:49 2007 +0000
@@ -1,33 +1,14 @@
-$NetBSD: patch-bv,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-bv,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- libxc/xenctrl.h.orig       2006-10-04 04:28:16.000000000 +0200
-+++ libxc/xenctrl.h    2006-10-16 23:54:46.000000000 +0200
-@@ -16,7 +16,12 @@
+--- libxc/xenctrl.h.orig       2007-01-08 16:00:49.000000000 +0100
++++ libxc/xenctrl.h    2007-04-26 21:40:23.000000000 +0200
+@@ -16,6 +16,9 @@
  
  #include <stddef.h>
  #include <stdint.h>



Home | Main Index | Thread Index | Old Index