Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Nov 2016 05:52:29 +0000 (UTC)
From:      Dexuan Cui <dexuan@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r309082 - in head: . share/man/man4
Message-ID:  <201611240552.uAO5qTxK063974@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dexuan
Date: Thu Nov 24 05:52:28 2016
New Revision: 309082
URL: https://svnweb.freebsd.org/changeset/base/309082

Log:
  share/man/man4/Makefile: Only install Hyper-V man pages on amd64 and i386
  
  We shouldn't install them on the architectures not supported by Hyper-V.
  
  And, hv_ata_pci_disengage.4.gz should be removed from all architectures:
  1) It should have only applied to Hyper-V;
  2) For Hyper-V platforms (amd64 and i386), the related driver was removed by
  r306426 | sephe | 2016-09-29 09:41:52 +0800 (Thu, 29 Sep 2016),
  because now we have a better mechanism to disble the ata driver for hard
  disks when the VM runs on Hyper-V.
  
  Reviewed by:	sephe, andrew, jhb
  Approved by:	sephe (mentor)
  MFC after:	3 days
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D8572

Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Nov 24 05:18:45 2016	(r309081)
+++ head/ObsoleteFiles.inc	Thu Nov 24 05:52:28 2016	(r309082)
@@ -38,6 +38,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161121: Hyper-V manuals only apply to amd64 and i386.
+.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
+OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
+OLD_FILES+=usr/share/man/man4/hv_netvsc.4.gz
+OLD_FILES+=usr/share/man/man4/hv_storvsc.4.gz
+OLD_FILES+=usr/share/man/man4/hv_utils.4.gz
+OLD_FILES+=usr/share/man/man4/hv_vmbus.4.gz
+OLD_FILES+=usr/share/man/man4/hv_vss.4.gz
+.endif
+# 20161118: Remove hv_ata_pci_disengage(4)
+OLD_FILES+=usr/share/man/man4/hv_ata_pci_disengage.4.gz
 # 20161017: urtwn(4) was merged into rtwn(4)
 OLD_FILES+=usr/share/man/man4/urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Thu Nov 24 05:18:45 2016	(r309081)
+++ head/share/man/man4/Makefile	Thu Nov 24 05:52:28 2016	(r309082)
@@ -189,12 +189,12 @@ MAN=	aac.4 \
 	${_hptmv.4} \
 	${_hptnr.4} \
 	${_hptrr.4} \
-	hv_kvp.4 \
-	hv_netvsc.4 \
-	hv_storvsc.4 \
-	hv_utils.4 \
-	hv_vmbus.4 \
-	hv_vss.4 \
+	${_hv_kvp.4} \
+	${_hv_netvsc.4} \
+	${_hv_storvsc.4} \
+	${_hv_utils.4} \
+	${_hv_vmbus.4} \
+	${_hv_vss.4} \
 	hwpmc.4 \
 	ichsmb.4 \
 	${_ichwd.4} \
@@ -784,6 +784,12 @@ _hptiop.4=	hptiop.4
 _hptmv.4=	hptmv.4
 _hptnr.4=	hptnr.4
 _hptrr.4=	hptrr.4
+_hv_kvp.4=	hv_kvp.4
+_hv_netvsc.4=	hv_netvsc.4
+_hv_storvsc.4=	hv_storvsc.4
+_hv_utils.4=	hv_utils.4
+_hv_vmbus.4=	hv_vmbus.4
+_hv_vss.4=	hv_vss.4
 _i8254.4=	i8254.4
 _ichwd.4=	ichwd.4
 _if_bxe.4=	if_bxe.4



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611240552.uAO5qTxK063974>