From owner-svn-src-all@FreeBSD.ORG Tue Sep 4 23:31:07 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D26631065676; Tue, 4 Sep 2012 23:31:07 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx1.freebsd.org (Postfix) with ESMTP id 604388FC17; Tue, 4 Sep 2012 23:31:07 +0000 (UTC) Received: by iebc12 with SMTP id c12so7918049ieb.13 for ; Tue, 04 Sep 2012 16:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=RDwAxZPjZjObtg/sCpjhm4Ge3F5BCxcYn48/rG4qmrs=; b=VPqf7tRIELzfS0DWFixiwKkcvfCvrlY18DIpl3zZZg36lGr+C9aXDOq8jFk3kUBejO /0/KjrlqWmoaRq0T0Ae5F8EZH9XI/Sll6YUmkl6EQc1WYx0Fya24q6oMLhjMF/sOSrBc vl65burK3iPfkDGKfu+5b4aJqQCBbqTdbLAUCU5/EZT0NVj49QDCjUjgd7KGSOQZ4QgM p1LwqUQ5fJiSwSJlkvsuBhacbGrSiLTW2ttHm+Zy57FqKMhdxji3sRbakldCgO0OK7NZ Su9wT8JAKhsZogxj7rsSHYLR7jiPwUyrrzGP3Al0yJ5BNsboPr0H+E2OVmwN7xuhOSWL IKZg== MIME-Version: 1.0 Received: by 10.182.218.37 with SMTP id pd5mr16555938obc.24.1346801466967; Tue, 04 Sep 2012 16:31:06 -0700 (PDT) Received: by 10.76.142.201 with HTTP; Tue, 4 Sep 2012 16:31:06 -0700 (PDT) In-Reply-To: <86fw6xe9br.fsf@ds4.des.no> References: <201208251202.q7PC2EL6034670@svn.freebsd.org> <201209041517.52973.jhb@freebsd.org> <86k3w9e9tx.fsf@ds4.des.no> <86fw6xe9br.fsf@ds4.des.no> Date: Tue, 4 Sep 2012 16:31:06 -0700 Message-ID: From: Garrett Cooper To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Robert Watson , John Baldwin Subject: Re: svn commit: r239679 - head/sys/mips/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 04 Sep 2012 23:31:08 -0000 On Tue, Sep 4, 2012 at 3:01 PM, Dag-Erling Sm=F8rgrav wrote: > Garrett Cooper writes: >> Dag-Erling Sm=F8rgrav writes: >> > It doesn't build the BERI kernels because they're mips64/mips, and >> > it only builds mips/mips. >> Does it sanitize TARGETS and KERNCONFs properly? > > I have no idea what that even means. Answering myself, it should if TARGET isn't explicitly defined to something that the conversion logic wouldn't create collisions for (from .../Makefile in stable/9): 405 KERNCONFS!=3D cd ${KERNSRCDIR}/${TARGET}/conf && \ 406 find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ 407 ! -name DEFAULTS ! -name NOTES 408 universe_kernconfs: 409 .for kernel in ${KERNCONFS} 410 TARGET_ARCH_${kernel}!=3D cd ${KERNSRCDIR}/${TARGET}/conf && \ 411 config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null |= \ 412 grep -v WARNING: | cut -f 2 413 .if empty(TARGET_ARCH_${kernel}) 414 .error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." 415 .endif In particular TARGETS_ARCHS=3Dmips64:mips might not work in all cases, righ= t? $ make -VKERNCONFS TARGET=3Dmips TARGET_ARCH=3Dmips64 tinderbox ADM5120 ALCHEMY AP91 AP93 AP94 AP96 AR71XX_BASE AR724X_BASE AR91XX_BASE BERI_DE4_MDROOT BERI_DE4_SDROOT BERI_SIM_MDROOT BERI_TEMPLATE DIR-825 GXEMUL IDT MALTA MALTA64 OCTEON1 PB47 PB92 QEMU ROUTERSTATION ROUTERSTATION_MFS RSPRO RSPRO_MFS RSPRO_STANDALONE RT305X SENTRY5 SWARM SWARM64 SWARM64_SMP SWARM_SMP TP-WN1043ND XLP XLP64 XLPN32 XLR XLR64 XLRN32 $ make -VKERNCONFS TARGET=3Dmips TARGET_ARCH=3Dmips tinderbox ADM5120 ALCHEMY AP91 AP93 AP94 AP96 AR71XX_BASE AR724X_BASE AR91XX_BASE BERI_DE4_MDROOT BERI_DE4_SDROOT BERI_SIM_MDROOT BERI_TEMPLATE DIR-825 GXEMUL IDT MALTA MALTA64 OCTEON1 PB47 PB92 QEMU ROUTERSTATION ROUTERSTATION_MFS RSPRO RSPRO_MFS RSPRO_STANDALONE RT305X SENTRY5 SWARM SWARM64 SWARM64_SMP SWARM_SMP TP-WN1043ND XLP XLP64 XLPN32 XLR XLR64 XLRN32 You have to explicitly set the machine directive in the KERNCONF in order for it to only compile on one TARGET_ARCH: $ egrep -r 'machine.*64' sys/mips/conf/ sys/mips/conf/XLP64:machine mips mips64 sys/mips/conf/BERI_TEMPLATE:machine mips mips64 sys/mips/conf/GXEMUL:machine mips mips64 sys/mips/conf/XLR64:machine mips mips64 sys/mips/conf/SWARM64:machine mips mips64 sys/mips/conf/SWARM64_SMP:machine mips mips64 sys/mips/conf/MALTA64:machine mips mips64el # Malta supports both, so it isn't in std.malta Thanks! -Garrett PS I think brooks@ is aware of what needs to be fixed and is working on the solution.