[pkgsrc/trunk]: pkgsrc/sysutils/xentools20 Fix the 16 vs 32 bit dev_t problem...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2741c45afc0a
branches:  trunk
changeset: 490452:2741c45afc0a
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Thu Mar 10 19:43:25 2005 +0000

description:
Fix the 16 vs 32 bit dev_t problem by moving blkif_pdev_t from u16 to
u32, and removing the padding bits in blkif_extent_t. This way the size
of the message doesn't change, and new tools are compatible with
older kernel (I will commit this change to kernel shortly too).
This has also been commited to xen-2.0-testing by Christian, and will be
in xen-2.0.5.
While here, remove the PKG_SYSCONFSUBDIR, as nothing looks for config files
here yet.
Bump PKGREVISION.

diffstat:

 sysutils/xentools20/Makefile         |   8 ++------
 sysutils/xentools20/distinfo         |   3 ++-
 sysutils/xentools20/patches/patch-ar |  20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r a304ac0b7916 -r 2741c45afc0a sysutils/xentools20/Makefile
--- a/sysutils/xentools20/Makefile      Thu Mar 10 19:22:22 2005 +0000
+++ b/sysutils/xentools20/Makefile      Thu Mar 10 19:43:25 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/03/07 17:27:25 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/10 19:43:25 bouyer Exp $
 #
 
 DISTNAME=              xen-2.0.3-src
 PKGNAME=               xentools20-2.0.3
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/
 EXTRACT_SUFX=          .tgz
@@ -19,12 +20,7 @@
 
 WRKSRC=                        ${WRKDIR}/xen-2.0/tools
 
-PKG_SYSCONFSUBDIR?=    xc20
-USE_PKGINSTALL=                yes
 EGDIR=                 ${PREFIX}/share/examples/${PKGNAME_NOREV}
-CONF_FILES=            ${EGDIR}/defaults ${PKG_SYSCONFDIR}/defaults
-CONF_FILES+=           ${EGDIR}/democd ${PKG_SYSCONFDIR}/democd
-CONF_FILES+=           ${EGDIR}/netbsd ${PKG_SYSCONFDIR}/netbsd
 
 USE_GNU_TOOLS+=                make
 MAKE_ENV+=             EGDIR="${EGDIR}"
diff -r a304ac0b7916 -r 2741c45afc0a sysutils/xentools20/distinfo
--- a/sysutils/xentools20/distinfo      Thu Mar 10 19:22:22 2005 +0000
+++ b/sysutils/xentools20/distinfo      Thu Mar 10 19:43:25 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/03/07 17:29:06 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2005/03/10 19:43:25 bouyer Exp $
 
 SHA1 (xen-2.0.3-src.tgz) = eb71d43abd014c87062f5b93932947b71e32be54
 RMD160 (xen-2.0.3-src.tgz) = 13cd844dbdeccbb9a97ee0d49f5b187a5f2590e7
@@ -20,3 +20,4 @@
 SHA1 (patch-ao) = 2f3fb89cf3209e19d3f5e2e13017981f7c98b8b3
 SHA1 (patch-ap) = da9d70ec8c61e8524b0b268113d178ec1d0d176c
 SHA1 (patch-aq) = 96ac4caaa268069ee02962a917f85753515747be
+SHA1 (patch-ar) = 4f4b47a47698720042fe8c30a7ac74304295740d
diff -r a304ac0b7916 -r 2741c45afc0a sysutils/xentools20/patches/patch-ar
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-ar      Thu Mar 10 19:43:25 2005 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ar,v 1.1 2005/03/10 19:43:25 bouyer Exp $
+--- ../xen/include/public/io/domain_controller.h.orig  2005-03-10 20:16:32.000000000 +0100
++++ ../xen/include/public/io/domain_controller.h       2005-01-12 13:22:28.000000000 +0100
+@@ -81,7 +81,7 @@
+ 
+ /* These are used by both front-end and back-end drivers. */
+ #define blkif_vdev_t   u16
+-#define blkif_pdev_t   u16
++#define blkif_pdev_t   u32
+ #define blkif_sector_t u64
+ 
+ /*
+@@ -183,7 +183,6 @@
+     blkif_sector_t sector_start;   /*  0 */
+     blkif_sector_t sector_length;  /*  8 */
+     blkif_pdev_t   device;         /* 16 */
+-    u16            __pad;          /* 18 */
+ } PACKED blkif_extent_t; /* 20 bytes */
+ 
+ /* Non-specific 'okay' return. */