From nobody Sat Sep 21 13:41:43 2024 X-Original-To: dev-commits-src-main@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 4X9r5M6Fh3z5WZNX; Sat, 21 Sep 2024 13:41:43 +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 4X9r5M2dTtz4DwL; Sat, 21 Sep 2024 13:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726926103; 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=JM51pk32zZzGhQwdNP8hfBjnaV3V7Ex7jPfjW4S8JWc=; b=u5UwDL8/ZvjiDpgyRxv4edSL/eU3cX8ybq6robomsRQfAo0hFAbo940ASQe22IMQeTg5CW l5xNJ1zBd5fqd3HPpmca0pjEodpzrBwNP5WMc46waZgs3fG+SuIBcTftw/geNrvt1Bp8Q2 +K4/ensLGEtcVUFjUM6MgJVKwC4Pvv625fhw2get+73U8KJyU2rXSm3WE0aiuPwz1+W+WS pQHc1EqrICWuby+ntVN7CSoB9506QUC9t0TgvX1A/2yIhchUeDsUWKDSSVaB1gM18QFTKG huv0hqg0q8QsYBLTTGElEJTuJS8pQziZUQHszpMRDhw6szGHzMqToqvYSp24oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726926103; a=rsa-sha256; cv=none; b=klpVchU5tpSdtxMud0JWip6HZ0De8iMtJ+3I5NAC2M1XwKX9RSQluCt6sbnwDHCdjDcUxV PE9vmkdONR3gr65ux8hwWcuAEfNrBfAWS4oqy6K1jo0hMohjqi0yrBEFqEzuFTBrd9HJBi /lspd/IOXYcPioXGH5g8cYC4TB/ARl7jLwefuUcQN+OXYHqS31qljXUtquKUUaFpu761jh gZiI8LZrkbhjp3qzNFrKv6rB7asMZzkQ4vePFaJAwaISBrCv8Qu9fYnk4uY8Q2BgaSNBAX E40sv2xaiB2qM9vw/zyCdkHG9sF7LqMP6aeWCkUS54T0xIwOS90OsEmq1V0uPw== 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=1726926103; 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=JM51pk32zZzGhQwdNP8hfBjnaV3V7Ex7jPfjW4S8JWc=; b=eHjRFrpMBnOzdg6jpb48ffARvBunMEVF1J1xGchQaEdZnjMoUDtpcNQc+AKPVZs+cUT2jO cFJDh852yXDATUEbSe2wmV3Qoigbh7Zqq6XRkiDAbIhb3j3DPUbxaNTUZdYJxLhV/7jnig +2ycIyMlCyc6VIuI0sMyddAXfXHp090V6IgKqX6BvAlKf/l03XRIy3mq/QD9jhar1Dd1lR rlemDXg6NApOaAsHNdyaEtzWKFW12Fv+PjXq7q1FLaP02LJuksjIN/WJdPPh4kDTUtL+17 wifxRMr9l+SXuXgnHRibeig0BHStY92VqBfiyzrzt/rELpe2JqQZjc0CMO82cg== 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 4X9r5M2DxGzc4q; Sat, 21 Sep 2024 13:41:43 +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 48LDfh5q072848; Sat, 21 Sep 2024 13:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48LDfh9m072845; Sat, 21 Sep 2024 13:41:43 GMT (envelope-from git) Date: Sat, 21 Sep 2024 13:41:43 GMT Message-Id: <202409211341.48LDfh9m072845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1a58fd5bf686 - main - Makefile.inc1: make pkg-create(8) compression level overridable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a58fd5bf686b30f6f6374f5923c4f935a7f4308 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a58fd5bf686b30f6f6374f5923c4f935a7f4308 commit 1a58fd5bf686b30f6f6374f5923c4f935a7f4308 Author: Evgenii Khramtsov <2khramtsov@gmail.com> AuthorDate: 2024-09-15 14:48:55 +0000 Commit: Warner Losh CommitDate: 2024-09-21 13:40:11 +0000 Makefile.inc1: make pkg-create(8) compression level overridable pkg(8) after 8991ebd7afb0 ("Fix #1566: Add pkg-create(8) -l,--level to set compression level") accepts compression level when creating packages with a compression format (e.g. txz, tzst). When compression is used (PKG_FORMAT is not "tar"), use compression level from PKG_LEVEL for pkg-create(8) to make use of 8991ebd7afb0. PKG_LEVEL default is set to pkg default to keep current behavior, see pkg(8) 31000cb40b30 ("tzst: by default compression at the 19 level). Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1420 --- Makefile.inc1 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 991e9973fb04..557bbc825625 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2008,6 +2008,8 @@ KSTAGEDIR?= ${OBJTOP}/kernelstage SSTAGEDIR?= ${OBJTOP}/sourcestage REPODIR?= ${OBJROOT}repo PKG_FORMAT?= tzst +PKG_LEVEL?= -1 +PKG_CLEVEL?= ${"${PKG_FORMAT:Mtar}" != "":?:-l ${PKG_LEVEL}} PKG_REPO_SIGNING_KEY?= # empty PKG_OUTPUT_DIR?= ${PKG_VERSION} PKG_ABI_FILE?= ${WSTAGEDIR}/usr/bin/uname @@ -2155,7 +2157,7 @@ create-source-src-package: _pkgbootstrap .PHONY ${SSTAGEDIR}/src.ucl ${PKG_CMD} -o ABI=${PKG_ABI} \ -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ -M ${SSTAGEDIR}/src.ucl \ -p ${SSTAGEDIR}/src.plist \ -r ${SRCDIR} \ @@ -2182,7 +2184,7 @@ create-source-src-sys-package: _pkgbootstrap .PHONY ${SSTAGEDIR}/src-sys.ucl ${PKG_CMD} -o ABI=${PKG_ABI} \ -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ -M ${SSTAGEDIR}/src-sys.ucl \ -p ${SSTAGEDIR}/src-sys.plist \ -r ${SRCDIR} \ @@ -2225,7 +2227,8 @@ create-world-package-${pkgname}: .PHONY fi ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ + -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ -r ${WSTAGEDIR} \ -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} @@ -2255,7 +2258,7 @@ create-dtb-package: ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ -M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \ -r ${KSTAGEDIR}/${DISTDIR} \ @@ -2287,7 +2290,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ -r ${KSTAGEDIR}/${DISTDIR} \ @@ -2327,7 +2330,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ -r ${KSTAGEDIR}/kernel.${_kernel} \