Re: git: d84a691a3590 - main - powerpc: Remove stale include line from MPC85XX

On Tue, 19 May 2026 19:57:23 +0000
John Baldwin <jhb@FreeBSD.org> wrote:

> The branch main has been updated by jhb:
> 
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=d84a691a3590c85a4068dd23644efa478c368a03
> 
> commit d84a691a3590c85a4068dd23644efa478c368a03
> Author:     John Baldwin <jhb@FreeBSD.org>
> AuthorDate: 2026-05-19 19:53:46 +0000
> Commit:     John Baldwin <jhb@FreeBSD.org>
> CommitDate: 2026-05-19 19:53:46 +0000
> 
>     powerpc: Remove stale include line from MPC85XX
>     
>     The stale include line caused config -m to fail with an error
> trying to parse the config file during make universe/tinderbox which
> in turn caused universe/tinderbox to abort without building any
> powerpc kernels (or subsequent architectures such as riscv64) with
> the error: 
>     make[2]: freebsd/main/Makefile:767: Target architecture for
> powerpc/conf/MPC85XX unknown.  config(8) likely too old. in .for loop
> from freebsd/main/Makefile:761 with kernel = MPC85XX in make[2] in
> directory "freebsd/main" 
>     make[2]: stopped making "universe_kernels" in freebsd/main
>     *** Error code 1
>     
>     Reported by:    npn, many others
>     Fixes:          fd8d34ce272b ("dpaa: Migrate from NCSW base to a
> home-grown driver") ---
>  sys/powerpc/conf/MPC85XX | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
> index c74819c7fee0..521ec21c3234 100644
> --- a/sys/powerpc/conf/MPC85XX
> +++ b/sys/powerpc/conf/MPC85XX
> @@ -9,7 +9,6 @@ ident		MPC85XX
>  
>  machine		powerpc	powerpc
>  
> -include 	"dpaa/config.dpaa"
>  makeoptions	DEBUG=-g		#Build kernel with gdb(1)
> debug symbols makeoptions	WITH_CTF=1
>  
> 

Oops, sorry!  I thought I'd get an email if the build fails, but I
guess the CI build only does 64-bit kernels?

- Justin