From owner-svn-src-head@freebsd.org Thu Mar 1 21:46:02 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46949F2CD99; Thu, 1 Mar 2018 21:46:02 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E8C377BB7C; Thu, 1 Mar 2018 21:46:01 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3EA96A72; Thu, 1 Mar 2018 21:46:01 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21Lk1DI018406; Thu, 1 Mar 2018 21:46:01 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21Lk1ZE018401; Thu, 1 Mar 2018 21:46:01 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803012146.w21Lk1ZE018401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 1 Mar 2018 21:46:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330250 - in head/stand: efi i386 powerpc sparc64 uboot X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/stand: efi i386 powerpc sparc64 uboot X-SVN-Commit-Revision: 330250 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Mar 2018 21:46:02 -0000 Author: kevans Date: Thu Mar 1 21:46:01 2018 New Revision: 330250 URL: https://svnweb.freebsd.org/changeset/base/330250 Log: stand: Fix build after r330249 One does not simply convert to SUBDIR.yes in stand without making everything else in the affected files SUBDIR.yes -- there are better ways to do this. Modified: head/stand/efi/Makefile head/stand/i386/Makefile head/stand/powerpc/Makefile head/stand/sparc64/Makefile head/stand/uboot/Makefile Modified: head/stand/efi/Makefile ============================================================================== --- head/stand/efi/Makefile Thu Mar 1 19:59:49 2018 (r330249) +++ head/stand/efi/Makefile Thu Mar 1 21:46:01 2018 (r330250) @@ -9,7 +9,7 @@ NO_OBJ=t .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 SUBDIR.${MK_FDT}+= fdt -SUBDIR+= libefi loader boot1 +SUBDIR.yes+= libefi loader boot1 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 Modified: head/stand/i386/Makefile ============================================================================== --- head/stand/i386/Makefile Thu Mar 1 19:59:49 2018 (r330249) +++ head/stand/i386/Makefile Thu Mar 1 21:46:01 2018 (r330250) @@ -4,18 +4,18 @@ NO_OBJ=t .include -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ +SUBDIR.yes= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ libi386 SUBDIR.${MK_LOADER_FIREWIRE}+= libfirewire -SUBDIR+= loader +SUBDIR.yes+= loader # special boot programs, 'self-extracting boot2+loader' -SUBDIR+= pxeldr +SUBDIR.yes+= pxeldr .if ${MACHINE_CPUARCH} == "i386" -SUBDIR+= kgzldr +SUBDIR.yes+= kgzldr .endif SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader Modified: head/stand/powerpc/Makefile ============================================================================== --- head/stand/powerpc/Makefile Thu Mar 1 19:59:49 2018 (r330249) +++ head/stand/powerpc/Makefile Thu Mar 1 21:46:01 2018 (r330250) @@ -4,7 +4,7 @@ NO_OBJ=t .include -SUBDIR= boot1.chrp ofw uboot +SUBDIR.yes= boot1.chrp ofw uboot SUBDIR.${MK_FDT}+= kboot .include Modified: head/stand/sparc64/Makefile ============================================================================== --- head/stand/sparc64/Makefile Thu Mar 1 19:59:49 2018 (r330249) +++ head/stand/sparc64/Makefile Thu Mar 1 21:46:01 2018 (r330250) @@ -4,7 +4,7 @@ NO_OBJ=t .include -SUBDIR= boot1 loader +SUBDIR.yes= boot1 loader SUBDIR.${MK_ZFS}+=zfsboot zfsloader .include Modified: head/stand/uboot/Makefile ============================================================================== --- head/stand/uboot/Makefile Thu Mar 1 19:59:49 2018 (r330249) +++ head/stand/uboot/Makefile Thu Mar 1 21:46:01 2018 (r330250) @@ -2,7 +2,7 @@ .include -SUBDIR= lib +SUBDIR.yes= lib SUBDIR.${MK_FDT}+=fdt