[src/trunk]: src/sys/external/bsd/drm2/drm No more hacks for dist/uapi -- got...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/32d5e8e74b3a
branches:  trunk
changeset: 1027773:32d5e8e74b3a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:27:52 2021 +0000

description:
No more hacks for dist/uapi -- got moved to dist/include/uapi.

diffstat:

 sys/external/bsd/drm2/drm/files.drmkms |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (24 lines):

diff -r a8927afbbf3a -r 32d5e8e74b3a sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 00:27:46 2021 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 00:27:52 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.39 2021/12/19 00:26:16 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.40 2021/12/19 00:27:52 riastradh Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -25,13 +25,7 @@
 # Then upstream.
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
 makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
-makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
-
-# Must come last because some header file names are repeated in
-# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
-# explicitly write <uapi/...>.  (Maybe that should have been imported
-# under dist/include/uapi rather than dist/uapi.)
-makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist"
+makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
 
 # XXX Should probably be in a header file.  opt_drmkms.h?
 makeoptions    drmkms  CPPFLAGS+="-D__KERNEL__"