svn commit: r465359 - in head/sysutils/cpupdate: . files

[Eugene Grosbein]

Author: eugen
Date: Fri Mar 23 14:12:05 2018
New Revision: 465359
URL: https://svnweb.freebsd.org/changeset/ports/465359

Log:
  sysutils/cpupdate: new convenience target "install-microcodes"
  
  Some users may prefer copying the whole bunch of CPU microcodes
  to their system instead of just needed one. Add new Makefile target
  "install-microcodes" to ease such copying and mention it in the pkg-message.
  
  This is still for convenience only and those blobs do not get into
  the pkg-plist and the package and need to be manually removed
  if not needed anymore.
  
  PR:		226620

Modified:
  head/sysutils/cpupdate/Makefile
  head/sysutils/cpupdate/files/pkg-message.in

Modified: head/sysutils/cpupdate/Makefile
==============================================================================
--- head/sysutils/cpupdate/Makefile	Fri Mar 23 13:57:03 2018	(r465358)
+++ head/sysutils/cpupdate/Makefile	Fri Mar 23 14:12:05 2018	(r465359)
@@ -30,18 +30,20 @@ CPM_ACCOUNT=	platomav
 CPM_PROJECT=	CPUMicrocodes
 CPM_TAGNAME=	a0371d6
 
-OPTIONS_DEFINE=	CPM INTEL
-CPM_DESC=	Download platomav/CPUMicrocodes collection
-CPM_GH_ACCOUNT=	${CPM_ACCOUNT}:cpm
-CPM_GH_PROJECT=	${CPM_PROJECT}:cpm
-CPM_GH_TAGNAME=	${CPM_TAGNAME}:cpm
-CPM_DIR=${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME}
+OPTIONS_DEFINE=		CPM INTEL
+CPM_DESC=		Download platomav/CPUMicrocodes collection
+CPM_GH_ACCOUNT=		${CPM_ACCOUNT}:cpm
+CPM_GH_PROJECT=		${CPM_PROJECT}:cpm
+CPM_GH_TAGNAME=		${CPM_TAGNAME}:cpm
+CPM_DIR=		${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME}
+CPM_DATADIR=		${DATADIR}/CPUMicrocodes/secondary/Intel
 
 INTEL_PACK=		microcode-20180312.tgz
 INTEL_DESC=		Download Intel microcode pack ${INTEL_PACK}
 INTEL_MASTER_SITES=	https://downloadmirror.intel.com/27591/eng/:intel
 INTEL_DISTFILES=	${INTEL_PACK}:intel
 INTEL_DIR=		${WRKDIR}/intel-ucode
+INTEL_DATADIR=		${DATADIR}/CPUMicrocodes/primary/Intel
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/local/share/cpupdate,${DATADIR},g" ${WRKSRC}/cpupdate.h
@@ -49,5 +51,29 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
+
+.include <bsd.port.options.mk>
+
+install-microcodes:
+.if ${PORT_OPTIONS:MINTEL}
+	${RM} -rf ${INTEL_DATADIR}
+	${MKDIR} ${INTEL_DATADIR}
+	(cd ${INTEL_DIR} && ${COPYTREE_SHARE} . ${INTEL_DATADIR})
+.endif
+.if ${PORT_OPTIONS:MCPM}
+	${RM} -rf ${CPM_DATADIR}
+	${MKDIR} ${CPM_DATADIR}
+	(cpupdate -IC -S ${CPM_DIR}/Intel -T ${CPM_DATADIR})
+.endif
+.for _o in INTEL CPM
+.if ${PORT_OPTIONS:M${_o}}
+	@${ECHO} ''
+	@${ECHO} '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+	@${ECHO} NOTE: you have to manually remove the directory
+	@${ECHO} ${${_o}_DATADIR}
+	@${ECHO} after deinstallation of ${PORTNAME}.
+	@${ECHO} '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+.endif
+.endfor
 
 .include <bsd.port.mk>

Modified: head/sysutils/cpupdate/files/pkg-message.in
==============================================================================
--- head/sysutils/cpupdate/files/pkg-message.in	Fri Mar 23 13:57:03 2018	(r465358)
+++ head/sysutils/cpupdate/files/pkg-message.in	Fri Mar 23 14:12:05 2018	(r465359)
@@ -5,5 +5,8 @@ NOTE: The following directories
 %%INTEL_DIR%%
 
 contain Intel and/or platomav/CPUMicrocodes collections respectively
-if you have just built the port with corresponding CPM/INTEL option(s) enabled
+if you have just built the port with corresponding CPM/INTEL option(s) enabled.
+In this case you can run "make install-microcodes" to install them to
+
+%%DATADIR%%
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!