From owner-dev-commits-ports-all@freebsd.org Thu Apr 15 15:37:53 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20B165F45A2; Thu, 15 Apr 2021 15:37:53 +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 4FLk4d0Q5qz4WTC; Thu, 15 Apr 2021 15:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 012AE13D97; Thu, 15 Apr 2021 15:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13FFbqGK037467; Thu, 15 Apr 2021 15:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13FFbq9M037466; Thu, 15 Apr 2021 15:37:52 GMT (envelope-from git) Date: Thu, 15 Apr 2021 15:37:52 GMT Message-Id: <202104151537.13FFbq9M037466@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: b42828e7fd3e - main - - Fix new jail and ports creation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42828e7fd3e3d9505be516f919a586f18521f0d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Apr 2021 15:37:53 -0000 The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=b42828e7fd3e3d9505be516f919a586f18521f0d commit b42828e7fd3e3d9505be516f919a586f18521f0d Author: Bryan Drewery AuthorDate: 2021-04-15 15:37:20 +0000 Commit: Bryan Drewery CommitDate: 2021-04-15 15:37:52 +0000 - Fix new jail and ports creation. Brings in freebsd/poudriere@1c9357d08e35f2bb248533ce043b2e61920ebf9e --- ports-mgmt/poudriere-devel/Makefile | 2 +- .../patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 4fc42ea54067..2337a91c8cdb 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20210303 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e b/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e new file mode 100644 index 000000000000..487e88c71f87 --- /dev/null +++ b/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e @@ -0,0 +1,29 @@ +commit 1c9357d08e35f2bb248533ce043b2e61920ebf9e +Author: Bryan Drewery +Date: Tue Mar 23 16:06:36 2021 -0700 + + Partially revert #844 for createfs; still use -p. + + This restores the -p and atime/mountpoint/compression setting + for /jails and /ports. + + It changes compression=lz4 to compression=on as well. + + Fixes #844 + +diff --git src/share/poudriere/include/fs.sh src/share/poudriere/include/fs.sh +index fed4a5b08..cad0aa69d 100644 +--- src/share/poudriere/include/fs.sh ++++ src/share/poudriere/include/fs.sh +@@ -34,7 +34,10 @@ createfs() { + + if [ -n "${fs}" -a "${fs}" != "none" ]; then + msg_n "Creating ${name} fs at ${mnt}..." +- if ! zfs create ${fs}; then ++ if ! zfs create -p \ ++ -o compression=on \ ++ -o atime=off \ ++ -o mountpoint=${mnt} ${fs}; then + echo " fail" + err 1 "Failed to create FS ${fs}" + fi