From nobody Wed Apr 10 03:29:22 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 4VDpGW1HhPz5GfJQ; Wed, 10 Apr 2024 03:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VDpGV6Cnbz4Q4M; Wed, 10 Apr 2024 03:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712719762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YMSDc+ouvX6FYsQRP6dZLu7ZnamJlGbcZDg65tYVGWI=; b=HDIIkqDI/PNdjvRkuy2RrGq4IpADqIaMVSUsdyDKBGtJT3wbaR+/rw4fywRhZmaAGD7r/s h97/cGf4uijtQw7X3WoRuaFmc8dezP0DKjQax4OTLwm96aTWMNztYYgVp64cQJGgoVaE0e tPHEgaWBZ3FP5ZaocKaUPVCF68kXzBBnycsq9ent6H+sEGo8WP6/u+QXPo/+RpbY4aYtMj RCXusxGQU5REvctUdUdIDho6uyF1l4Xet7AL5xSvUQ1IclAPvpeJFZkPZ7cpbaMSGFQnHC sW1JvGMlhxur9FNzwZLXVUDD1hRhsSFr8mDpuy4mcKPReUb6QIA08rRyIkcdGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712719762; a=rsa-sha256; cv=none; b=AkGsRdVsW3KHYjHh4Sh9T7UeDB0zmRg6dctGhJ4bvl5L9uTMWVvFlML16iND6tQtWZ9jQb 8XtjRr/CmwXtpAp4evzzWz27xLbgm5URl3WcimgZ1tnirKVlIkOL4wapqDL6UljrkUBY12 w/9lCtxBLf4i6iefxN3BZAxKuFLxMnq7UHguONVh426NbS1T15o8LktcGwkq3h9QnSr9aW +TDDdG/RF4Ec3UytJcJoCjkQT7jgLNdc6HXm5DL8t/8snU0VklcXjH3XEdHDvWeWtr0KaM 7RoI6w5KANKKAHOLRBE8xF5H9MfQ/wv8+zXeE6zSWtjPfXQIgdPs7SaN6CdHCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712719762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YMSDc+ouvX6FYsQRP6dZLu7ZnamJlGbcZDg65tYVGWI=; b=e4Hlve2RiuugWMTHlTSb7XW3qECjxNrpWiCF3tulOcFXYhI4t+OAaQIgVfvi6Hfr3mxW8Q 3M2Hvj/UnHobECDL1QpNlUAJRD0NLaB/EMzKYORJBjAt8siZvYdzsDdw3SSkPsrz2GZAaY hipJMVzcnt0BNkF8FD+r8XLXVnretj98IJx4WVCXv7RNqmCgsEb9LDCI8/nT82zWwi1LHU ZQz0sXZD9H6bVz+oatNBWOPvDsZcq5Kn653xhpj9OUfvLp3WFV4ab30cC6bsXfdrH42+Gb /PAWYC5SGPAPtsqsjYvmw+edzpvolUzzwRPpZGAwFdsR2lZ3dxYOo697xdA76A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VDpGV5gjBzLgG; Wed, 10 Apr 2024 03:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43A3TMru089690; Wed, 10 Apr 2024 03:29:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43A3TMCp089687; Wed, 10 Apr 2024 03:29:22 GMT (envelope-from git) Date: Wed, 10 Apr 2024 03:29:22 GMT Message-Id: <202404100329.43A3TMCp089687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a1bff97300ab - main - release: Don't reuse disc1/bootonly directories 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1bff97300abe4b46528357e39c83da764df1fd8 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a1bff97300abe4b46528357e39c83da764df1fd8 commit a1bff97300abe4b46528357e39c83da764df1fd8 Author: Colin Percival AuthorDate: 2024-04-10 03:27:19 +0000 Commit: Colin Percival CommitDate: 2024-04-10 03:29:16 +0000 release: Don't reuse disc1/bootonly directories 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. 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. 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. MFC after: 1 week --- release/Makefile | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/release/Makefile b/release/Makefile index 26f39e8f8acb..99927d611257 100644 --- a/release/Makefile +++ b/release/Makefile @@ -109,7 +109,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -CLEANDIRS= dist ftp disc1 bootonly dvd +CLEANDIRS= 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} +disc1-disc1 disc1-memstick: disc1 + mkdir ${.TARGET} + tar -cf- -C disc1 . | tar -xf- -C ${.TARGET} + +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} dvd1.iso: dvd pkg-stage cd dvd && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} -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} 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} 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} packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST