From owner-svn-src-all@freebsd.org  Mon Feb  8 16:59:53 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3D99AA0DAD;
 Mon,  8 Feb 2016 16:59:53 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B46581CD;
 Mon,  8 Feb 2016 16:59:53 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u18Gxqu5058895;
 Mon, 8 Feb 2016 16:59:52 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u18Gxq6T058893;
 Mon, 8 Feb 2016 16:59:52 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201602081659.u18Gxq6T058893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 8 Feb 2016 16:59:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295398 - in head: sys/boot/i386
 targets/pseudo/userland/misc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2016 16:59:54 -0000

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 \