kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try to fix CONF_FILES handling and some pkglint warnings.

Browse source 
Bump PKGREVISION.
This commit is contained in:
tnn 2011-05-07 18:39:05 +00:00
parent fd6cfcee51
commit d9e2c5fce2
6 changed files with 53 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sysutils/xentools41/Makefile
View file

@ -1,13 +1,11 @@
# $NetBSD: Makefile,v 1.5 2011/05/07 06:39:16 tnn Exp $
# $NetBSD: Makefile,v 1.6 2011/05/07 18:39:05 tnn Exp $
#
VERSION= 4.1.0
DISTNAME= xen-${VERSION}
PKGNAME= xentools41-${VERSION}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
EXTRACT_SUFX= .tar.gz
DISTFILES= ${DISTNAME}.tar.gz
DISTFILES+= ipxe-git-v1.0.0.tar.gz
@ -47,6 +45,7 @@ USE_TOOLS+= gmake
MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
MAKE_ENV+= EGDIR=${EGDIR:Q}
MAKE_ENV+= BASH_COMPLETION_DIR=${EGDIR:Q}
MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
MAKE_ENV+= VARBASE=${VARBASE}
@ -54,8 +53,6 @@ MAKE_ENV+= VARBASE=${VARBASE}
#MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA}
#MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM}
#INSTALL_MAKE_FLAGS+= CONFIG_DIR=${prefix}/share/examples
PY_PATCHPLIST= yes
#PYTHON_PATCH_SCRIPTS+= misc/xm
#PYTHON_PATCH_SCRIPTS+= misc/netfix
@ -97,7 +94,7 @@ SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
.include "../../mk/bsd.prefs.mk"
XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup
XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh
.if ${OPSYS} == "NetBSD"
SUBST_CLASSES+= proc
@ -117,17 +114,16 @@ FILES_SUBST+= PREFIX=${PREFIX:Q}
BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c
#CONF_FILES= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats
CONF_FILES= ${EGDIR}/xend-config.sxp \
${PKG_SYSCONFDIR}/xend-config.sxp
CONF_FILES+= ${EGDIR}/xend-config.sxp ${PKG_SYSCONFDIR}/xend-config.sxp
CONF_FILES+= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats
CONF_FILES+= ${EGDIR}/xm-config.xml ${PKG_SYSCONFDIR}/xm-config.xml
OWN_DIRS= ${PKG_SYSCONFDIR}/scripts ${VARBASE}/log/xen ${VARBASE}/lib
.for s in ${XEND_SCRIPTS}
CONF_FILES_PERMS+= ${EGDIR}/scripts/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
.endfor
.endfor
pre-build:
rm -f ${WRKSRC}/check/check_x11_devel

20
sysutils/xentools41/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2011/05/07 17:02:39 tnn Exp $
@comment $NetBSD: PLIST,v 1.4 2011/05/07 18:39:05 tnn Exp $
bin/lsevtchn
bin/pygrub
bin/qemu-img-xen
@ -23,7 +23,6 @@ bin/xenstore-write
bin/xentrace
bin/xentrace_format
bin/xentrace_setsize
etc/xen/scripts/hotplugpath.sh
include/_libxl_types.h
include/blktaplib.h
include/fsimage.h
@ -686,11 +685,26 @@ share/examples/rc.d/xen-watchdog
share/examples/rc.d/xencommons
share/examples/rc.d/xend
share/examples/rc.d/xendomains
share/examples/xen/README
share/examples/xen/README.incompatibilities
share/examples/xen/cpupool
share/examples/xen/formats
share/examples/xen/scripts/hotplugpath.sh
share/examples/xen/scripts/block
share/examples/xen/scripts/qemu-ifup
share/examples/xen/scripts/vif-bridge
share/examples/xen/scripts/vif-ip
share/examples/xen/xend-config.sxp
share/examples/xen/xend-pci-permissive.sxp
share/examples/xen/xend-pci-quirks.sxp
share/examples/xen/xl.conf
share/examples/xen/xl.sh
share/examples/xen/xm-config.xml
share/examples/xen/xmexample.hvm
share/examples/xen/xmexample.hvm-stubdom
share/examples/xen/xmexample.nbd
share/examples/xen/xmexample.pv-grub
share/examples/xen/xmexample.vti
share/examples/xen/xmexample1
share/examples/xen/xmexample2
share/examples/xen/xmexample3
@ -743,4 +757,4 @@ share/xen/qemu/pxe-rtl8139.bin
share/xen/qemu/vgabios-cirrus.bin
share/xen/qemu/vgabios.bin
share/xen/qemu/video.x
@pkgdir etc/xen/auto
@pkgdir share/examples/xen/auto

6
sysutils/xentools41/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.4 2011/05/07 16:55:58 tnn Exp $
$NetBSD: distinfo,v 1.5 2011/05/07 18:39:05 tnn Exp $
SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@ -6,7 +6,7 @@ Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
SHA1 (xen-4.1.0.tar.gz) = 4295e67524746ce155ff991db5fd2a611be27f67
RMD160 (xen-4.1.0.tar.gz) = e9ef987b24503d6c993bccfd203be5af9f104f48
Size (xen-4.1.0.tar.gz) = 10348539 bytes
SHA1 (patch-aa) = 3c03ea5d22e2edecbfa10de79e88a330204a8a70
SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada
SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d
SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175
@ -32,4 +32,6 @@ SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41
SHA1 (patch-da) = 1a7ecd9536340deac2945786b9faae55680525ca
SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d
SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
SHA1 (patch-dd) = b0c6253a77c09c8625bc9425742b395d1ce67010
SHA1 (patch-de) = b118ff85070cac7cd81375d2f59ad10b719ae263
SHA1 (patch-xm-test_ramdisk_make-release.sh) = 0844f1e022182d91dc04df552828820f4c946b5f

4
sysutils/xentools41/patches/patch-aa
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $
$NetBSD: patch-aa,v 1.2 2011/05/07 18:39:06 tnn Exp $
--- xentrace/Makefile.orig 2010-04-07 16:12:05.000000000 +0000
+++ xentrace/Makefile
@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $
[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
+ $(INSTALL_DATA) formats $(DESTDIR)$(XEN_CONFIG_DIR)
+ $(INSTALL_DATA) formats $(DESTDIR)$(EGDIR)
.PHONY: clean
clean:

11
sysutils/xentools41/patches/patch-dd Normal file
View file

@ -0,0 +1,11 @@
$NetBSD: patch-dd,v 1.1 2011/05/07 18:39:06 tnn Exp $
--- ../tools/examples/Makefile.orig 2011-03-25 10:42:50.000000000 +0000
+++ ../tools/examples/Makefile
@@ -1,5 +1,6 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
+XEN_CONFIG_DIR=${EGDIR}
# Init scripts.
XEND_INITD = init.d/xend

11
sysutils/xentools41/patches/patch-de Normal file
View file

@ -0,0 +1,11 @@
$NetBSD: patch-de,v 1.1 2011/05/07 18:39:06 tnn Exp $
--- ../tools/hotplug/common/Makefile.orig 2011-03-25 10:42:50.000000000 +0000
+++ ../tools/hotplug/common/Makefile
@@ -1,5 +1,6 @@
XEN_ROOT = ../../..
include $(XEN_ROOT)/tools/Rules.mk
+XEN_SCRIPT_DIR = ${EGDIR}/scripts
HOTPLUGPATH="hotplugpath.sh"