Re: build fails for amd64, i386 kernels w/legacy DRM (UMS) support

[Robert Swindells <rjs%fdy2.co.uk@localhost>]

"John D. Baker" <jdbaker%consolidated.net@localhost> wrote:
>Kernels w/o DRMKMS but with the older DRM UMS drivers fail with:
>
>[...]
>#      link  VERTHANDI/netbsd
>/r0/build/current/tools/amd64/bin/i486--netbsdelf-ld -Map netbsd.map --cref -T netbsd.ldscript -Ttext c0100000 -e start -X -o netbsd ${SYSTEM_OBJ:[@]:Nswapnetbsd.o} ${EXTRA_OBJ} vers.o swapnetbsd.o
>/r0/build/current/tools/amd64/bin/i486--netbsdelf-ld: drm_stub.o: in function `drm_ioctl':
>/x/current/src/sys/external/bsd/drm2/drm/drm_stub.c:41: multiple definition of `drm_ioctl'; drm_drv.o:/x/current/src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:962: first defined here
>*** [netbsd] Error code 1

>I noticed the following commit:
>
>  http://mail-index.netbsd.org/source-changes/2019/11/16/msg110862.html
>
>Can this be adjusted to accomodate legacy DRM?

Does this work ?

Index: files.drmkms
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/drm/files.drmkms,v
retrieving revision 1.31
diff -u -r1.31 files.drmkms
--- files.drmkms        16 Nov 2019 04:10:33 -0000      1.31
+++ files.drmkms        18 Nov 2019 16:42:00 -0000
@@ -100,4 +100,4 @@
 file   external/bsd/drm2/dist/drm/drm_trace_points.c   drmkms
 file   external/bsd/drm2/drm/drm_vm.c  drmkms
 file   external/bsd/drm2/drm/drm_vma_manager.c drmkms
-file   external/bsd/drm2/drm/drm_stub.c        !drmkms
+file   external/bsd/drm2/drm/drm_stub.c        !drmkms & !drmbase