Date: Tue, 07 Oct 2014 13:40:41 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r370293 - in head/emulators/hyperv-is: . files Message-ID: <543433A9.8020504@FreeBSD.org> In-Reply-To: <5434336E.8090805@FreeBSD.org> References: <201410071052.s97AqAtu010821@svn.freebsd.org> <5434336E.8090805@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --DeJowhUUwvx4lj3dCn0wQvgxjnR5j75x4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/7/2014 1:39 PM, Bryan Drewery wrote: > On 10/7/2014 5:52 AM, Baptiste Daroussin wrote: >> 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/p= kg-message.A.in >> head/emulators/hyperv-is/files/pkg-message.B >> - copied unchanged from r370275, head/emulators/hyperv-is/files/p= kg-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 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/emulators/hyperv-is/Makefile Tue Oct 7 10:25:42 2014 (r37029= 2) >> +++ head/emulators/hyperv-is/Makefile Tue Oct 7 10:52:10 2014 (r37029= 3) >> @@ -2,6 +2,7 @@ >> =20 >> PORTNAME=3D hyperv-is >> PORTVERSION=3D 1.1 >> +PORTREVISION=3D 1 >> CATEGORIES=3D emulators kld >> MASTER_SITES=3D https://github.com/${MSLINK}/ >> DISTNAME=3D ${DNAME} >> @@ -15,7 +16,8 @@ USES+=3D uidfix >> BIS=3D ${PORTVERSION} >> MSBASE=3D FreeBSDonHyper-V/Hyperv-Ports/raw/hyperv-is-master >> MSLINK=3D ${MSBASE}/BIS-${BIS}/FreeBSD-${OSREL}/ports >> -SUB_FILES=3D ${PMSG} >> +MAKE_ARGS=3D BINDIR=3D${PREFIX}/sbin MANDIR=3D${PREFIX}/man/man >> +PKGMESSAGE=3D ${FILESDIR}/${PMSG} >> =20 >> .include <bsd.port.pre.mk> >> =20 >> @@ -45,17 +47,18 @@ DNAME=3D ${FILE_${OSREL:S/.//}} >> IGNORE=3D OSREL ${OSREL} not supported >> .endif >> =20 >> +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 >> =20 >> post-install: >> ${RM} ${STAGEDIR}/boot/kernel/linker.hints >> + ${MV} ${STAGEDIR}/etc/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d >> + >> =20 >> .include <bsd.port.post.mk> >> >> Copied: head/emulators/hyperv-is/files/pkg-message.A (from r370275, he= ad/emulators/hyperv-is/files/pkg-message.A.in) >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- /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 2= 014 (r370293, copy of r370275, head/emulators/hyperv-is/files/pkg-message= =2EA.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.c= onf >> + 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=3D"YES"' >> /boot/loader.conf >> + echo 'hv_utils_load=3D"YES"' >> /boot/loader.conf >> + echo 'hv_storvsc_load=3D"YES"' >> /boot/loader.conf >> + echo 'hv_netvsc_load=3D"YES"' >> /boot/loader.conf >> + echo 'hv_ata_pci_disengage_load=3D"YES"' >>/boot/loader.conf >> +When deinstalled, restore /boot/loader.conf >> +#####################################################################= ######## >> >> Copied: head/emulators/hyperv-is/files/pkg-message.B (from r370275, he= ad/emulators/hyperv-is/files/pkg-message.B.in) >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- /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 2= 014 (r370293, copy of r370275, head/emulators/hyperv-is/files/pkg-message= =2EB.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=20 >> + >> + #hyperv driver names >> + echo '# Loader labels for Hyper-V KVP drivers -do not modify' >> = /boot/loader.conf >> + echo 'hv_kvp_load=3D"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=3D"YES"' >> /etc/rc.conf >> +After deinstall, you should restore /boot/loader.conf and /etc/rc.con= f >> +#####################################################################= ######## >> >> Modified: head/emulators/hyperv-is/pkg-plist >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/emulators/hyperv-is/pkg-plist Tue Oct 7 10:25:42 2014 (r3702= 92) >> +++ head/emulators/hyperv-is/pkg-plist Tue Oct 7 10:52:10 2014 (r3702= 93) >> @@ -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 >> >=20 > Shouldn't these go to /boot/modules and not /boot/kernel? /boot/kernel > is moved/replaced in upgrades while /boot/modules is not. >=20 Plus hier(7): kernel/ pure kernel executable (the operating system loaded into memory at boot time) modules/ third-party loadable kernel modules; see kldstat(8) --=20 Regards, Bryan Drewery --DeJowhUUwvx4lj3dCn0wQvgxjnR5j75x4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJUNDOqAAoJEDXXcbtuRpfPcfQIAMp856a0VUdWcxqEhv2iohgS DWx4Nfsv3oiL5S7sgccgihtPAhN89rtYi+3mANje+b9pZOKuKjT3ZjsoOKqhxeoV FOUPEcyvPKbWDXXmj1rHqlz9yKTodXazbjaql57BEsdso4NFnxRwTB6MvwZF4YbI Ol3z5Owytw1Le8XqwuyI3bouGPCis0uXqon0sipgtxKRy2z5fp47+g60Pq6Fesr1 22jiaKayPGrxvnJkK3oV5asiuZ9fCrTLbWFd/tE3VMkpDWFWsafvEwKcsoaYxnNI TPaFzWBrI2F9F6sfy316iQCucCmQfH8ifHc8+EsV5xSrn3za3c3E/kHb3ErgzwA= =rpan -----END PGP SIGNATURE----- --DeJowhUUwvx4lj3dCn0wQvgxjnR5j75x4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?543433A9.8020504>