From f3f69b9b5eedb4abb3abb1ee5a401963b069c018 Mon Sep 17 00:00:00 2001 From: kuriyama Date: Tue, 11 Jun 2013 03:37:01 +0000 Subject: - Update to r250249. - Backport fix for if_vtnet with qemu-1.5.0 (kern/178955). --- emulators/virtio-kmod/Makefile | 19 +++++++++---------- emulators/virtio-kmod/distinfo | 8 ++++---- emulators/virtio-kmod/files/patch-if_vtnet.c | 14 ++++++++++++++ emulators/virtio-kmod/pkg-descr | 2 +- emulators/virtio-kmod/pkg-message | 2 -- 5 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 emulators/virtio-kmod/files/patch-if_vtnet.c (limited to 'emulators/virtio-kmod') diff --git a/emulators/virtio-kmod/Makefile b/emulators/virtio-kmod/Makefile index c87c661ef2f0..e334da9cb776 100644 --- a/emulators/virtio-kmod/Makefile +++ b/emulators/virtio-kmod/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: virtio-kmod -# Date created: 20 Nov 2011 -# Whom: Jun Kuriyama -# # $FreeBSD$ -# PORTNAME= virtio PORTVERSION= 0.${SVN_REV} @@ -14,14 +9,14 @@ PKGNAMESUFFIX= -kmod-${OSBRANCH} DISTFILES= ${FILE_8} ${FILE_9} MAINTAINER= kuriyama@FreeBSD.org -COMMENT= virtio kernel modules port for 8.[23]/9.[01] +COMMENT= virtio kernel modules port for 8.[234]/9.[01] ONLY_FOR_ARCHS= amd64 i386 WRKSRC= ${WRKDIR} KMODDIR?= /boot/modules PLIST_SUB= KMODDIR=${KMODDIR:C,^/,,} -NEEDSUBDIRS= amd64 conf contrib dev/pci geom i386 kern net netinet netinet6 \ +NEEDSUBDIRS= amd64 cam conf contrib dev/pci geom i386 kern net netinet netinet6 \ sys tools vm x86 .include @@ -30,7 +25,7 @@ NEEDSUBDIRS= amd64 conf contrib dev/pci geom i386 kern net netinet netinet6 \ IGNORE= requires kernel source to be installed .endif -SVN_REV= 242658 +SVN_REV= 250249 FILE_8= ${PORTNAME}-8-0.${SVN_REV}${EXTRACT_SUFX} FILE_9= ${PORTNAME}-9-0.${SVN_REV}${EXTRACT_SUFX} .if ${OSREL} == "8.2" @@ -39,6 +34,9 @@ EXTRACT_ONLY= ${FILE_8} .elif ${OSREL} == "8.3" OSBRANCH= 8.3 EXTRACT_ONLY= ${FILE_8} +.elif ${OSREL} == "8.4" +OSBRANCH= 8.4 +EXTRACT_ONLY= ${FILE_8} .elif ${OSREL} == "9.0" OSBRANCH= 9.0 EXTRACT_ONLY= ${FILE_9} @@ -86,8 +84,9 @@ maintainer-tar: cd ${EXPDIR} && ${TAR} cfvz ${DISTDIR}/${FILE_8} dev modules maintainer-check: - @new=`svn log -ql 1 ${SVN_MIRROR}@HEAD stable/9/sys/dev/virtio | ${GREP} -v ^- | ${SED} -e 's| .*||; s|r||'`;\ + @new9=`svn log -ql 1 ${SVN_MIRROR}@HEAD stable/9/sys/dev/virtio | ${GREP} -v ^- | ${SED} -e 's| .*||; s|r||'`;\ + new8=`svn log -ql 1 ${SVN_MIRROR}@HEAD stable/8/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 + if [ "$${new9}" -gt "$${old}" ]; then ${ECHO_MSG} "New virtio rev: r$${new9} (was $${old}, 8-stable is $${new8})"; fi .include diff --git a/emulators/virtio-kmod/distinfo b/emulators/virtio-kmod/distinfo index b1f21641c7d7..5baaba8e7bb5 100644 --- a/emulators/virtio-kmod/distinfo +++ b/emulators/virtio-kmod/distinfo @@ -1,4 +1,4 @@ -SHA256 (virtio-8-0.242658.tar.gz) = d0f01f95d5416c1d886961e382aece5b2fde4fbed7551b01f6c43b97127586b3 -SIZE (virtio-8-0.242658.tar.gz) = 48435 -SHA256 (virtio-9-0.242658.tar.gz) = 623bd98413cdfe0ad93e5a55f35f1e8f9ed3961da75fb337dd64abe3f0393099 -SIZE (virtio-9-0.242658.tar.gz) = 48592 +SHA256 (virtio-8-0.250249.tar.gz) = 0a4d4327973c4ed2ddc63f8fc8b62dcca23f673f92bb45257a0e46991a0bafbb +SIZE (virtio-8-0.250249.tar.gz) = 64687 +SHA256 (virtio-9-0.250249.tar.gz) = 706876cf4c40eab1f5e0bde08eae806f1ad285f1d489979c179c25e0a2534f8e +SIZE (virtio-9-0.250249.tar.gz) = 65024 diff --git a/emulators/virtio-kmod/files/patch-if_vtnet.c b/emulators/virtio-kmod/files/patch-if_vtnet.c new file mode 100644 index 000000000000..fc43920c835e --- /dev/null +++ b/emulators/virtio-kmod/files/patch-if_vtnet.c @@ -0,0 +1,14 @@ +--- sys/dev/virtio/network/if_vtnet.c.orig 2013-06-10 13:44:32.626245199 +0900 ++++ sys/dev/virtio/network/if_vtnet.c 2013-06-10 13:46:44.810245935 +0900 +@@ -2473,9 +2473,9 @@ + sglist_init(&sg, 4, segs); + error |= sglist_append(&sg, &hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &filter->vmf_unicast, +- sizeof(struct vtnet_mac_table)); ++ sizeof(uint32_t) + filter->vmf_unicast.nentries * ETHER_ADDR_LEN); + error |= sglist_append(&sg, &filter->vmf_multicast, +- sizeof(struct vtnet_mac_table)); ++ sizeof(uint32_t) + filter->vmf_multicast.nentries * ETHER_ADDR_LEN); + error |= sglist_append(&sg, &ack, sizeof(uint8_t)); + KASSERT(error == 0 && sg.sg_nseg == 4, + ("error adding MAC filtering message to sglist")); diff --git a/emulators/virtio-kmod/pkg-descr b/emulators/virtio-kmod/pkg-descr index 0eee46da252d..91897e583541 100644 --- a/emulators/virtio-kmod/pkg-descr +++ b/emulators/virtio-kmod/pkg-descr @@ -1,5 +1,5 @@ Port for package building of virtio kernel loadable modules. -This port support only 8.[23] and 9.[01] releases. +This port support only 8.[234] and 9.[01] releases. WWW: http://people.FreeBSD.org/~kuriyama/virtio/ diff --git a/emulators/virtio-kmod/pkg-message b/emulators/virtio-kmod/pkg-message index e30974a9d6f7..daa5f1b32264 100644 --- a/emulators/virtio-kmod/pkg-message +++ b/emulators/virtio-kmod/pkg-message @@ -19,6 +19,4 @@ and enable virtio devices in host's domain.xml: +
... - --
+ -+
-- cgit