svn commit: r295398 - in head: sys/boot/i386 targets/pseudo/userland/misc

[Ed Maste]

Author: emaste
Date: Mon Feb  8 16:59:52 2016
New Revision: 295398
URL: https://svnweb.freebsd.org/changeset/base/295398

Log:
  Restore kgzldr on i386 only
  
  I previously disconnected kgzdr based on a misunderstanding.
  
  I'd still like to transition to supporting only the loader(8)-based
  boot path for handling compressed kernels, but that can follow the
  standard deprecation procedure.
  
  This reverts r291113.
  
  Requested by:	dteske

Modified:
  head/sys/boot/i386/Makefile
  head/targets/pseudo/userland/misc/Makefile.depend

Modified: head/sys/boot/i386/Makefile
==============================================================================
--- head/sys/boot/i386/Makefile	Mon Feb  8 16:34:13 2016	(r295397)
+++ head/sys/boot/i386/Makefile	Mon Feb  8 16:59:52 2016	(r295398)
@@ -8,6 +8,10 @@ SUBDIR=		mbr pmbr boot0 boot0sio btx boo
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
 
+.if ${MACHINE_CPUARCH} == "i386"
+SUBDIR+=	kgzldr
+.endif
+
 .if ${MK_ZFS} != "no"
 SUBDIR+=	zfsboot gptzfsboot zfsloader
 .endif

Modified: head/targets/pseudo/userland/misc/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/misc/Makefile.depend	Mon Feb  8 16:34:13 2016	(r295397)
+++ head/targets/pseudo/userland/misc/Makefile.depend	Mon Feb  8 16:59:52 2016	(r295398)
@@ -40,6 +40,7 @@ DIRDEPS.x86sys= \
 	sys/boot/i386/btx/lib \
 	sys/boot/i386/cdboot \
 	sys/boot/i386/gptboot \
+	sys/boot/i386/kgzldr \
 	sys/boot/i386/libfirewire \
 	sys/boot/i386/libi386 \
 	sys/boot/i386/loader \