From nobody Fri Jan 14 13:50:59 2022 X-Original-To: dev-commits-src-branches@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 0DB6E1947F71; Fri, 14 Jan 2022 13:51:00 +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 4Jb2kq711yz55L0; Fri, 14 Jan 2022 13:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642168260; 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=/GfaZn62OJR1Xck+pIj49BA2MUTn2mck1l033mQZUPI=; b=MxjW0gOBcVx6a99/aH6U7dgOmiufjPVmT83otyqkjdNFw2S3pR0xoem08Sc2kx6eP1ihv9 fzCNwaDcD4yH6e/0BkeSXpiBRBCjAP303BA3Eit9bN5yGmsZDl0C/5rNeHPsMfY5fPbdjz k8C7TXtC6J6o4DLZpE5CGVPj7TbY+iLeNGXYo39id+6aYE7macEnxZ5OumYCGwSBecHmmM DkefTaYyGOGfagWa/n+oudHvNchhUkmYIKHQEzz+HztbB487wRBT6L4m4rBqG9WknUhFNc xeXMUHHXe+WAMQbID0HfuWUBxqfk3cs2G0INjX8plcr1l6Q83mwGPI/45dctyg== 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 CAB3514C76; Fri, 14 Jan 2022 13:50:59 +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 20EDoxuT047804; Fri, 14 Jan 2022 13:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EDoxKi047803; Fri, 14 Jan 2022 13:50:59 GMT (envelope-from git) Date: Fri, 14 Jan 2022 13:50:59 GMT Message-Id: <202201141350.20EDoxKi047803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: d3546083b4d5 - stable/13 - pkgbase: Track pkg 1.17 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3546083b4d535642f97bd8f77fce6334f4acf07 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642168260; 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=/GfaZn62OJR1Xck+pIj49BA2MUTn2mck1l033mQZUPI=; b=Wol5drXBHYcjd2fIpV631s8T+zBHcFc6FjR0YkcryVFBL39qEOE7ndoZiQOKXuLSm/f8i9 zR2z+DyWCWB/Rir6RDHcHdhDnGybNnqwFw3sLYnIvgBuZsouW9GJQ6zuvAsQgH6Y8cGPXW lIazIqXblGPIuvllBNPhLRmeZr3SWhO4hbi3gCUllYM1J+9IaIO1sfTuqQhVshN/nn7+Le OTPhpgpsdhYPCof7Q/Z75pzOScVzQnZGz4dBHUyjDyF+DT8XrZHt+5Gh1LRBuA14DjN3ld P5aT9BPxFRG/TVmmCy1lp8OaSsfn2XtFael5AV1Eq9SfKzNFpOroPs9/wfREgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642168260; a=rsa-sha256; cv=none; b=szftWCee/8seY8puJk7PolDW0GEcfvVHANGinni3ZxD5oe47JtUG40gEnftnGqEoFU2Gfv C/1dGejNdokYfn1fpphJtGgQhwYNgSOezCYgbrMcWLrsUDir4EPLKQRvBYqu5LaxOcRscj m6W1x4eWAbErzVlPsQXC5qZtXlFLsAGJ5jVgs7XGbRhXj+Kj4o0cV5EMHmQgUbV8YeToXE l67Zs1+i91zIj20+Nu+mVwvbtkDs7zL22QZIXLGhs89iCZZs1qH2qx59W1JyEi0O5hpo0l 30aJYfredhPs6ZVp61FvXE3CNFMWWoN1XWoq+g7uMl9wgzEK36oCJi2W2uNijQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d3546083b4d535642f97bd8f77fce6334f4acf07 commit d3546083b4d535642f97bd8f77fce6334f4acf07 Author: Emmanuel Vadot AuthorDate: 2021-05-04 13:39:55 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-14 13:50:41 +0000 pkgbase: Track pkg 1.17 With pkg 1.17 the extention is always .pkg, packing_format is also now deprecated. (cherry picked from commit 6cafdee71d2b23e8ec95d1f128b0e11f103491bb) --- Makefile.inc1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 86f78a1ae204..f4b1f0b9340b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1936,14 +1936,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_FORMAT} ; \ + newpkgname=${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION}.pkg ; \ 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_FORMAT}" ; \ + echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.pkg" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ else \ @@ -2100,7 +2100,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne .endif sign-packages: _pkgbootstrap .PHONY - printf "version = 2;\npacking_format = \"${PKG_FORMAT}\";\n" > ${WSTAGEDIR}/meta + printf "version = 2;\n" > ${WSTAGEDIR}/meta @[ -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 \