Re: Buildkernel fails in /usr/obj/usr/src/arm.armv7/sys/GENERIC/vchiq_shim.o

On Sat, Nov 01, 2025 at 10:22:37AM -0700, Adrian Chadd wrote:
> Here's my suggested solution:
> 
> ===
> diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
> b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
> index 96c3a0db8aa5..7e105a6b3b77 100644
> --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
> +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
> @@ -628,7 +628,9 @@ free_pagelist(BULKINFO_T *bi, int actual)
>         pagelist = bi->pagelist;
> 
>         vchiq_log_trace(vchiq_arm_log_level,
> -               "free_pagelist - %zx, %d (%u bytes @%p)", (size_t)pagelist,
> actual, pagelist->length, bi->buf);
> +           "free_pagelist - %zx, %d (%lu bytes @%p)",
> +           (size_t)pagelist, (int)actual, (unsigned long)pagelist->length,
> +           bi->buf);
> 
>         num_pages =
>                 (pagelist->length + pagelist->offset + PAGE_SIZE - 1) /
> ===

A simple-minded copy/paste to a patchfile in /usr/src named vchiq.patch failed with 

# patch < vchiq.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
|b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
|index 96c3a0db8aa5..7e105a6b3b77 100644
|--- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
|+++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
--------------------------
Patching file sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c using Plan A...
patch: **** malformed patch at line 11: actual, pagelist->length, bi->buf);

I've refrained from tampering with the sources, did I do something else dumb,
like not strip the a/ prefix from the diff line? I expected a "file not found" 
error in that case.

For clarity, /etc/make.conf is absent, /etc/src-env.conf contains
WITH_META_MODE=

Thanks for the quick reply!

bob prohaska