Date: Thu, 27 Jun 2024 09:00:52 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f8df17340cd6 - stable/14 - Makefile.inc1: Fix typo affecting incremental pkgbase builds. Message-ID: <202406270900.45R90qHb020830@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f8df17340cd6b28e76cfc55ec41e7878db78af81 commit f8df17340cd6b28e76cfc55ec41e7878db78af81 Author: Navdeep Parhar <np@FreeBSD.org> AuthorDate: 2024-06-20 19:15:12 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> 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} ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406270900.45R90qHb020830>