svn commit: r324552 - in head/sys/boot: . userboot userboot/libstand userboot/userboot

[Warner Losh]

Author: imp
Date: Thu Oct 12 14:56:42 2017
New Revision: 324552
URL: https://svnweb.freebsd.org/changeset/base/324552

Log:
  Kill the userboot copy of libstand.
  
  It's not needed (it's now identical to libsa, and seems to have been
  for some time).
  
  Sponsored by: Netflix

Deleted:
  head/sys/boot/userboot/libstand/Makefile
  head/sys/boot/userboot/libstand/Makefile.depend
Modified:
  head/sys/boot/Makefile.inc
  head/sys/boot/userboot/Makefile
  head/sys/boot/userboot/userboot/Makefile

Modified: head/sys/boot/Makefile.inc
==============================================================================
--- head/sys/boot/Makefile.inc	Thu Oct 12 14:56:28 2017	(r324551)
+++ head/sys/boot/Makefile.inc	Thu Oct 12 14:56:42 2017	(r324552)
@@ -10,8 +10,6 @@ SASRC=${SRCTOP}/lib/libstand
 LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a
 # Standalone library compiled for 32-bit version of the processor
 LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
-# Standalone library compiled for userboot
-LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a
 
 CFLAGS+=-I${SASRC}
 

Modified: head/sys/boot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/Makefile	Thu Oct 12 14:56:28 2017	(r324551)
+++ head/sys/boot/userboot/Makefile	Thu Oct 12 14:56:42 2017	(r324552)
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=		ficl libstand test zfs userboot
+SUBDIR=		ficl test zfs userboot
 
 .include <bsd.subdir.mk>
 

Modified: head/sys/boot/userboot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/userboot/Makefile	Thu Oct 12 14:56:28 2017	(r324551)
+++ head/sys/boot/userboot/userboot/Makefile	Thu Oct 12 14:56:42 2017	(r324552)
@@ -58,7 +58,7 @@ LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSAU} 
-LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSAU}
+DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA} 
+LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
 
 .include <bsd.lib.mk>