From owner-svn-src-head@freebsd.org Wed Nov 7 22:56:44 2018 Return-Path: Delivered-To: svn-src-head@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 6190311310D5 for ; Wed, 7 Nov 2018 22:56:44 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw1-xc2f.google.com (mail-yw1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 736F37D48A for ; Wed, 7 Nov 2018 22:56:43 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw1-xc2f.google.com with SMTP id c126-v6so7276311ywd.8 for ; Wed, 07 Nov 2018 14:56:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=LGL4x6dkIdgJZOkDHkmFJxEgR3EfxdT6D9M0NZ47Uu0=; b=gotq5iHa1bYAxllf8KNqr1JjfwPYGZtnYLDZmvV9p9ZYQz4HjQ9wATmvNFkb68TJX+ wxgN3ERcmwhR6OfYoCwl99KLfGOt6C3WrJB5fUfdZkdWPD1+lw6Q92sz7WM0D+pxpz65 9EeZ6nFmmCcaA2FE5Ph6WtDwJ5NjXmJHZIl9LRyjmV84u+TVHHC79H+9OHQPyuo1ob8O kRc5Ap1qzCk+nIofwlgSPDW74wfPrGrzgv+Z/6YkPgGNEvDWr/YaSl2D/pxs+qKNPkw8 5+3ZMv50PIWwOX+Yz1dNDQN1IFhY7sdZdcqmAo06XyPPppVq5d62ivYiMyuJY6KkaO2/ u1wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=LGL4x6dkIdgJZOkDHkmFJxEgR3EfxdT6D9M0NZ47Uu0=; b=uLBhiREZRytU0A28957Trppv9DkN34Ivsi8DDrDErMGi1cOb0ny1fLr21El1Yo/Ovr NcR4Ro3TmJ7x/HLJG8glDStYfTlP5Hp6kEVB5AAP5A2+sLEoOoZgNtlyEcVkOGapYmZ+ LqJzGcFvTPt9X0JfgJnsgDtZxh5pzrg+ZTezDVfQ+dYhsTG3aBmD7I7LT91dofCpCyJJ aj4I6dJGy5BSAV3/KMKINTJxouGDmRYILpEDVuOcCWFBrHzFGd3G2eeecZ6Idj5C7YxQ BhigbsjVe8cEZ6wIzIRO47kr7Z1b9xZF/Sxac+FauFFvz/vdDZ+w0I3+z6fFEb3ektUZ R6Qg== X-Gm-Message-State: AGRZ1gJDrsm1o2u/CL/n5JmvnwhOUwhkKntmOPHCPNSi8xg/GnJ8YgOV QMs7s4RCJRLjKB+o7H8Ldy8qNAE78J5Mu64kGmjXBQ== X-Google-Smtp-Source: AJdET5dlLO/OjpUP7xU0PmGQPctg2QTw263jGjMV2rerT+vDN6FeM0hTEJ3rFhh79JSwWEKCr2Wpxfv/grI4L7Weeas= X-Received: by 2002:a0d:d5d7:: with SMTP id x206-v6mr2180308ywd.331.1541631402675; Wed, 07 Nov 2018 14:56:42 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a25:84d2:0:0:0:0:0 with HTTP; Wed, 7 Nov 2018 14:56:42 -0800 (PST) In-Reply-To: References: <201810221939.w9MJdKiW071014@repo.freebsd.org> From: Oliver Pinter Date: Wed, 7 Nov 2018 23:56:42 +0100 Message-ID: Subject: Re: svn commit: r339609 - in head/release: amd64 i386 powerpc sparc64 To: Ed Maste Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Rspamd-Queue-Id: 736F37D48A X-Spamd-Result: default: False [-2.63 / 200.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org]; NEURAL_HAM_MEDIUM(-0.98)[-0.981,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-0.98)[-0.977,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_DN_SOME(0.00)[]; URI_COUNT_ODD(1.00)[13]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; MX_GOOD(-0.01)[alt1.aspmx.l.google.com,aspmx.l.google.com,aspmx2.googlemail.com,alt2.aspmx.l.google.com,aspmx3.googlemail.com]; RCVD_IN_DNSWL_NONE(0.00)[f.2.c.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.57)[-0.568,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.59)[ipnet: 2607:f8b0::/32(-1.36), asn: 15169(-1.51), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Server: mx1.freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2018 22:56:44 -0000 This fixes a build for us: https://github.com/HardenedBSD/hardenedBSD/commit/c1a6f17c2a62ca9d1d0f4d788d8d832e9e909b6b On Sunday, November 4, 2018, Oliver Pinter wrote: > On 10/22/18, Ed Maste wrote: > > Author: emaste > > Date: Mon Oct 22 19:39:20 2018 > > New Revision: 339609 > > URL: https://svnweb.freebsd.org/changeset/base/339609 > > > > Log: > > release: set -e to exit on error in iso image scripts > > > > Reviewed by: gjb > > Differential Revision: https://reviews.freebsd.org/D17651 > > > > Modified: > > head/release/amd64/mkisoimages.sh > > head/release/i386/mkisoimages.sh > > head/release/powerpc/mkisoimages.sh > > head/release/sparc64/mkisoimages.sh > > > > Modified: head/release/amd64/mkisoimages.sh > > This commit catches an warning / error in cd generation for amd64, > with this error: > > >>> Installing everything completed on Mon Oct 22 18:07:00 UTC 2018 > -------------------------------------------------------------- > 1+0 records in > 1+0 records out > 4096 bytes transferred in 0.000197 secs (20757002 bytes/sec) > 200+0 records in > 200+0 records out > 819200 bytes transferred in 0.020971 secs (39064121 bytes/sec) > newfs_msdos: cannot get number of sectors per track: Operation not > supported > newfs_msdos: cannot get number of heads: Operation not supported > newfs_msdos: trim 25 sectors to adjust to a multiple of 63 > /dev/md0: 1532 sectors in 1532 FAT12 clusters (512 bytes/cluster) > BytesPerSec=512 SecPerClust=1 ResSectors=1 FATs=2 RootDirEnts=512 > Sectors=1575 Media=0xf8 FATsecs=5 SecPerTrack=63 Heads=1 HiddenSecs=0 > cp: chown: efi/efi/boot/bootx64.efi: Invalid argument > 1+0 records in > 1+0 records out > > The last working cd generation was before this commit: > https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD- > CURRENT-amd64/1361/console > > And after this commit it breaks on the above line: > https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-amd64/ > > in ${SRCTOP}/release/amd64/mkisoimages.sh the -p option can't work > when you copy to a FAT FS, so the easiest fix would be to remove the > -p option from cp's line. > Other problem with a script after the set -e changes, that if > something fails, no one cleans up the created md devices. > > > > ============================================================ > ================== > > --- head/release/amd64/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/amd64/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -23,6 +23,8 @@ > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > > > +set -e > > + > > if [ -z $ETDUMP ]; then > > ETDUMP=etdump > > fi > > > > Modified: head/release/i386/mkisoimages.sh > > ============================================================ > ================== > > --- head/release/i386/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/i386/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -23,6 +23,8 @@ > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > > > +set -e > > + > > if [ "$1" = "-b" ]; then > > # This is highly x86-centric and will be used directly below. > > bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" > > > > Modified: head/release/powerpc/mkisoimages.sh > > ============================================================ > ================== > > --- head/release/powerpc/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/powerpc/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -23,6 +23,7 @@ > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > > > +set -e > > > > if [ "$1" = "-b" ]; then > > bootable=1 > > > > Modified: head/release/sparc64/mkisoimages.sh > > ============================================================ > ================== > > --- head/release/sparc64/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/sparc64/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -22,6 +22,8 @@ > > # resulting ISO image, base-bits-dir contains the image contents and > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > +set -e > > + > > if [ $# -lt 3 ]; then > > echo "Usage: $0 [-b] image-label image-name base-bits-dir > > [extra-bits-dir]" > /dev/stderr > > exit 1 > > _______________________________________________ > > svn-src-head@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-src-head > > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > > >