From nobody Tue Oct 10 13:36:31 2023 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 4S4cPW5DKjz4wmfl; Tue, 10 Oct 2023 13:36:31 +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 4S4cPW4V2Lz4Jch; Tue, 10 Oct 2023 13:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696944991; 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=w92eB2G+cW3acXB2h85XU5oM9ZyMUZe4TwtwN89H184=; b=ESdd8FJE5GzEMDlN93W4V4aVyIr8r87+eO43/I0Bux0Motxj8L3gbLwKr1L7O597HHLVp1 VAPa+d5EnnoO+CazK9Y09HYvAhPeYNvFO6p0/1utnMOcOU/Jw84OClhv/9GPMKhZgjnloa r9wE3NbWK2twpIlDDna6JwFJgYC42Hd+k2I5n5H/tuwkeuvMuBgV75giskEW14RsAEgElf 1GiLluUtZqOYPIvYJNeX4682Eg27jPHpeCY2kHfytPJuiW/Dvrt4ayHFfeXRntIHapfjl3 NPSNuD04UVGEut5M1FuNv3sSmxuCUhOUzY3789LQDckmcvrmUEqrCC+Uuh5JHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696944991; a=rsa-sha256; cv=none; b=uFLWxrpgKVgCmv6DmwzY/XIzCj56k34ON35ubJ7uZhaA4ttsaqGZORv+Cgb0sx5NRqUNs7 f8ddzb+hlX85A7PvgdiBb0D04hzylbeHeGwHME4VdnbYloVdE0WqgXwdq3vUu17h/615Nr fH0OLOAZ9Nkdf9WvMEKZ9UBMMLetXWNTOZMOMkzhuhDC2REkVB17ZgXMH9dM/CyQXUeMbT xjt3ybOsjP7SbkgeoqPv1edFO8EqYXddZb87BjsFhgS5lN1SpvCgJtcfr4f6eb/VGsuv7U RRXgwcvTnu1uAtk7bb6U7h+L7fsshb2qdFQctsow+uPJcZ39U93ZxHkmwwv/Dw== 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=1696944991; 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=w92eB2G+cW3acXB2h85XU5oM9ZyMUZe4TwtwN89H184=; b=qlV4qwTM60UTvrcJTi2OaoXRGNBsVPe71p9pe0DcnZw7eyYFpLeg8dCCMPdimpbCdmHp/8 OT8aGoN65EWWP/D8IBjzRCayyPthvV12LOq1+yBGoCagnsdtFSEZgjWbvPcqGtdhzuDZg6 OuL6zhDxW95ACznGX46B2klR/9xfC3Q29CtStzL9WrM1dTJzM5T1uoXkEEZtXQ3PH9zj4/ rF/IDPMOyeWar5eHSsxMbin582apaoGdT0cXxpyu7qXDtRRMGcyFtuPEEy2n30U5JJ1YK1 cv5TlOHYjCyICgptlJhcC19alaigOd9WVHHGUIzqaI4zwNOyhmUEH3toAx4EiA== 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 4S4cPW3bVzzgZT; Tue, 10 Oct 2023 13:36:31 +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 39ADaVpZ005435; Tue, 10 Oct 2023 13:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ADaVJl005432; Tue, 10 Oct 2023 13:36:31 GMT (envelope-from git) Date: Tue, 10 Oct 2023 13:36:31 GMT Message-Id: <202310101336.39ADaVJl005432@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 227980df3979 - stable/13 - pkgbase: accommodate pkg < 1.17 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: owner-dev-commits-src-all@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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 227980df397969bd844aa582ef248909651bebb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=227980df397969bd844aa582ef248909651bebb0 commit 227980df397969bd844aa582ef248909651bebb0 Author: Ed Maste AuthorDate: 2021-07-27 16:44:45 +0000 Commit: Ed Maste CommitDate: 2023-10-10 13:36:10 +0000 pkgbase: accommodate pkg < 1.17 6cafdee71d2b adapted the pkgbase build for 1.17, but broke Cirrus-CI's use of PKG_FORMAT=tar (the quarterly package set still has pkg 1.16). Because of this I disabled the pkgbase build and test in 2bfba2a04b05. Now, check `pkg --version` and use the old logic for < 1.17. To be reverted once we no longer encounter pkg 1.16 in Cirrus-CI (i.e., via GCP cloud images) to avoid keeping this extra complexity around. PR: 257422 Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D31324 (cherry picked from commit 4e224e4be7c37052567ec4cd2481f299487fc222) (cherry picked from commit 4dbac528db6040694cd57c42a64e036daa91db86) (cherry picked from commit 54247ce1f96f04d16f1429007bac3607c8a0a39e) --- Makefile.inc1 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e0f5d9cae72d..d648be2f3064 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1907,9 +1907,16 @@ _pkgbootstrap: .PHONY @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif -.if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) +.if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages) PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI .endif +PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ + awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}' +.if ${PKG_BIN_VERSION} < 11700 +PKG_EXT= ${PKG_FORMAT} +.else +PKG_EXT= pkg +.endif .if !defined(PKG_VERSION_FROM) && make(real-update-packages) .if defined(PKG_ABI) @@ -1949,14 +1956,14 @@ real-update-packages: stage-packages .PHONY @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ - newpkgname=${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION}.pkg ; \ + newpkgname=${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION}.${PKG_EXT} ; \ oldsum=$$(pkg query -F $${pkg} '%X') ; \ if [ ! -f ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ]; then \ continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ if [ "$${oldsum}" == "$${newsum}" ]; then \ - echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.pkg" ; \ + echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ else \ @@ -2114,6 +2121,9 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne sign-packages: _pkgbootstrap .PHONY printf "version = 2;\n" > ${WSTAGEDIR}/meta +.if ${PKG_BIN_VERSION} < 11700 + printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta +.endif @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \