Attachment 150894 Details for Bug 196185 – /usr/ports/emulator/hyperv-is

[patch] /usr/ports/emulator/hyperv-is

emulator_hyperv-is.patch (text/plain), 7.67 KB, created by FangJun on 2014-12-23 05:44:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: FangJun

Created: 2014-12-23 05:44:26 UTC

Size: 7.67 KB

patch

obsolete

>diff -urp hyperv-is/Makefile hyperv-is_ok/Makefile
>--- hyperv-is/Makefile	2014-10-08 04:27:29.000000000 +0800
>+++ hyperv-is_ok/Makefile	2014-12-23 10:47:58.000000000 +0800
>@@ -1,8 +1,9 @@
> # $FreeBSD: head/emulators/hyperv-is/Makefile 370396 2014-10-07 20:27:29Z marino $
> 
>+USES=		kmod uidfix
>+
> PORTNAME=	hyperv-is
>-PORTVERSION=	1.1
>-PORTREVISION=	2
>+PORTVERSION=	2.0
> CATEGORIES=	emulators
> MASTER_SITES=	https://github.com/${MSLINK}/
> DISTNAME=	${DNAME}
>@@ -12,6 +13,7 @@ COMMENT=	FreeBSD Integration Service on 
> 
> ONLY_FOR_ARCHS=	amd64 i386
> 
>+
> USES=		kmod uidfix
> BIS=		${PORTVERSION}
> MSBASE=		FreeBSDonHyper-V/Hyperv-Ports/raw/hyperv-is-master
>@@ -25,42 +27,62 @@ PKGMESSAGE=	${FILESDIR}/${PMSG}
> IGNORE=		${OPSYS} not supported
> .endif
> 
>+FILE_84=	hyperv-is-8.4.${BIS}
>+FILE_91=	hyperv-is-9.1.${BIS}
>+FILE_92=	hyperv-is-9.2.${BIS}
>+FILE_93=	hyperv-is-9.3.${BIS}
>+FILE_100=	hv-kvp-${BIS}
>+FILE_101=	hyperv-is-10.1.${BIS}
>+DNAME=		${FILE_${OSREL:S/.//}}
>+
>+.if empty(DNAME)
>+IGNORE=	 needless to install on FreeBSD-${OSREL}  
>+.endif
>+
> .if ${OSREL} == "10.0"
> BIS=		1.0
>-PLIST_SUB=	A="@comment " B=""
>+PLIST_SUB=	A="@comment " B="" C="@comment " 
> PMSG=		pkg-message.B
> .else
>+.if ${OSREL} ==	"10.1" 
>+PREFIX= /usr/
>+KMODDIR = /boot/kernel/
>+WRKSRC=		${WRKDIR}/hyperv-is-${PORTVERSION}
>+PLIST_SUB=	A="@comment " B="@comment " C=""
>+PMSG=		pkg-message.C
>+.else
> CC=		gcc -w
> WRKSRC=		${WRKDIR}/hyperv-is-${PORTVERSION}
>-PLIST_SUB=	B="@comment " A=""
>+PLIST_SUB=	C="@comment " B="@comment " A=""
> PMSG=		pkg-message.A
> .endif
>+.endif
> 
>-FILE_84=	hyperv-is-8.4.${BIS}
>-FILE_91=	hyperv-is-9.1.${BIS}
>-FILE_92=	hyperv-is-9.2.${BIS}
>-FILE_93=	hyperv-is-9.3.${BIS}
>-FILE_100=	hv-kvp-${BIS}
>-DNAME=		${FILE_${OSREL:S/.//}}
> 
>-.if empty(DNAME)
>-IGNORE?=	OSREL ${OSREL} not supported
>-.endif
> 
> post-patch:
>+.if ${OSREL} !=	"10.1" 
> 	@${REINPLACE_CMD} -e "s,/usr/sbin/,${PREFIX}/sbin/,g" \
> 		${WRKSRC}/etc/rc.d/hv_kvpd
>+.endif
> 
> pre-install:
>+.if ${OSREL} ==	"10.1" 
> 	@${MKDIR} ${STAGEDIR}${PREFIX} \
>-		${STAGEDIR}/etc/rc.d \
>+	     ${STAGEDIR}/var/db/hyperv/scripts
>+.else
>+	@${MKDIR} ${STAGEDIR}${PREFIX} \
>+	        ${STAGEDIR}/etc/rc.d \
> 		${STAGEDIR}/usr/local/hyperv/scripts
>+.endif
> 
> post-install:
>+.if ${OSREL} !=	"10.1" 
> 	${RM} ${STAGEDIR}/boot/kernel/linker.hints
> 	${MV} ${STAGEDIR}/etc/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d
> .if ${PREFIX} != /usr/local
> 	${MV} ${STAGEDIR}/usr/local/* ${STAGEDIR}${PREFIX}
> .endif
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -urp hyperv-is/distinfo hyperv-is_ok/distinfo
>--- hyperv-is/distinfo	2014-10-07 06:58:50.000000000 +0800
>+++ hyperv-is_ok/distinfo	2014-12-23 11:19:35.000000000 +0800
>@@ -1,3 +1,5 @@
>+SHA256 (hyperv-is-10.1.2.0.tar.gz) = 01a9a0f6c737c8d17ece18f6c77f2596b7cd0e01143c1b7f5930025569a54730
>+SIZE (hyperv-is-10.1.2.0.tar.gz) = 106784
> SHA256 (hyperv-is-8.4.1.1.tar.gz) = 21f21bf8192892b823a63ebcea8cfd916ab0572b965c06471388386765346ae6
> SIZE (hyperv-is-8.4.1.1.tar.gz) = 94356
> SHA256 (hyperv-is-9.1.1.1.tar.gz) = ab4dc50d4f66ef983bd0de96388ba95e29d1e987362336bf44e3ff971425245a
>Only in hyperv-is_ok/files: pkg-message.C
>diff -urp hyperv-is/pkg-install hyperv-is_ok/pkg-install
>--- hyperv-is/pkg-install	2014-10-07 06:58:50.000000000 +0800
>+++ hyperv-is_ok/pkg-install	2014-12-23 11:17:06.000000000 +0800
>@@ -5,6 +5,7 @@
> # adds hyperv labels in loader.conf 
> #
> 
>+
> #Check poudriere workdirs
> POD_WRK_HOME=/wrkdirs
> if [ ! -d ${POD_WRK_HOME} ]; then
>@@ -16,40 +17,59 @@ if [ ! -d ${WRKDIRS} ]; then
>    WRKDIRS=/
> fi
> 
>+version=`uname -r`
>+
> if [ "$2" = "PRE-INSTALL" ]; then
>-echo "===> Pre-install Check"
>+    echo "===> Pre-install Check"
> 
>-#rootfs check
>-root_flag=$(mount | awk '/ on \/ / { print $1 }' | cut -d / -f3-)
>-if [ "$root_flag" != "" ]; then
>-   fs_test=$(glabel status | awk '{print $1}' | grep $root_flag)
>-   if [ "$fs_test" == "" ]; then
>-      echo " xxx rootfs Label/gptid missing in fstab"  
>-   fi
>-else 
>-   echo " xxx rootfs Label/gptid missing in fstab"
>-fi
>-#swap check
>-[ -f /etc/fstab ] && swap_flag=$(grep swap /etc/fstab | awk '{print $1}' | cut -d / -f3-)
>-if [ "$swap_flag" != "" ]; then
>-   sw_test=$(glabel status | awk '{print $1}' | grep $swap_flag)
>-   if [ "$sw_test" == "" ]; then
>-      echo " xxx swap Label/gptid missing in fstab"  
>-   fi
>-else   
>-   echo " xxx swap Label/gptid missing in fstab "
>-fi
>+    #rootfs check
>+    root_flag=$(mount | awk '/ on \/ / { print $1 }' | cut -d / -f3-)
>+    if [ "$root_flag" != "" ]; then
>+        fs_test=$(glabel status | awk '{print $1}' | grep $root_flag)
>+        if [ "$fs_test" == "" ]; then
>+            echo " xxx rootfs Label/gptid missing in fstab"  
>+        fi
>+    else 
>+        echo " xxx rootfs Label/gptid missing in fstab"
>+    fi
> 
>-if [ "$fs_test" != "" -a  "$sw_test" != "" ]; then
>-   echo "===> Labels/gptids Found"
>-   echo "===> Hyper-V BIS Installation Continues"
>-else
>-   echo "===> Labels/gptids Not found"
>-   echo "===> Hyper-V BIS Installation Aborted"
>-   echo "===> Refer to Disk UUID section in README document"
>-   echo "===> Please refer the Prerequisites page and complete all steps" 
>-   echo "WWW: https://github.com/FreeBSDonHyper-V/Hyperv-Ports/wiki/Prerequisites " 
>-   exit 1 
>-fi
>+    #swap check
>+    [ -f /etc/fstab ] && swap_flag=$(grep swap /etc/fstab | awk '{print $1}' | cut -d / -f3-)
>+    if [ "$swap_flag" != "" ]; then
>+        sw_test=$(glabel status | awk '{print $1}' | grep $swap_flag)
>+    fi
>+    if [ "$sw_test" == "" ]; then
>+         echo " xxx swap Label/gptid missing in fstab"  
>+    else   
>+        echo " xxx swap Label/gptid missing in fstab "
>+    fi
>+
>+    if [ "$fs_test" != "" -a  "$sw_test" != "" ]; then
>+        echo "===> Labels/gptids Found"
>+        echo "===> Hyper-V BIS Installation Continues"
>+    else
>+        if [ $version != "10.1-RELEASE" ]; then
>+           echo "version is $version"
>+           echo "===> Labels/gptids Not found"
>+           echo "===> Hyper-V BIS Installation Aborted"
>+           echo "===> Refer to Disk UUID section in README document"
>+           echo "===> Please refer the Prerequisites page and complete all steps" 
>+           echo "WWW: https://github.com/FreeBSDonHyper-V/Hyperv-Ports/wiki/Prerequisites " 
>+           exit 1 
>+        fi
>+    fi
>+    
>+    kvp_dir="/var/db/hyperv/"
>+    kvp_dir_scripts="/var/db/hyperv/scripts"
>+    if [ -d $kvp_dir ]; then
>+        if [ -d $kvp_dir_scripts ]; then
>+            echo " KVP Directories present "
>+        else
>+            mkdir /var/db/hyperv/scripts
>+        fi
>+    else
>+        mkdir /var/db/hyperv
>+        mkdir /var/db/hyperv/scripts
>+    fi
> fi
> exit 0
>diff -urp hyperv-is/pkg-plist hyperv-is_ok/pkg-plist
>--- hyperv-is/pkg-plist	2014-10-08 04:27:29.000000000 +0800
>+++ hyperv-is_ok/pkg-plist	2014-12-22 16:46:17.000000000 +0800
>@@ -1,17 +1,27 @@
>-hyperv/scripts/hv_get_dhcp_info
>-hyperv/scripts/hv_get_dns_info
>-hyperv/scripts/hv_set_ifconfig
>+%%C%%/var/db/hyperv/scripts/hv_get_dhcp_info
>+%%C%%/var/db/hyperv/scripts/hv_get_dns_info
>+%%C%%/var/db/hyperv/scripts/hv_set_ifconfig
>+%%A%%hyperv/scripts/hv_get_dhcp_info
>+%%A%%hyperv/scripts/hv_get_dns_info
>+%%A%%hyperv/scripts/hv_set_ifconfig
>+%%B%%hyperv/scripts/hv_get_dhcp_info
>+%%B%%hyperv/scripts/hv_get_dns_info
>+%%B%%hyperv/scripts/hv_set_ifconfig
> %%A%%/boot/modules/hv_ata_pci_disengage.ko
> %%A%%/boot/modules/hv_netvsc.ko
> %%A%%/boot/modules/hv_storvsc.ko
> %%A%%/boot/modules/hv_utils.ko
> %%A%%/boot/modules/hv_vmbus.ko
> %%B%%/boot/modules/hv_kvp.ko
>-etc/rc.d/hv_kvpd
>+%%C%%/boot/kernel/hv_storvsc_port.ko
>+%%C%%/boot/kernel/hv_utils_port.ko
>+%%A%%etc/rc.d/hv_kvpd
>+%%B%%etc/rc.d/hv_kvpd
> %%B%%sbin/hv_kvp_daemon
>+%%C%%sbin/hv_kvp_daemon
> %%A%%man/man1/hyperv-is.1.gz
> %%A%%man/man4/hv_ata_pci_disengage.4.gz
>-man/man4/hv_kvp.4.gz
>+%%A%%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

Actions: View | Diff

Attachments on bug 196185: 150893 | 150894 | 151525