From owner-svn-src-stable@freebsd.org Wed Feb 28 18:31:37 2018 Return-Path: Delivered-To: svn-src-stable@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 06F44F3B523; Wed, 28 Feb 2018 18:31:37 +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 A311686760; Wed, 28 Feb 2018 18:31:36 +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 827011D2F8; Wed, 28 Feb 2018 18:31:36 +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 w1SIVaH3072726; Wed, 28 Feb 2018 18:31:36 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1SIVZHF072718; Wed, 28 Feb 2018 18:31:35 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802281831.w1SIVZHF072718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 28 Feb 2018 18:31:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r330123 - in stable/11/stand: . arm efi i386 mips powerpc sparc64 X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/stand: . arm efi i386 mips powerpc sparc64 X-SVN-Commit-Revision: 330123 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 18:31:37 -0000 Author: kevans Date: Wed Feb 28 18:31:35 2018 New Revision: 330123 URL: https://svnweb.freebsd.org/changeset/base/330123 Log: MFC r330004: Add NO_OBJ to those directories that don't make anything. For directories that don't many anything, add NO_OBJ=t just before we include bsd.init.mk. This prevents them from creating an OBJ directory. In addition, prevent defs.mk from creating the machine related links in these cases. They aren't needed and break, at least on stable, the read-only src tree build. PR: 226074 Modified: stable/11/stand/Makefile.i386 stable/11/stand/arm/Makefile stable/11/stand/defs.mk stable/11/stand/efi/Makefile stable/11/stand/i386/Makefile stable/11/stand/mips/Makefile stable/11/stand/powerpc/Makefile stable/11/stand/sparc64/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/Makefile.i386 ============================================================================== --- stable/11/stand/Makefile.i386 Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/Makefile.i386 Wed Feb 28 18:31:35 2018 (r330123) @@ -6,5 +6,3 @@ SUBDIR+= geli .if ${MK_ZFS} != "no" SUBDIR+= zfs .endif - -SUBDIR+= efi Modified: stable/11/stand/arm/Makefile ============================================================================== --- stable/11/stand/arm/Makefile Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/arm/Makefile Wed Feb 28 18:31:35 2018 (r330123) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + SUBDIR= uboot .include Modified: stable/11/stand/defs.mk ============================================================================== --- stable/11/stand/defs.mk Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/defs.mk Wed Feb 28 18:31:35 2018 (r330123) @@ -149,6 +149,7 @@ CLEANFILES+=${_ILINKS} all: ${PROG} +.if !defined(NO_OBJ) beforedepend: ${_ILINKS} beforebuild: ${_ILINKS} @@ -176,5 +177,5 @@ ${_ILINKS}: path=`(cd $$path && /bin/pwd)` ; \ ${ECHO} ${.TARGET:T} "->" $$path ; \ ln -fhs $$path ${.TARGET:T} - +.endif .endif # __BOOT_DEFS_MK__ Modified: stable/11/stand/efi/Makefile ============================================================================== --- stable/11/stand/efi/Makefile Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/efi/Makefile Wed Feb 28 18:31:35 2018 (r330123) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer Modified: stable/11/stand/i386/Makefile ============================================================================== --- stable/11/stand/i386/Makefile Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/i386/Makefile Wed Feb 28 18:31:35 2018 (r330123) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ Modified: stable/11/stand/mips/Makefile ============================================================================== --- stable/11/stand/mips/Makefile Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/mips/Makefile Wed Feb 28 18:31:35 2018 (r330123) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + SUBDIR= uboot # Modified: stable/11/stand/powerpc/Makefile ============================================================================== --- stable/11/stand/powerpc/Makefile Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/powerpc/Makefile Wed Feb 28 18:31:35 2018 (r330123) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include SUBDIR= boot1.chrp ofw uboot Modified: stable/11/stand/sparc64/Makefile ============================================================================== --- stable/11/stand/sparc64/Makefile Wed Feb 28 17:20:10 2018 (r330122) +++ stable/11/stand/sparc64/Makefile Wed Feb 28 18:31:35 2018 (r330123) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include SUBDIR= boot1 loader