From nobody Wed Apr 17 05:43:53 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 4VK8wV0VxXz5Hv5C; Wed, 17 Apr 2024 05:43:54 +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 4VK8wT6KXqz4lNb; Wed, 17 Apr 2024 05:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332633; 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=v3uM518LQle/1xjDpyGDVR+gLwS+K+rTkJ2BqR62HDw=; b=MMX1hlXfxtk7LXMF0jQ/tJdEAfS+/iIhVYu8aCk8r+yMZ3WWc8IkFVD43QZUScKSi6KSS6 g6wkBH89gG17ZEixk5rfWhiU1c1MFmD8HJAfD0h+0mWnd32DYLuW1bpCtY+YVlYyDQrSvu eZahyeyeqT//bOL06l94N+0WSckd6agt7RLC/kyoNfm4sv/AwiQrCjY0+EHkT/AmgwXhPD C94eWWTspn85RG9DouUND0Vtoj5BrWCiFSuZ2YhUB3IJi5vIqteJqQUJXg2Vp4MAO6bVda 3ualsW7ptGMHVYhA5Owj6WWVahnpUVYRyWSbezsPPQmYwXGdAvNu12IYn0xumQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332633; a=rsa-sha256; cv=none; b=ssgzWEwdzTAf+S7UaCCXUlWgoE0OXHhmFDMuBP7bNLakei+DQK6nUVwT0ZZy5DBcxl9+fV py2PsAg4/NrycrZcWnbGHIy1Ow0uq2qxp4HpeBGaK+aCllObQ4eHiEZKXhLnm4oOmd3/i0 OGYaoJDQs+ZK0S3U8E+kR3ejkOGMziq5/5n1cpf/Ign2Ib1tmgyvabGZelPBTpmj1GtxgY 7oG4exSjSO7otU4Nm5CcNIHqFLvrEBaA1WVA+iBp4fDpQoiU4Su+PRt+OhprN1Fbw7RzU9 sAsp0RXiLoluH42k5boqwK4x6F7iKtTc+BjWcrx0bnbVrg+u2HV42M32r/nxSw== 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=1713332633; 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=v3uM518LQle/1xjDpyGDVR+gLwS+K+rTkJ2BqR62HDw=; b=ubyd1d9/riAjq9kHf1z4n8bcfI/4puXzLcoTt+DE+RQwmEwFnLYjXgjDw1UOzLvDao5iLi wBr1WTbJqWJeazHrYbApIWEUOIEIts4a99/bvBSyTjCzXrFIjuu4Mc5SCQFiOVrIRWZldA 4lZQ8Or0ysvab+FOdxdCr0YXMF2sfl0frAXYtwFPvzob6Ex64Uaj1Vrtorou/cyL3MaMJh XclKq0Uyh1beKE+TqjuouEg5MG/3JZ8n8eBmiiYobxI5bz8Uwc7QtmB9U/j3tWQr0BNmxE VeQYd5wEpZ+Dx6Ua0A8SeVHhesMhV1YHYsCZjrFV9bbjPdQH+ytWKNZL70fXEg== 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 4VK8wT5xctzDs1; Wed, 17 Apr 2024 05:43:53 +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 43H5hr8P006666; Wed, 17 Apr 2024 05:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5hrN1006663; Wed, 17 Apr 2024 05:43:53 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:53 GMT Message-Id: <202404170543.43H5hrN1006663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2c774c1bb4ee - stable/14 - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c774c1bb4eeb50285bcbb874d0a139acec98476 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2c774c1bb4eeb50285bcbb874d0a139acec98476 commit 2c774c1bb4eeb50285bcbb874d0a139acec98476 Author: Colin Percival AuthorDate: 2024-04-10 03:27:19 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:26 +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 (cherry picked from commit a1bff97300abe4b46528357e39c83da764df1fd8) --- release/Makefile | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/release/Makefile b/release/Makefile index 6c391c9c661d..7b658bb90b29 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 @@ -270,23 +270,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