From nobody Thu Jun 20 19:18:25 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 4W4qyn42cHz5PKJd; Thu, 20 Jun 2024 19:18:25 +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 4W4qyn3VTcz58PV; Thu, 20 Jun 2024 19:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718911105; 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=4TsHkMnSYOjdYPsV81tj/DNPfvNpfPuIMDpSC0YTXDA=; b=mgUNIW34mXXlLObw1eYqe5UtEdTZGUevOad4JFAz0N3//354DrRxYpj97r7CvfrH7WRrBv CyGhJ1sqcgECfpSvjrNjiChM1q6zdkfFi0ByoJB70BzEcW6psWkboKdVFh3Vj3mHu2WGt2 4m1pGiw2w3jsww+fzQZE1d8u6949g873E76h9dz3AAuz+zaBR0huzhlLgUPQpPl4f+QdSC Or0xOWLJeDJxseF+/LbupgEnlkcpp50B4GDS9LFuTaut7xSZ1+NQVNO+hzTCj/AB7FpEz9 UrkatSpZppZ5Q6SmYwmk2yBazTSfJgDkDXDayrVDSXyk+w+ppiYNxzMWnyCaxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718911105; a=rsa-sha256; cv=none; b=psK0zFTVWKoIYIxVTc7vahhP4CiUzKXVmRKOyn7c7G7ERIuX5ariqCayvoLFXixPMGQr1Q 9x9joY3Wjtv8OXHPEkLCgZKEz91DbgmUkbT12ZyPTlDntHJeFWQIgqh9Xywx0Z7WpuLnnB qWCaZyHPiZe5ZD4ptOaxslA8GNAM2nrlgWxD2/nFAT5kO+Qrqsfcu8FnBe15slexdG7QJb ZB2ZvM3UWTmYTe76ZSO9az4E1FpeRT0e4639wn+GUxcdH4EdRsNqqQiDkCCp85qB42Wg/O kDKH9jJpP6bhogHnueYNtzib21oCjFLRkcFRH8v8h+ELl/CC+45pQphgsB2qzA== 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=1718911105; 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=4TsHkMnSYOjdYPsV81tj/DNPfvNpfPuIMDpSC0YTXDA=; b=R2F42VH2niBAHAJcE9HVyNON0YpOdB+jN+7UYaqUutNGAubsRF0TIZRZfvspe0IpA9gV4M QbAO/nafRlHcRVYbA7soZNBNaJiW2pmY9W3DOkXAhMqR0ltBXVQs8nDGCsZaewGbpffEVN fP2UC/VldHbkqjuE5+CfD12MxMFWT4/pJP9qqAsuCd5A+p57/BnNM0GdWYBUbs0FSY+URZ MWo0zfpYVnzWFLDaMNaNEkeud+hBEjCZYzmBISBM9YZ0XSWmxnYlbdYRUeKKuCO1ZquS6g +9xnuxOjTpWRxCDWG3BQ2QRAaoBrkQtkj6AxZv77po/TEzrF/Rs0mVA94ej6Uw== 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 4W4qyn2zWfzdFv; Thu, 20 Jun 2024 19:18:25 +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 45KJIPmi002064; Thu, 20 Jun 2024 19:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45KJIPpH002061; Thu, 20 Jun 2024 19:18:25 GMT (envelope-from git) Date: Thu, 20 Jun 2024 19:18:25 GMT Message-Id: <202406201918.45KJIPpH002061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: aee4c9c5b88a - main - 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aee4c9c5b88adc899b2e155a1c144acf96719f1e Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=aee4c9c5b88adc899b2e155a1c144acf96719f1e commit aee4c9c5b88adc899b2e155a1c144acf96719f1e Author: Navdeep Parhar AuthorDate: 2024-06-20 19:15:12 +0000 Commit: Navdeep Parhar CommitDate: 2024-06-20 19:17:46 +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 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 91d59e57b396..2f442bc9a394 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2068,7 +2068,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} ; \