From owner-svn-src-stable@freebsd.org Thu Jan 7 21:21:30 2016 Return-Path: Delivered-To: svn-src-stable@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 A7D1FA67670 for ; Thu, 7 Jan 2016 21:21:30 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4194413D3 for ; Thu, 7 Jan 2016 21:21:30 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x22e.google.com with SMTP id f206so113885566wmf.0 for ; Thu, 07 Jan 2016 13:21:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=EaX0bUrG1wYDxmbyKCC5rH5s6dBn5cjijEk6Czm1pQI=; b=lWqyfmbPz5mGLr6GLk1VlQCC0eNIEgHePPVl2LOgVy0Rsw3aG7P6byk46pefa8sZ2g sujYz7H+I/9j6PjeZvxQBP/5+8fDLGcPilvHZPkkzS5SuWhvqFkhYnOl20SXTJKjqcgq oWjiEdy8TKNAJL0mi9HNGwRnvbUIoYMejZdZYxTQ5LTqrCCP5C2uO7g5ESAJOt/xwEdd SBCGyZYFQce6fnUno73jBkvjsgG6D9XnmVJ7o7AmXPg2qMOKP7I6nQ0brGHMa8Stddhq v30n+UxsQw0g4kJETx2x8TR1A2zy20ubsagYiHi2VWGUz37z4AE0nf1O+DlS2bNOzRuD Joow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=EaX0bUrG1wYDxmbyKCC5rH5s6dBn5cjijEk6Czm1pQI=; b=eYJOajj5vykvvDa0CTHX2AMCj2oNODCfPC2Y+vHrd/+cv+11sJmMoDAnSaha0dciJs wRWT5RL3/gzrDjUMFE+qJDvhzZ4rV4puzB+BwrB8aBXguwGusDyB1jnZoDMIxGqV//Lj dZMhuZgSYimQ/0Avqs5XNd2eOF4WeqUMUHFajBX68VWNki/Dq+bIEqYerjYIUTwv63I8 9rX04hhWs/8wqoW95QFoSExjigSRdqG/P/iKB6KGOl165di2wji0ReSy8CTU1JJNxGe1 /6Yc3FOFoK9a8sdHKocDXZT1EdJnLdg9JhSl/N1gMDJ5FcIBZnTuzsbhYZiIb4MrKy5o Tu2Q== X-Gm-Message-State: ALoCoQkD65CaIGAf7zPx/30gsyWiyursDuQeWzexCB4DeOKd67RfKONiPmkU3mchixF81m0Il7ivn21FE686wPFCMBwoNofb8Gogjbi9xdaDrvArvfkxhUE= MIME-Version: 1.0 X-Received: by 10.194.171.66 with SMTP id as2mr15027455wjc.73.1452201688562; Thu, 07 Jan 2016 13:21:28 -0800 (PST) Received: by 10.194.85.167 with HTTP; Thu, 7 Jan 2016 13:21:28 -0800 (PST) In-Reply-To: <201601072034.u07KY64m034867@repo.freebsd.org> References: <201601072034.u07KY64m034867@repo.freebsd.org> Date: Thu, 7 Jan 2016 22:21:28 +0100 Message-ID: Subject: Re: svn commit: r293353 - stable/10/sys/boot From: Oliver Pinter To: Ed Maste Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 07 Jan 2016 21:21:30 -0000 On Thu, Jan 7, 2016 at 9:34 PM, Ed Maste wrote: > Author: emaste > Date: Thu Jan 7 20:34:06 2016 > New Revision: 293353 > URL: https://svnweb.freebsd.org/changeset/base/293353 > > Log: > MFC r280808 by andrew: Reorder sys/boot/Makefile for the efi loader move Thanks Ed! This commit is the real fix, and not the previous one what I mentioned. > > As these will depend on ficl having been built, and are set via > bsd.arch.inc.mk we need to place this after ficl. > > As Makefile.amd64 is now late enough we can add the i386 directory to > this. > > Modified: > stable/10/sys/boot/Makefile > stable/10/sys/boot/Makefile.amd64 > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sys/boot/Makefile > ============================================================================== > --- stable/10/sys/boot/Makefile Thu Jan 7 20:32:04 2016 (r293352) > +++ stable/10/sys/boot/Makefile Thu Jan 7 20:34:06 2016 (r293353) > @@ -1,7 +1,6 @@ > # $FreeBSD$ > > .include > -.include > > .if ${MK_FORTH} != "no" > # Build the add-in FORTH interpreter. > @@ -9,13 +8,12 @@ SUBDIR+= ficl > SUBDIR+= forth > .endif > > +.include > + > # Pick the machine-dependent subdir based on the target architecture. > ADIR= ${MACHINE:S/powerpc64/powerpc/} > .if exists(${.CURDIR}/${ADIR}/.) > SUBDIR+= ${ADIR} > .endif > -.if ${MACHINE} == "amd64" > -SUBDIR+= i386 > -.endif > > .include > > Modified: stable/10/sys/boot/Makefile.amd64 > ============================================================================== > --- stable/10/sys/boot/Makefile.amd64 Thu Jan 7 20:32:04 2016 (r293352) > +++ stable/10/sys/boot/Makefile.amd64 Thu Jan 7 20:34:06 2016 (r293353) > @@ -8,3 +8,5 @@ SUBDIR+= userboot > .if ${MK_FORTH} != "no" > SUBDIR+= ficl32 > .endif > + > +SUBDIR+= i386 > _______________________________________________ > svn-src-stable-10@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 > To unsubscribe, send any mail to "svn-src-stable-10-unsubscribe@freebsd.org"