From nobody Sun Jan 19 10:31:49 2025 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 4YbVBt2st4z5l31K; Sun, 19 Jan 2025 10:31:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbVBt0WqWz4Nrs; Sun, 19 Jan 2025 10:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737282710; 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=zKbNOtdMBJpdTcD8xDEG2DKvBy2XEctqCNot+8kCZFU=; b=GY/p+4OODXDvZDaALoxeBVzlMdBivfjzqt+0sLM6yJTtLucpUV3RS/dUuaTOY382OZLuc6 CqNQBn5pjVk4VVICHj3AHNTRZ0fI5ar3hStBf1nvBmsksMpEybha/XLiR+yw6Y2PVbBaMI p9zVofV1sdccv1XlGyw78j6gs75wi9r9SLecR1FGqbPeK9c4OgAJPyQm5f+mElJmnaAzsK hlQkB/9oMTLt7pdCVQzIEGkJ3BL4YUV4uhgYV7daCz0wDNUa0hJmbbBJILk6OHCRa1mZRJ OSPDOFCSfHoCuEp2w0uWePyisr7NpCyStvKjHepmBE5iVX1yeGJ12j1HZwvJtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737282710; 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=zKbNOtdMBJpdTcD8xDEG2DKvBy2XEctqCNot+8kCZFU=; b=LXnqhIfmqQrbJ0F0pJlv/uzQw5izfRMKjd1g9xjT7h+XVF8qC/hpNYSv/iNXfHUbFGuxFF uJTfVRpSO9wXOacNEXp8nqNTXgft6Yvk3CtcjmOAUj2WpxbIKEViO6kBlwRfSJ3WS0rUdy CU0ADLSdiU4WC+sXIoUhdrd5aPRSGwtYWAVzaqdj60IHiRlQW0/19pyF01W0JXbfgA7v2G FyTT9iyy2i6ZL9Y3TMScTauXa5JIU6UJuwgomf/Py1jYW7nQ9xByQZRzPl8Ld18nLLMVSH IENSANbMc1MhhrEXqRRWSocVT+Ip2xDakniWNo38KPe0MEVQeW+rupI61yyx3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737282710; a=rsa-sha256; cv=none; b=VLRzxqE5rKfSXCbqtn+SXSo9tV6UJo0EQNttGMzftesXcRulsNv/pvRK7aG+DfpkCjuv3T IscCiqAQgDpHO4ErUCj0z/FeWAceWRh98HWk8pppvdK0peXz0g2UMCyvlcAZUJk7tBxYLa UjZh1GquPAZO3MvdMBy4GOp98jcVCQOM2qTtFhBGi5b66eVRT7KgvgyxlmIIffCFVGE0TP ToSoGTVOXm91DcV/SOXflwOP9tYvvn8hNl1coEtD/WCGTcl5RjeesBjZ42PmGiDqF0TMKs 5CwV4x7bTZbEM/wSOmtnL3ChKagiYUQy7LzAIFCZCtSSgGvy2cXiBoPoAiWHig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YbVBs6mDKzmYh; Sun, 19 Jan 2025 10:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50JAVnj6066205; Sun, 19 Jan 2025 10:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50JAVnKS066202; Sun, 19 Jan 2025 10:31:49 GMT (envelope-from git) Date: Sun, 19 Jan 2025 10:31:49 GMT Message-Id: <202501191031.50JAVnKS066202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 6ede5a29d5e7 - stable/14 - release: install etc files from the source tree, not the host 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: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ede5a29d5e7faa852a193d8fcbbbdf874d143c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=6ede5a29d5e7faa852a193d8fcbbbdf874d143c2 commit 6ede5a29d5e7faa852a193d8fcbbbdf874d143c2 Author: Doug Rabson AuthorDate: 2024-12-23 10:19:27 +0000 Commit: Doug Rabson CommitDate: 2025-01-19 10:31:02 +0000 release: install etc files from the source tree, not the host Reviewed by: cperciva MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48180 (cherry picked from commit bc77aa7df7339b166c0d6394526fe59dea89f4b1) --- release/Makefile.oci | 2 ++ release/tools/oci-image-static.conf | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/release/Makefile.oci b/release/Makefile.oci index 461c95f49636..da35156c5a95 100644 --- a/release/Makefile.oci +++ b/release/Makefile.oci @@ -24,6 +24,8 @@ OCI_DEPS_minimal= container-image-dynamic.txz .for _IMG in ${OCI_IMAGES} OCI_TARGETS+= container-image-${_IMG}.txz container-image-${_IMG}.txz: ${OCI_DEPS_${_IMG}} + # Adjust PATH so that we run pwd_mkdb from the bootstrap tools + env PATH=${OBJTOP}/tmp/legacy/bin:${PATH:Q} \ sh ${.CURDIR}/scripts/make-oci-image.sh ${.CURDIR} ${REVISION} ${BRANCH} ${TARGET_ARCH} ${_IMG} skopeo copy \ containers-storage:localhost/freebsd${REVISION:R}-${_IMG}:latest \ diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 27cfb3c6778c..552328e66f3c 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -7,17 +7,20 @@ OCI_BASE_IMAGE= oci_image_build() { - mtree -deU -p $m/ -f /etc/mtree/BSD.root.dist > /dev/null - mtree -deU -p $m/var -f /etc/mtree/BSD.var.dist > /dev/null - mtree -deU -p $m/usr -f /etc/mtree/BSD.usr.dist > /dev/null - mtree -deU -p $m/usr/include -f /etc/mtree/BSD.include.dist > /dev/null - mtree -deU -p $m/usr/lib -f /etc/mtree/BSD.debug.dist > /dev/null + local srcdir=${curdir}/.. + mtree -deU -p $m/ -f ${srcdir}/etc/mtree/BSD.root.dist > /dev/null + mtree -deU -p $m/var -f ${srcdir}/etc/mtree/BSD.var.dist > /dev/null + mtree -deU -p $m/usr -f ${srcdir}/etc/mtree/BSD.usr.dist > /dev/null + mtree -deU -p $m/usr/include -f ${srcdir}/etc/mtree/BSD.include.dist > /dev/null + mtree -deU -p $m/usr/lib -f ${srcdir}/etc/mtree/BSD.debug.dist > /dev/null install_packages ${abi} ${workdir} $m FreeBSD-caroot FreeBSD-zoneinfo - cp /etc/master.passwd $m/etc + cp ${srcdir}/etc/master.passwd $m/etc pwd_mkdb -p -d $m/etc $m/etc/master.passwd || return $? - cp /etc/group $m/etc || return $? - cp /etc/termcap.small $m/etc/termcap.small || return $? - cp /etc/termcap.small $m/usr/share/misc/termcap || return $? + cp ${srcdir}/etc/group $m/etc || return $? + # termcap.small is generated so we get it from OBJDIR - make sets our + # working directory to OBJDIR/release + cp ../etc/termcap/termcap.small $m/etc/termcap.small || return $? + cp ../etc/termcap/termcap.small $m/usr/share/misc/termcap || return $? env DESTDIR=$m /usr/sbin/certctl rehash # Generate a suitable repo config for pkgbase case ${branch} in