From owner-svn-ports-head@FreeBSD.ORG Tue Oct 7 10:52:11 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1088D3; Tue, 7 Oct 2014 10:52:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C609BF5; Tue, 7 Oct 2014 10:52:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97AqBYW010828; Tue, 7 Oct 2014 10:52:11 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97AqAtu010821; Tue, 7 Oct 2014 10:52:10 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410071052.s97AqAtu010821@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 7 Oct 2014 10:52:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370293 - in head/emulators/hyperv-is: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Tue, 07 Oct 2014 10:52:11 -0000 Author: bapt Date: Tue Oct 7 10:52:10 2014 New Revision: 370293 URL: https://svnweb.freebsd.org/changeset/ports/370293 QAT: https://qat.redports.org/buildarchive/r370293/ Log: Big cleanup directly specify the pkg-message used instead of trying to manually generate it avoid using @cwd Do not touch base and push everything in PREFIX This port needs way more love Added: head/emulators/hyperv-is/files/pkg-message.A - copied unchanged from r370275, head/emulators/hyperv-is/files/pkg-message.A.in head/emulators/hyperv-is/files/pkg-message.B - copied unchanged from r370275, head/emulators/hyperv-is/files/pkg-message.B.in Deleted: head/emulators/hyperv-is/files/pkg-message.A.in head/emulators/hyperv-is/files/pkg-message.B.in Modified: head/emulators/hyperv-is/Makefile head/emulators/hyperv-is/pkg-plist Modified: head/emulators/hyperv-is/Makefile ============================================================================== --- head/emulators/hyperv-is/Makefile Tue Oct 7 10:25:42 2014 (r370292) +++ head/emulators/hyperv-is/Makefile Tue Oct 7 10:52:10 2014 (r370293) @@ -2,6 +2,7 @@ PORTNAME= hyperv-is PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= emulators kld MASTER_SITES= https://github.com/${MSLINK}/ DISTNAME= ${DNAME} @@ -15,7 +16,8 @@ USES+= uidfix BIS= ${PORTVERSION} MSBASE= FreeBSDonHyper-V/Hyperv-Ports/raw/hyperv-is-master MSLINK= ${MSBASE}/BIS-${BIS}/FreeBSD-${OSREL}/ports -SUB_FILES= ${PMSG} +MAKE_ARGS= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man +PKGMESSAGE= ${FILESDIR}/${PMSG} .include @@ -45,17 +47,18 @@ DNAME= ${FILE_${OSREL:S/.//}} IGNORE= OSREL ${OSREL} not supported .endif +post-patch: + @${REINPLACE_CMD} -e "s,/usr/sbin/,${PREFIX}/sbin/,g" \ + ${WRKSRC}/etc/rc.d/hv_kvpd + pre-install: @${MKDIR} ${STAGEDIR}/boot/kernel \ ${STAGEDIR}/etc/rc.d \ - ${STAGEDIR}/usr/share/man/man1 \ - ${STAGEDIR}/usr/share/man/man4 \ - ${STAGEDIR}/usr/share/man/man8 \ - ${STAGEDIR}/usr/local/hyperv/scripts \ - ${STAGEDIR}/usr/sbin - ${MV} ${WRKDIR}/${PMSG} ${WRKDIR}/pkg-message + ${STAGEDIR}/usr/local/hyperv/scripts post-install: ${RM} ${STAGEDIR}/boot/kernel/linker.hints + ${MV} ${STAGEDIR}/etc/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d + .include Copied: head/emulators/hyperv-is/files/pkg-message.A (from r370275, head/emulators/hyperv-is/files/pkg-message.A.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/hyperv-is/files/pkg-message.A Tue Oct 7 10:52:10 2014 (r370293, copy of r370275, head/emulators/hyperv-is/files/pkg-message.A.in) @@ -0,0 +1,19 @@ +############################################################################# +After installing do the following steps: +# Deleting Hyper-v BIS driver names + sed -i "" '/Loader labels for Hyper-v BIS driver/d' /boot/loader.conf + sed -i "" '/hv_vmbus_load/d' /boot/loader.conf + sed -i "" '/hv_utils_load/d' /boot/loader.conf + sed -i "" '/hv_storvsc_load/d' /boot/loader.conf + sed -i "" '/hv_netvsc_load/d' /boot/loader.conf + sed -i "" '/hv_ata_pci_disengage_load/d' /boot/loader.conf + + #Hyper-v driver names + echo "# Loader labels for Hyper-v BIS drivers -do not modify" >> /boot/loader.conf + echo 'hv_vmbus_load="YES"' >> /boot/loader.conf + echo 'hv_utils_load="YES"' >> /boot/loader.conf + echo 'hv_storvsc_load="YES"' >> /boot/loader.conf + echo 'hv_netvsc_load="YES"' >> /boot/loader.conf + echo 'hv_ata_pci_disengage_load="YES"' >>/boot/loader.conf +When deinstalled, restore /boot/loader.conf +############################################################################# Copied: head/emulators/hyperv-is/files/pkg-message.B (from r370275, head/emulators/hyperv-is/files/pkg-message.B.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/hyperv-is/files/pkg-message.B Tue Oct 7 10:52:10 2014 (r370293, copy of r370275, head/emulators/hyperv-is/files/pkg-message.B.in) @@ -0,0 +1,17 @@ +############################################################################# +To enable hv_kvp, you should do the steps following: + # Deleting kvp label + sed -i "" '/Loader labels for Hyper-V KVP drivers/d' /etc/rc.conf + sed -i "" '/hv_kvp_load/d' /etc/rc.conf + + #hyperv driver names + echo '# Loader labels for Hyper-V KVP drivers -do not modify' >> /boot/loader.conf + echo 'hv_kvp_load="YES"' >> /boot/loader.conf + +# KVP - daemon label + sed -i "" '/Label for KVP daemon/d' /etc/rc.conf + sed -i "" '/hv_kvp_daemon_enable/d' /etc/rc.conf + echo '# Label for KVP daemon -do not modify' >> /etc/rc.conf + echo 'hv_kvp_daemon_enable="YES"' >> /etc/rc.conf +After deinstall, you should restore /boot/loader.conf and /etc/rc.conf +############################################################################# Modified: head/emulators/hyperv-is/pkg-plist ============================================================================== --- head/emulators/hyperv-is/pkg-plist Tue Oct 7 10:25:42 2014 (r370292) +++ head/emulators/hyperv-is/pkg-plist Tue Oct 7 10:52:10 2014 (r370293) @@ -1,25 +1,19 @@ hyperv/scripts/hv_get_dhcp_info hyperv/scripts/hv_get_dns_info hyperv/scripts/hv_set_ifconfig -@cwd /boot/kernel -%%A%%hv_ata_pci_disengage.ko -%%A%%hv_netvsc.ko -%%A%%hv_storvsc.ko -%%A%%hv_utils.ko -%%A%%hv_vmbus.ko -%%B%%hv_kvp.ko -@cwd /etc/rc.d -hv_kvpd -%%A%%@cwd /usr/share/man/man1 -%%A%%hyperv-is.1.gz -%%B%%@cwd /usr/sbin -%%B%%hv_kvp_daemon -@cwd /usr/share/man/man4 -%%A%%hv_ata_pci_disengage.4.gz -hv_kvp.4.gz -%%A%%hv_netvsc.4.gz -%%A%%hv_storvsc.4.gz -%%A%%hv_utils.4.gz -%%A%%hv_vmbus.4.gz -%%B%%@cwd /usr/share/man/man8 -%%B%%hv_kvp_daemon.8.gz +%%A%%/boot/kernel/hv_ata_pci_disengage.ko +%%A%%/boot/kernel/hv_netvsc.ko +%%A%%/boot/kernel/hv_storvsc.ko +%%A%%/boot/kernel/hv_utils.ko +%%A%%/boot/kernel/hv_vmbus.ko +%%B%%/boot/kernel/hv_kvp.ko +etc/rc.d/hv_kvpd +%%A%%man/man1/hyperv-is.1.gz +%%B%%sbin/hv_kvp_daemon +%%A%%man/man4/hv_ata_pci_disengage.4.gz +man/man4/hv_kvp.4.gz +%%A%%man/man4/hv_netvsc.4.gz +%%A%%man/man4/hv_storvsc.4.gz +%%A%%man/man4/hv_utils.4.gz +%%A%%man/man4/hv_vmbus.4.gz +%%B%%man/man8/hv_kvp_daemon.8.gz