diff options
| author | bouyer <bouyer@pkgsrc.org> | 2005-03-10 19:43:25 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2005-03-10 19:43:25 +0000 |
| commit | aaadd782976841accef937c0f2a073c8b1580f79 (patch) | |
| tree | e27ccc1b4e7df883c09fb680da4d261ef35eaf44 | |
| parent | 644cd61f8f585194c21be3897e3850b5302c8be2 (diff) | |
| download | pkgsrc-aaadd782976841accef937c0f2a073c8b1580f79.tar.gz | |
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.
| -rw-r--r-- | sysutils/xentools20/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/xentools20/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools20/patches/patch-ar | 20 |
3 files changed, 24 insertions, 7 deletions
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index 8c370318c42..230e6609557 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -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 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 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 --git a/sysutils/xentools20/distinfo b/sysutils/xentools20/distinfo index 3f50b8e8c18..1cae3386a36 100644 --- a/sysutils/xentools20/distinfo +++ b/sysutils/xentools20/distinfo @@ -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-an) = 6540433dd5e3527ea635a585a1094606fd22cc1a SHA1 (patch-ao) = 2f3fb89cf3209e19d3f5e2e13017981f7c98b8b3 SHA1 (patch-ap) = da9d70ec8c61e8524b0b268113d178ec1d0d176c SHA1 (patch-aq) = 96ac4caaa268069ee02962a917f85753515747be +SHA1 (patch-ar) = 4f4b47a47698720042fe8c30a7ac74304295740d diff --git a/sysutils/xentools20/patches/patch-ar b/sysutils/xentools20/patches/patch-ar new file mode 100644 index 00000000000..aae6a5183c2 --- /dev/null +++ b/sysutils/xentools20/patches/patch-ar @@ -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. */ |