From owner-svn-src-all@FreeBSD.ORG Fri Jun 19 05:42:26 2015 Return-Path: Delivered-To: svn-src-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 744C7E5A; Fri, 19 Jun 2015 05:42:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4A538C5A; Fri, 19 Jun 2015 05:42:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5J5gQKx007775; Fri, 19 Jun 2015 05:42:26 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5J5gPeY007771; Fri, 19 Jun 2015 05:42:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506190542.t5J5gPeY007771@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 19 Jun 2015 05:42:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284590 - in head/sys/boot: . common i386/loader 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2015 05:42:26 -0000 Author: bapt Date: Fri Jun 19 05:42:24 2015 New Revision: 284590 URL: https://svnweb.freebsd.org/changeset/base/284590 Log: Install loader(8) and zfsloader(8) only once Differential Revision: https://reviews.freebsd.org/D2841 Reviewed by: imp Added: head/sys/boot/common/Makefile (contents, props changed) Modified: head/sys/boot/Makefile head/sys/boot/common/Makefile.inc head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/Makefile ============================================================================== --- head/sys/boot/Makefile Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -8,6 +8,8 @@ SUBDIR+= ficl SUBDIR+= forth .endif +SUBDIR+= common + .include # Pick the machine-dependent subdir based on the target architecture. Added: head/sys/boot/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/common/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +MAN+= loader.8 +.if ${MK_ZFS} != "no" +MAN+= zfsloader.8 +.endif + +.include Modified: head/sys/boot/common/Makefile.inc ============================================================================== --- head/sys/boot/common/Makefile.inc Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/common/Makefile.inc Fri Jun 19 05:42:24 2015 (r284590) @@ -68,8 +68,3 @@ CFLAGS+= -DBOOT_PROMPT_123 SRCS+= install.c CFLAGS+=-I${.CURDIR}/../../../../lib/libstand .endif - -MAN+= loader.8 -.if ${MK_ZFS} != "no" -MAN+= zfsloader.8 -.endif Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/i386/loader/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -5,6 +5,7 @@ MK_SSP= no LOADER?= loader PROG= ${LOADER}.sym +MAN= INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86