Module Name: src
Committed By: mrg
Date: Sat Nov 12 02:20:16 UTC 2022
Modified Files:
src: UPDATING
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libdrm: shlib_version
src/usr.bin/kdump: Makefile.ioctl-c
Log Message:
updates for libdrm 2.4.114.
unfortunately, the i915 ioctls are no longer handled by kdump/ktruss
as the new one conflicts with base. this needs a clean build in these
dirs (and rescue). the radeon ioctls have been enabled instead.
To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/UPDATING
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/kdump/Makefile.ioctl-c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.333 src/UPDATING:1.334
--- src/UPDATING:1.333 Sat Oct 8 08:21:56 2022
+++ src/UPDATING Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.333 2022/10/08 08:21:56 riastradh Exp $
+$NetBSD: UPDATING,v 1.334 2022/11/12 02:20:15 mrg Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,17 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^^^^^^^^^^^^^
+20221111:
+ The new libdrm import worsened the conflict issues for the
+ kdump/ktruss ioctl, and i915 now conflicts with base, and has
+ been turned off. This will cause update build issues like:
+
+ kdump-ioctl.c:12175:143: error: 'DRM_IOCTL_I915_DESTROY_HEAP'
+ undeclared here (not in a function);
+ did you mean 'DRM_IOCTL_MODE_DESTROY_DUMB'?
+
+ You'll need to clean usr.bin/ktruss, usr.bin/kdump, and rescue.
+
20220921:
Since the kernel version was bumped to 9.99.100, the bootloader
must be updated on x86 or EFI boot platforms in order to load
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.100 src/distrib/sets/lists/xbase/shl.mi:1.101
--- src/distrib/sets/lists/xbase/shl.mi:1.100 Sat Nov 12 02:03:08 2022
+++ src/distrib/sets/lists/xbase/shl.mi Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.100 2022/11/12 02:03:08 mrg Exp $
+# $NetBSD: shl.mi,v 1.101 2022/11/12 02:20:15 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -166,7 +166,7 @@
./usr/X11R7/lib/libXxf86vm.so.2.0 xbase-libXxf86vm-lib xorg,compatx11file
./usr/X11R7/lib/libdrm.so xbase-libdrm-lib xorg,compatx11file
./usr/X11R7/lib/libdrm.so.3 xbase-libdrm-lib xorg,compatx11file
-./usr/X11R7/lib/libdrm.so.3.6 xbase-libdrm-lib xorg,compatx11file
+./usr/X11R7/lib/libdrm.so.3.7 xbase-libdrm-lib xorg,compatx11file
./usr/X11R7/lib/libdrm_radeon.so xbase-libdrm_radeon-lib xorg,compatx11file
./usr/X11R7/lib/libdrm_radeon.so.0 xbase-libdrm_radeon-lib xorg,compatx11file
./usr/X11R7/lib/libdrm_radeon.so.0.0 xbase-libdrm_radeon-lib xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.66 src/distrib/sets/lists/xdebug/shl.mi:1.67
--- src/distrib/sets/lists/xdebug/shl.mi:1.66 Sat Nov 12 02:03:08 2022
+++ src/distrib/sets/lists/xdebug/shl.mi Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.66 2022/11/12 02:03:08 mrg Exp $
+# $NetBSD: shl.mi,v 1.67 2022/11/12 02:20:15 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete obsolete
@@ -56,7 +56,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug xdebug-libXxf86dga-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug xdebug-libXxf86misc-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug xdebug-libXxf86vm-debug xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.6.debug xdebug-libdrm-debug xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.7.debug xdebug-libdrm-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug xdebug-libdrm_radeon-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.1.debug xdebug-libepoxy-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug xdebug-obsolete xorg,obsolete,compatx11file
Index: src/external/mit/xorg/lib/libdrm/shlib_version
diff -u src/external/mit/xorg/lib/libdrm/shlib_version:1.8 src/external/mit/xorg/lib/libdrm/shlib_version:1.9
--- src/external/mit/xorg/lib/libdrm/shlib_version:1.8 Mon Jul 11 19:33:33 2022
+++ src/external/mit/xorg/lib/libdrm/shlib_version Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.8 2022/07/11 19:33:33 mrg Exp $
+# $NetBSD: shlib_version,v 1.9 2022/11/12 02:20:15 mrg Exp $
#
major=3
-minor=6
+minor=7
Index: src/usr.bin/kdump/Makefile.ioctl-c
diff -u src/usr.bin/kdump/Makefile.ioctl-c:1.38 src/usr.bin/kdump/Makefile.ioctl-c:1.39
--- src/usr.bin/kdump/Makefile.ioctl-c:1.38 Sat Sep 29 14:41:36 2018
+++ src/usr.bin/kdump/Makefile.ioctl-c Sat Nov 12 02:20:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ioctl-c,v 1.38 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile.ioctl-c,v 1.39 2022/11/12 02:20:16 mrg Exp $
# NOTE: <bsd.own.mk> needs to be previously .included for NETBSDSRCDIR
@@ -50,14 +50,17 @@ CWARNFLAGS+= -Wno-unknown-pragmas
.endif
CPPFLAGS+= -D_DEV_IC_BT8XX_H_
CPPFLAGS+= -D_ALTQ_ALTQ_JOBS_H_ # redefinition of inline
+CPPFLAGS+= -D_I915_DRM_H_ # Dup ioctls
+# Once upon a time these only conflicted with themselves, but noe
+# the i915 version conflicts with base ioctls, so that one is now
+# always must be excluded.
# De-select one, dup ioctls
CPPFLAGS+= -D_VIA_DRM_H_ # Missing header
-#CPPFLAGS+= -D_I915_DRM_H_ # Dup ioctls
CPPFLAGS+= -DQXL_DRM_H # Dup ioctls
CPPFLAGS+= -D__R128_DRM_H__ # Dup ioctls
CPPFLAGS+= -D__SIS_DRM_H__ # Dup ioctls
CPPFLAGS+= -D__SAVAGE_DRM_H__ # Dup ioctls
-CPPFLAGS+= -D__RADEON_DRM_H__ # Dup ioctls
+#CPPFLAGS+= -D__RADEON_DRM_H__ # Dup ioctls
CPPFLAGS+= -D__MACH64_DRM_H__ # Dup ioctls
CPPFLAGS+= -D__MGA_DRM_H__ # Dup ioctls
