From nobody Wed Apr 10 05:18:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VDrhY417Pz5GqcY for ; Wed, 10 Apr 2024 05:18:37 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VDrhY2LPQz4bsZ for ; Wed, 10 Apr 2024 05:18:37 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-516d6c1e238so5283709e87.2 for ; Tue, 09 Apr 2024 22:18:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712726315; x=1713331115; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RKOGe8HL9KjQsXR2LhSIzPihmfChz7CsfqIZhiKnGIw=; b=gnlSdGDvP+qHrmKjX45Lw0jgqUflvqSX7tuZ3xMb+7q9hswDbFbWq4QVwYm3fgkHvE QgLnroGgEFJTm0c9JYLUtkJiS+BhPR6u7JkatHsTk7IH/FXquTNPozuvADGsB4GwEaZP Bw+HG1SWSOTbOkXMyt9Zw5rUgAaVP1go13bPIfbqZMS89aQ4D897+GUUqCt8J/TQOYVz QeI9yK5rfclENQ/M5K5Ic4g7nu/EBZam26YlFy5o6GHc82Ha+au1Z3IVfYvrMalYSqCE q+7nOyVhppJd9dP2buGNT1Rh5EoFZTS05LO50lipgZWLArn/DTYzRQkyZIejD9uuQjtw 5i4g== X-Forwarded-Encrypted: i=1; AJvYcCWgh/8/rJp8sAgG4IwX2iEgD9jjlKiClgWIbIIugHTvTy7wi9S6hblnP2ZOyMLRBdz8tLHqZS/tSiW1/dLi2s9KQ1bwrHWtSk06MMSXgcHV X-Gm-Message-State: AOJu0Yyvn/Y0IsX+nvOr/QdPeFM0adF1wWZSSJWa1DZUEt5cVkiji5cv PfnRc5znxNxGhy0rJELyOfACWZtwCbGU1W2fmNJmQO4ajCRiPB19C4GUleX6uZ0= X-Google-Smtp-Source: AGHT+IEN2vJCIgut77UnnkKH1vrvtVV5p+3n4RaPQrkOty00+WpY1F7/y3L9MAnfAqK8xjD2RUrlfg== X-Received: by 2002:ac2:47fc:0:b0:516:c97b:96f5 with SMTP id b28-20020ac247fc000000b00516c97b96f5mr847484lfp.3.1712726315005; Tue, 09 Apr 2024 22:18:35 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id b17-20020a5d40d1000000b00343cad2a4d3sm12947233wrq.18.2024.04.09.22.18.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2024 22:18:34 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-all+owner@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: a1bff97300ab - main - release: Don't reuse disc1/bootonly directories From: Jessica Clarke In-Reply-To: <202404100329.43A3TMCp089687@gitrepo.freebsd.org> Date: Wed, 10 Apr 2024 06:18:23 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6F0E287D-D46C-4AC3-BF1F-030E02989372@freebsd.org> References: <202404100329.43A3TMCp089687@gitrepo.freebsd.org> To: Colin Percival X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VDrhY2LPQz4bsZ On 10 Apr 2024, at 04:29, Colin Percival wrote: >=20 > The branch main has been updated by cperciva: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da1bff97300abe4b46528357e39c83da7= 64df1fd8 >=20 > commit a1bff97300abe4b46528357e39c83da764df1fd8 > Author: Colin Percival > AuthorDate: 2024-04-10 03:27:19 +0000 > Commit: Colin Percival > CommitDate: 2024-04-10 03:29:16 +0000 >=20 > release: Don't reuse disc1/bootonly directories >=20 > The disc1 and bootonly directories have files distributed into them > for use in "full" and "mini" images; the former are disc1.iso and > memstick.img, and the latter is bootonly.iso and mini-memstick.img. >=20 > Unfortunately the scripts which package a directory tree into an = ISO > or memory stick image also modify the directory, for example to > create an appropriate /etc/fstab file; so creating two images at = the > same time breaks. >=20 > Resolve this by copying disc1 to disc1-disc1 and disc1-memstick, > and copying bootonly to bootonly-bootonly and bootonly-memstick, > before using those directories for constructing the ISO+memstick > images. >=20 > MFC after: 1 week > --- > release/Makefile | 26 +++++++++++++++++--------- > 1 file changed, 17 insertions(+), 9 deletions(-) >=20 > diff --git a/release/Makefile b/release/Makefile > index 26f39e8f8acb..99927d611257 100644 > --- a/release/Makefile > +++ b/release/Makefile > @@ -109,7 +109,7 @@ CLEANFILES+=3D ${I}.xz > .if defined(WITH_DVD) && !empty(WITH_DVD) > CLEANFILES+=3D pkg-stage > .endif > -CLEANDIRS=3D dist ftp disc1 bootonly dvd > +CLEANDIRS=3D dist ftp disc1 disc1-disc1 disc1-memstick bootonly = bootonly-bootonly bootonly-memstick dvd > beforeclean: > chflags -R noschg . > .include > @@ -267,23 +267,31 @@ dvd: packagesystem > .endif > touch ${.TARGET} >=20 > +disc1-disc1 disc1-memstick: disc1 > + mkdir ${.TARGET} > + tar -cf- -C disc1 . | tar -xf- -C ${.TARGET} What=E2=80=99s wrong with cp -a? Besides, shouldn=E2=80=99t this use -p if using tar? And -f- is the same as nothing. Jess > +bootonly-bootonly bootonly-memstick: bootonly > + mkdir ${.TARGET} > + tar -cf- -C bootonly . | tar -xf- -C ${.TARGET} > + > release.iso: disc1.iso > -disc1.iso: disc1 > - cd disc1 && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b = ${VOLUME_LABEL}_CD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} > +disc1.iso: disc1-disc1 > + cd disc1-disc1 && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b = ${VOLUME_LABEL}_CD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} >=20 > dvd1.iso: dvd pkg-stage > cd dvd && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b = ${VOLUME_LABEL}_DVD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} >=20 > -bootonly.iso: bootonly > - cd bootonly && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b = ${VOLUME_LABEL}_BO ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} > +bootonly.iso: bootonly-bootonly > + cd bootonly-bootonly && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b = ${VOLUME_LABEL}_BO ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} >=20 > memstick: memstick.img > -memstick.img: disc1 > - cd disc1 && sh ${.CURDIR}/${TARGET}/make-memstick.sh = .${NO_ROOT:D/METALOG} ../${.TARGET} > +memstick.img: disc1-memstick > + cd disc1-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh = .${NO_ROOT:D/METALOG} ../${.TARGET} >=20 > mini-memstick: mini-memstick.img > -mini-memstick.img: bootonly > - cd bootonly && sh ${.CURDIR}/${TARGET}/make-memstick.sh = .${NO_ROOT:D/METALOG} ../${.TARGET} > +mini-memstick.img: bootonly-memstick > + cd bootonly-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh = .${NO_ROOT:D/METALOG} ../${.TARGET} >=20 > packagesystem: ${DISTRIBUTIONS} > sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST