git: be3c2087c884 - main - Revert "Makefile.inc1: attempt to fix pkgbase building" [FYI: following commit did not publish to list]

Warner Losh <imp_at_FreeBSD.org> wrote on
Date: Mon, 16 Jun 2025 17:16:44 UTC :

> The branch main has been updated by imp:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=be3c2087c88463c95ff733883773a59202ba12a2
> 
> commit be3c2087c88463c95ff733883773a59202ba12a2
> Author:     Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-06-16 17:13:19 +0000
> Commit:     Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-06-16 17:13:19 +0000
> 
>     Revert "Makefile.inc1:  attempt to fix pkgbase building"
>     
>     This was an attempt to fix b44147bb1245, but it's still not right. Per
>     conversation on irc, revert it and the other commit so we can redo them
>     correctly.
    
https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/date.html
https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/author.html
https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/index.html

do not show that other commit:

https://cgit.freebsd.org/src/commit/?id=e4988ba172a84b35abab8ce065f2210dab70f148
(Revert "Makefile.inc1: allow real-update-packages to be called independently")

But John Baldwin's later commit (that was the next one after the missing
one) did show up:

https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/032846.html

(There are a couple of unrelated Cy Schubert RE: . . . MIT KRB5 . . . messages
between as well.)

>     Suggested by: bapt, kevans
> ---
>  Makefile.inc1 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.inc1 b/Makefile.inc1
> index cff150668083..97bd81f3263f 100644
> --- a/Makefile.inc1
> +++ b/Makefile.inc1
> @@ -2048,7 +2048,7 @@ package-pkg: .PHONY
>  
>  real-packages:	stage-packages create-packages sign-packages .PHONY
>  
> -real-update-packages: .PHONY create-packages
> +real-update-packages: .PHONY
>  .if defined(PKG_VERSION_FROM_DIR)
>  	@echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})"
>  	@for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \



===
Mark Millard
marklmi at yahoo.com