From owner-freebsd-arch@freebsd.org Sun Aug 21 21:32:59 2016 Return-Path: Delivered-To: freebsd-arch@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 2285DBC19AF for ; Sun, 21 Aug 2016 21:32:59 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-it0-x230.google.com (mail-it0-x230.google.com [IPv6:2607:f8b0:4001:c0b::230]) (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 D852C1BD8; Sun, 21 Aug 2016 21:32:58 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-it0-x230.google.com with SMTP id e63so73304460ith.1; Sun, 21 Aug 2016 14:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=9pH8WuOFxOvrX/WQ6/vfQ3K0G1Ac256/UtXrEVb21K4=; b=QmDJuGIUwsqv+ncOfXaCW3XQZAbOblJfjmAhNyWjqHmSWsCep9shPdKELQnPeNO9OU 2roQCIpvM91D5UkmrlDniu8ekxN1HT/9jVtv+Nu4J2SLuHZjpCNhy+M+1yiyBSdijVcT KqacZMJsaH2ZMrN25ZsCidBpF2Y/waVQCURdVCp9LNLEWrMkXQ7MoWy5fr1U+cpIngwY u3eUi4ntcTX8dr4D00JN/qmOtNmNA2XKu+0Asd+iXS4L8LJfys7gQII65TDYShFVCnmp 7utaOuBIlGLfjRAssljwjnrGwEzxNbEtnLUfW+uWQSDkkE/DQPNXzOuTupjplaakyqyY Wt2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=9pH8WuOFxOvrX/WQ6/vfQ3K0G1Ac256/UtXrEVb21K4=; b=jx6V93EGD1O6hm/9vIJpL51xv+hzD2m295LUacFvv6Z7BiOSQAxlcgdPs/xMB9jDMi XuofjLQ1ghSQtIh+vJxkY3X7SiQY2qR4hWQMWk5Uj59DBkW9QPu+PC2rkdiD1LPd00jh rS79R0wHE/+uCVEyHecyZ6Tam7VxHdsDVtsgzOFGChKjIlCTS2mSbBsBqlABr/11mdnD Glhvjjo5SKpWtILamDdn87+hCCx/HcUffa+xC8kQ03NU4P71vvTqd3zWkhy1Iyzc5Cqn IcZBkNCk/px3SP0b+ZvO9zc1VLSi9W9wdpkcmH7rOFPFGbMdlNUu4s2wMnayi1AjEJEm LX1w== X-Gm-Message-State: AEkooutcMMdxoggWcI9sy8Webwj9Vy2w71tAnKcDqdIzehFR2+RhvqDYHHMyKzzc2sv3Q3dr+LszuGgF3Wo4Zw== X-Received: by 10.36.212.6 with SMTP id x6mr15983494itg.71.1471815178053; Sun, 21 Aug 2016 14:32:58 -0700 (PDT) MIME-Version: 1.0 Sender: adrian.chadd@gmail.com Received: by 10.36.141.129 with HTTP; Sun, 21 Aug 2016 14:32:57 -0700 (PDT) In-Reply-To: References: <60a8da58-dbd5-dd26-6047-745bcf6a21f4@freebsd.org> <894b4841-166c-422f-9fe8-50ed261d76bb@FreeBSD.org> <1836ae28-b510-06dd-b83f-d08060cf87ac@freebsd.org> <8478b8aa-b8cf-7383-9923-249fced3dac3@FreeBSD.org> <4c28236a-f9ca-4601-336f-0829842b6d1a@freebsd.org> <270be6c4-16f9-3b89-c3b3-5983ec85834f@FreeBSD.org> <68cb112b-9334-045a-d860-7011573a2b47@freebsd.org> <203719a3-a66b-5389-ff52-a20b661f8b9b@freebsd.org> From: Adrian Chadd Date: Sun, 21 Aug 2016 14:32:57 -0700 X-Google-Sender-Auth: R_Ft2zXzdcXYI9fTEmPsYp3CHUQ Message-ID: Subject: Re: metalog -> makefs is broken again in -HEAD To: Sean Bruno , "freebsd-arch@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Aug 2016 21:32:59 -0000 On 21 August 2016 at 14:30, Adrian Chadd wrote: > On 21 August 2016 at 09:11, Sean Bruno wrote: >> Ok, figured a hack for not installing the atheros tools: >> ---------------------------------------------------------------------- >> diff --git a/build/bin/build_freebsd b/build/bin/build_freebsd >> index d7fe4c2..04169b4 100755 >> --- a/build/bin/build_freebsd >> +++ b/build/bin/build_freebsd >> @@ -112,7 +112,7 @@ fi >> >> while [ -n "$1" ]; do >> echo "*** Stage : $1" >> - if [ "$1" = "installworld" ]; then >> + if [ "$1" = "installworld" -a ${X_BUILD_BASE_CFG} = "mips_ap" ]; >> then >> mkdir -p ${X_DESTDIR}/usr/local/bin/ >> mkdir -p ${X_DESTDIR}/bsdbox/ >> mkdir -p ${X_DESTDIR}/usr/local/libdata/athprom/ >> > > This happens because when adding LOCAL_TOOL_DIRS to install the ath > bits, it's installing it in /usr/local/* without doing an install -d > /usr/local/bin , /usr/local/libexec/, etc beforehand. > > I bet doing a "make installworld" without /usr/local/ fully populated > (ie, no ports) won't create the /usr/local/ subdirectories. > >> --------------------------------------------------------------------- >> >> I can't quite see how to fix the last two errors I'm seeing: >> >> *** Target : fullroot >> *** Deleting old file system.. >> install: open /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp: >> No such file or directory >> *** Creating new filesystem... >> **** Done. >> *** Target Done. >> *** Target : fullfsimage >> *** Running makefs to build image .. >> *** from /home/sbruno/bsd/fbsd_head/../mfsroot/malta .. >> makefs: ./boot/kernel.MALTA: missing directory in specification >> makefs: failed at line 26663 of the specification >> > > This happens because the option that sets the kernel directory for the > installworld/installkernel pass (KODIR and KMODDIR) doesn't first do > an install -d /boot/kernel.XXX/, so the metalog entry isn't populated. > > I could write another tool like filter.pl that allows for entries to > be inserted before other entries, so we could say "hey, please > populate /boot/kernel.XXX before you populate /boot/kernel.XXX/YYY", > but I think I'd rather just fix it in -HEAD. > > And another shortcoming is how METALOG is the same for installworld, installkernel, distribution. Ideally we could specify a separate METALOG target for each installkernel target so we could just do one world build and 'n' kernel builds, and then we can just join the pieces together at processing time before we call makefs. Otherwise multiple installkernel passes creates ... some very big METALOG files with stuff you don't need. :) -adrian