From owner-svn-ports-head@FreeBSD.ORG Thu Aug 23 01:16:12 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0E71106564A; Thu, 23 Aug 2012 01:16:12 +0000 (UTC) (envelope-from kuriyama@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A1AD58FC0C; Thu, 23 Aug 2012 01:16:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7N1GCXO030552; Thu, 23 Aug 2012 01:16:12 GMT (envelope-from kuriyama@svn.freebsd.org) Received: (from kuriyama@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7N1GCQp030548; Thu, 23 Aug 2012 01:16:12 GMT (envelope-from kuriyama@svn.freebsd.org) Message-Id: <201208230116.q7N1GCQp030548@svn.freebsd.org> From: Jun Kuriyama Date: Thu, 23 Aug 2012 01:16:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302972 - in head/emulators/virtio-kmod: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2012 01:16:12 -0000 Author: kuriyama Date: Thu Aug 23 01:16:12 2012 New Revision: 302972 URL: http://svn.freebsd.org/changeset/ports/302972 Log: - Update to r239473. Added: head/emulators/virtio-kmod/files/ head/emulators/virtio-kmod/files/extra-patch-virtio.h (contents, props changed) Modified: head/emulators/virtio-kmod/Makefile head/emulators/virtio-kmod/distinfo Modified: head/emulators/virtio-kmod/Makefile ============================================================================== --- head/emulators/virtio-kmod/Makefile Thu Aug 23 00:19:12 2012 (r302971) +++ head/emulators/virtio-kmod/Makefile Thu Aug 23 01:16:12 2012 (r302972) @@ -7,11 +7,11 @@ PORTNAME= virtio PORTVERSION= 0.${SVN_REV} -PORTREVISION= 1 CATEGORIES= emulators kld MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama -PKGNAMESUFFIX= -kmod +PKGNAMESUFFIX= -kmod-${OSBRANCH} +DISTFILES= ${FILE_8} ${FILE_9} MAINTAINER= kuriyama@FreeBSD.org COMMENT= virtio kernel modules port for 8.[23]/9.0 @@ -19,7 +19,6 @@ COMMENT= virtio kernel modules port for ONLY_FOR_ARCHS= amd64 i386 WRKSRC= ${WRKDIR} -SVN_REV= 234349 KMODDIR?= /boot/modules PLIST_SUB= KMODDIR=${KMODDIR:C,^/,,} NEEDSUBDIRS= amd64 conf contrib dev/pci geom i386 kern net netinet netinet6 \ @@ -31,21 +30,28 @@ NEEDSUBDIRS= amd64 conf contrib dev/pci IGNORE= requires kernel source to be installed .endif -.if ${OSREL} != "8.2" && ${OSREL} != "8.3" && ${OSREL} != "9.0" +SVN_REV= 239473 +FILE_8= ${PORTNAME}-8-0.${SVN_REV}${EXTRACT_SUFX} +FILE_9= ${PORTNAME}-9-0.${SVN_REV}${EXTRACT_SUFX} +.if ${OSREL} == "8.2" || ${OSREL} == "8.3" +OSBRANCH= 8 +EXTRACT_ONLY= ${FILE_8} +.elif ${OSREL} == "9.0" || ${OSREL} == "9.1" +OSBRANCH= 9 +EXTRACT_ONLY= ${FILE_9} +.else IGNORE= not supported $${OSREL} (${OSREL}) .endif -.if ${OSREL} == "8.2" -SVN_REV= 228301 -#SVN_REV= 232470 -#SVN_REV= 228301 -.endif post-extract: cd ${WRKSRC} && ${MKDIR} sys/dev tmp && ${MV} dev modules tmp/ .for d in ${NEEDSUBDIRS} - ${CP} -Rp ${SRC_BASE}/sys/${d} ${WRKSRC}/sys/${d} + [ ! -d ${SRC_BASE}/sys/${d} ] || ${CP} -Rp ${SRC_BASE}/sys/${d} ${WRKSRC}/sys/${d} .endfor ${CP} -Rp ${WRKSRC}/tmp/* ${WRKSRC}/sys/ +.if ${OSREL} == "8.1" || ${OSREL} == "8.2" +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-virtio.h +.endif do-build: cd ${WRKSRC}/sys/modules/virtio; ${MAKE} DEBUG_FLAGS=-g @@ -65,13 +71,17 @@ SVN_MIRROR?= http://svn.freebsd.org/base EXPDIR= ${WRKSRC}/src/sys maintainer-tar: ${MKDIR} ${EXPDIR} - cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sys/dev/virtio dev/virtio - cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sys/modules/virtio modules/virtio - cd ${EXPDIR} && ${TAR} cfvz ${DISTDIR}/${DISTFILES} dev modules + cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/9/sys/dev/virtio dev/virtio + cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/9/sys/modules/virtio modules/virtio + cd ${EXPDIR} && ${TAR} cfvz ${DISTDIR}/${FILE_9} dev modules + cd ${EXPDIR} && ${RM} -rf dev modules + cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/8/sys/dev/virtio dev/virtio + cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/8/sys/modules/virtio modules/virtio + cd ${EXPDIR} && ${TAR} cfvz ${DISTDIR}/${FILE_8} dev modules maintainer-check: - @new=`svn log -ql 1 ${SVN_MIRROR}@HEAD head/sys/dev/virtio | ${GREP} -v ^- | ${SED} -e 's| .*||'`;\ - old="r${SVN_REV}";\ - if [ "$${new}" != "$${old}" ]; then ${ECHO_MSG} "New virtio rev: $${new}"; fi + @new=`svn log -ql 1 ${SVN_MIRROR}@HEAD head/sys/dev/virtio | ${GREP} -v ^- | ${SED} -e 's| .*||; s|r||'`;\ + old="${SVN_REV}";\ + if [ "$${new}" -gt "$${old}" ]; then ${ECHO_MSG} "New virtio rev: r$${new}"; fi .include Modified: head/emulators/virtio-kmod/distinfo ============================================================================== --- head/emulators/virtio-kmod/distinfo Thu Aug 23 00:19:12 2012 (r302971) +++ head/emulators/virtio-kmod/distinfo Thu Aug 23 01:16:12 2012 (r302972) @@ -1,6 +1,4 @@ -SHA256 (virtio-0.234349.tar.gz) = a776b690c3936f859b4bec3e4157ee6f64789ded18388ec948b5828ba8c9483d -SIZE (virtio-0.234349.tar.gz) = 47044 -SHA256 (virtio-0.232470.tar.gz) = d9f933271977b4d63cfcc591291534b1b313b0a16e6e878bfa47f369b88681e2 -SIZE (virtio-0.232470.tar.gz) = 47396 -SHA256 (virtio-0.228301.tar.gz) = 022b05ce98a88096aacc331fb7ba122d935432a87100fcba6a3b3d7e9e9aa0d6 -SIZE (virtio-0.228301.tar.gz) = 47262 +SHA256 (virtio-8-0.239473.tar.gz) = b0325b7ee4e523ec921b16462cfe572e578e81e482f09f15711c18a6069338be +SIZE (virtio-8-0.239473.tar.gz) = 48662 +SHA256 (virtio-9-0.239473.tar.gz) = ba94122148360015c0b3866203a293bd8b90e1a8fa827e5026c7506e8e459564 +SIZE (virtio-9-0.239473.tar.gz) = 48249 Added: head/emulators/virtio-kmod/files/extra-patch-virtio.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtio-kmod/files/extra-patch-virtio.h Thu Aug 23 01:16:12 2012 (r302972) @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- sys/dev/virtio/virtio.h.orig 2012-08-22 09:25:24.732287379 +0900 ++++ sys/dev/virtio/virtio.h 2012-08-22 09:27:32.411327803 +0900 +@@ -150,4 +150,8 @@ + VIRTIO_RDWR_DEVICE_CONFIG(2, uint16_t); + VIRTIO_RDWR_DEVICE_CONFIG(4, uint32_t); + ++#ifndef DEVMETHOD_END ++#define DEVMETHOD_END { NULL, NULL } ++#endif ++ + #endif /* _VIRTIO_H_ */