From nobody Thu Jun 27 09:00:52 2024 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 4W8sx05Bllz5PG3h; Thu, 27 Jun 2024 09:00:52 +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 4W8sx04WdDz4Wp1; Thu, 27 Jun 2024 09:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478852; 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=PZnRCqI+/B0qqFkMFYIDO0hPD1EZT2QYuVQGnMZXGBY=; b=jPr4JyPNgUqNXX7RlZ72hPQiDhdC6ATeb8GQPeBGSkRLJcd/l/+aLWTT8zYmYaDqd64P25 Harpdj2FbU87oeQCSQQQerL7iolQJx90B/B0HtOujNOE1IUZ1nTvNeLYBZFkS6ZtGUscfo QB4yjpUMzIWmMMzD+ztHYg/OUnkyZ8Bx+S5YdA5rb5VzivR6tldqn3iqlH0+/7bK8ET1VK bKk4LEHoux92DNU2Q/hYqWX1dkiUPmrEsyvyB0psdmZ1ERbPG9WE/DLxZgL3XjpNYPCllJ g8IS0cW6N4TfV+r0Qug1HSLEIRHm+2E7hzD/2hKjGvUvFGmZrbde1vOFes2b/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478852; a=rsa-sha256; cv=none; b=eC/l5FHcsW8CRjZ7wBnljmPQwOOMGjpbOxzw6zG8C9igeZD1vMogO8+magbN6NtFRpuex/ 22XOrPKcHsZmP4Cxi0+q7hObcZoHhVUUT/jKtwv6zSqpUddQCzg1yOpwkR5fp3ZMAGIrzs mKgtw51YS6HFNEkbU7s7wDY4wIUyzW2KLGB+OGzZjDvahRr/58L0czbrGLRPYN370a8enn VMBJBQj5iEvP1xveUdSvGdcHtkXuzqiy7wYtC5/Z1NjI9T4zQD2IZloW2bLe1mcn/U6Lfa kdahBb8l/5bzyEUtKVgVKSSIjrtEt3/0JXmMeNc0PB5KQQ6BdE66mfGbVEC68g== 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=1719478852; 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=PZnRCqI+/B0qqFkMFYIDO0hPD1EZT2QYuVQGnMZXGBY=; b=i3RWPEga8wUkuvy5gHLJ8tqUF5c921SzmhTjkM894OK3FmSI+H9kto/fcIYWHoEX0Z7TDU toupFHf+qjeadknvQGNV/rAh7+DjAWkDtanfEZT6JN2wNSFb7iqUl3Y8pwAY5L/njrbMJM mfNUkTOkUfSquAUTg3wkqQLizvaMjWTjrun/nKvcRJaQ8rQR11Ec2XW3PfPz+z/V4psfCl 7GwgGUz3YdOCfA2B9o5B4H1j3+Iit72y5ys8GXNT1JIemoJWAXOkBUWxL89MFAY/s31Bpt CieF9x26g8L1BYyxPKbRITZf76e0MdJfS/lqV/Bb/vwiTgx2kzMe2I21nGtziw== 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 4W8sx047RCz1LC3; Thu, 27 Jun 2024 09:00:52 +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 45R90qOK020834; Thu, 27 Jun 2024 09:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R90qHb020830; Thu, 27 Jun 2024 09:00:52 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:00:52 GMT Message-Id: <202406270900.45R90qHb020830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f8df17340cd6 - stable/14 - Makefile.inc1: Fix typo affecting incremental pkgbase builds. 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f8df17340cd6b28e76cfc55ec41e7878db78af81 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f8df17340cd6b28e76cfc55ec41e7878db78af81 commit f8df17340cd6b28e76cfc55ec41e7878db78af81 Author: Navdeep Parhar AuthorDate: 2024-06-20 19:15:12 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:59:29 +0000 Makefile.inc1: Fix typo affecting incremental pkgbase builds. Fixes: 4231a5e50404 release: don't keep old packages if the BRANCH changes Sponsored by: Chelsio Communications (cherry picked from commit aee4c9c5b88adc899b2e155a1c144acf96719f1e) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b2e7be43f2ee..935421ea3b9a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2043,7 +2043,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a "$${oldsum}" == "$${newsum}" ]; then \ 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} ; \