git: 8e99c8ad8fd4 - main - pkgbase: make pkg repo reproducible

Baptiste Daroussin <bapt_at_FreeBSD.org> wrote on
Date: Thu, 06 Mar 2025 14:22:59 UTC :

> The branch main has been updated by bapt:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=8e99c8ad8fd41d3befae62f9eee59d8c5c60a539
> 
> commit 8e99c8ad8fd41d3befae62f9eee59d8c5c60a539
> Author: Baptiste Daroussin <bapt@FreeBSD.org>
> AuthorDate: 2025-03-06 14:16:44 +0000
> Commit: Baptiste Daroussin <bapt@FreeBSD.org>
> CommitDate: 2025-03-06 14:22:48 +0000
> 
> pkgbase: make pkg repo reproducible
> 
> Add a PKG_WORKERS_THREADS variable set to 1 by default, if as a user
> you want speed again, then just override it.

Compare/contrast the PKG_WORKERS_THREADS name to the later
PKG_WORKERS_COUNT name. I'm guessing PKG_WORKERS_COUNT was
the final intent: processes vs. threads and threads
possibly being misleading and COUNT being more generic
for such distinctions.

> ---
> Makefile.inc1 | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
> index f51fe7d3b119..75fcbc0bf968 100644
> --- a/Makefile.inc1
> +++ b/Makefile.inc1
> @@ -606,6 +606,7 @@ SOURCE_DATE_EPOCH=	${TIMEEPOCHNOW:gmtime}
>  .else
>  SOURCE_DATE_EPOCH=	${PKG_TIMESTAMP}
>  .endif
> +PKG_WORKERS_COUNT?=	1

PKG_WORKERS_COUNT vs. PKG_WORKERS_THREADS ?

>  
>  PKG_NAME_PREFIX?=	FreeBSD
>  PKG_MAINTAINER?=	re@FreeBSD.org
> @@ -2367,7 +2368,8 @@ real-sign-packages:	_pkgbootstrap .PHONY
>  .if ${PKG_BIN_VERSION} < 11700
>  	printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta
>  .endif
> -	@${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" repo \
> +	@${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" \
> +		-o WORKERS_COUNT=${PKG_WORKERS_COUNT} repo \

PKG_WORKERS_COUNT vs. PKG_WORKERS_THREADS ?

>  		-m ${WSTAGEDIR}/meta \
>  		-o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
>  		${REPODIR}/${PKG_ABI}/${PKG_VERSION} \


===
Mark Millard
marklmi at yahoo.com