From owner-freebsd-arch@freebsd.org Fri Aug 19 21:27:40 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 69242BC0857 for ; Fri, 19 Aug 2016 21:27:40 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-io0-x236.google.com (mail-io0-x236.google.com [IPv6:2607:f8b0:4001:c06::236]) (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 2BEF11CEB; Fri, 19 Aug 2016 21:27:40 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-io0-x236.google.com with SMTP id m101so60519000ioi.2; Fri, 19 Aug 2016 14:27:40 -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:cc; bh=Nbk3JzWzbPfKaJG2uqbrC2KG9oWT6qP+sVA5YK5U8u0=; b=HsObO6Qb6zOzpErygZL/kOZvg8+6LfBPb36FIMZYuRE6Ug3PfiM/anJ2LZtKsFKcTk S6C+yrji6XHwtzoO1ihY/xunFxGpgkR2XFUJAW0H7RQ/GAAeRJaQ/MKDZ6T4yyr8jQMH 5k8BJI7eSAbHq72qjxBNlLaHIsv7flnYHaDl2L+u5iWkCOobq3K/0TCtv2lTz4kZeVIm F2pVFF/EfwyPv+IWGTj0IvJpBgzkq24vEoi7kENz2+X9kUo/QmnXvDrIA3mGh0+D077w vrevQvZnT7oY1J1IEgq0eOUPgy5RjjlyXzD2pIVrrT3Pa+vmWnU1R5+qnwvGCBa4JpKC FUGQ== 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:cc; bh=Nbk3JzWzbPfKaJG2uqbrC2KG9oWT6qP+sVA5YK5U8u0=; b=KSUzFDjzUko9VRlDXqK98QyUBQQcMQ8p7kSOwdOWQw4YCJpoUo0u+JxgtbmZ8K5Gjg dAZWBjlRRZKpC+YkwHed0mtcCp8S1wMKee5GeYny5Dvoz0QymtXDsJHm1BeIkm2vTcYm YTcaw2XdOu5JAxu3BSVmuMPN/bU6PbgExdHLvLUVBUtfoTfH7WUFkL3uwvSfTaeBkfA4 YIT1wDMrkFvcHfD6E+FZvHQTf6UKzsFDZNUDwhCsJcVTsaANfxt3shtIIAphGZImrrNG b4Pq52O+7Heg4u2k8qIFuAALfaQhSrkf/CRP8+0e/bjavd26VNOFEdX/ZKtdNe9UJKgO cxJQ== X-Gm-Message-State: AEkoouvjPmcNZla5YV11+xzZTw0iyF/UmhLCBW6k9r/d6T0uWkjzYxcIU5EWVCkcr7gY7hQhWUlp7bH3uh42vA== X-Received: by 10.107.144.10 with SMTP id s10mr11625535iod.165.1471642059279; Fri, 19 Aug 2016 14:27:39 -0700 (PDT) MIME-Version: 1.0 Sender: adrian.chadd@gmail.com Received: by 10.36.141.129 with HTTP; Fri, 19 Aug 2016 14:27:38 -0700 (PDT) In-Reply-To: <68cb112b-9334-045a-d860-7011573a2b47@freebsd.org> References: <78463d96-4dc3-b9a1-4793-05d6c6a76537@freebsd.org> <8b012527-e76c-060d-be5b-547deca5cb07@FreeBSD.org> <01069203-3566-12f7-993b-10e8e43be1ac@freebsd.org> <0dbec794-9dc2-4e72-6114-1e4b0968dae5@FreeBSD.org> <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> From: Adrian Chadd Date: Fri, 19 Aug 2016 14:27:38 -0700 X-Google-Sender-Auth: mVNuLmI-hse-RxLEfZQPDEobab0 Message-ID: Subject: Re: metalog -> makefs is broken again in -HEAD To: Sean Bruno Cc: "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: Fri, 19 Aug 2016 21:27:40 -0000 hi, ok, so here's the hilarity. We don't really have tools for consistently manipulating metalog/manifest files. So, in order to do things like add/delete/modify things in the manifest file, we need to do some .. hackery. So that's what filter.pl does. It takes in the metalog file and does a replace or append. It currently doesn't have a "delete" method. the .tmp file is "the extra files that we add /after/ the system installs". Ie, it's the customisations done. It goes through filter.pl and then the resultant metalog file has the complete thing that's going into the image. When I get around to adding package support for mips (not mips_ap) then it'll also have a second intermediary metalog file that has the combination of all of the package installs, so makefs knows what to do. Ok, so for metalog versus manifest. I remember doing it one way and then brooks saying "Don't do that, here's the bugs". I'll have to go over that and see. Thanks, -adrian On 19 August 2016 at 13:34, Sean Bruno wrote: > > > On 08/19/16 14:19, Sean Bruno wrote: >>>> Hrm ... I added a "ls -ld" to the script immediately preceding the >>>> install directive, it appears to be there. >>>> >>>> >>>> >>>> + INSTALL_PROG='install -U -M >>>> /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp -D >>>> /home/sbruno/bsd/fbsd_head/../mfsroot/malta' >>>> + echo '*** Deleting old file system..' >>>> *** Deleting old file system.. >>>> + ls -ld /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp >>>> -rw-r--r-- 1 sbruno sbruno 203 Aug 19 13:45 >>>> /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp >>>> + install -U -M /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp >>>> -D /home/sbruno/bsd/fbsd_head/../mfsroot/malta -d >>>> /home/sbruno/bsd/fbsd_head/../mfsroot/malta >>> >>> There seems to be no error now? >> >> Yeah, this looks like a error in the scripts. Cleaned and removed the >> mfsroot dir, and the "ls -ld" and the install error appear to be in >> correspondence. >> >> + INSTALL_PROG='install -U -M >> /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp -D >> /home/sbruno/bsd/fbsd_head/../mfsroot/malta' >> + echo '*** Deleting old file system..' >> *** Deleting old file system.. >> + ls -ld /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp >> ls: /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp: No such >> file or directory >> + install -U -M /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp >> -D /home/sbruno/bsd/fbsd_head/../mfsroot/malta -d >> /home/sbruno/bsd/fbsd_head/../mfsroot/malta >> install: open /home/sbruno/bsd/fbsd_head/../mfsroot/METALOG.malta.tmp: >> No such file or directory >> + chflags -R noschg /home/sbruno/bsd/fbsd_head/../mfsroot/malta >> + rm -rf /home/sbruno/bsd/fbsd_head/../mfsroot/malta >> + rm -rf /home/sbruno/bsd/fbsd_head/../tmp/malta >> + echo '*** Creating new filesystem...' >> >> > > adrian: > > Hmmm ... what should the METALOG.malta.tmp file contain at this point, > it looks like only a fewlines once its created, which doesn't happen at > this point. > > ./etc//fstab type=file uname=root gname=wheel mode=0644 size=23 > ./etc//rc.conf type=file uname=root gname=wheel mode=0644 size=68 > ./etc/rc.d//autosize type=file uname=root gname=wheel mode=0755 size=653 > . type=dir mode=0755 > >