On Tue, 06 Jan 2009 12:36:20 -0500 Robert Noland <rnol...@freebsd.org> wrote:
> I am planning to merge most all of the drm from -CURRENT to releng_7 > shortly. The merge that I have staged includes the following. > > Merged /head/sys:r182080,182467-182469,182883-182884,183573,183603-183605, > 183828,183830-183834,184212-184213,184263,184373-184375 > > There are really too many updates/fixes to mention as the drm from 7 > is more than 2 years old now. This has support for several newer > Intel and AMD/ATI chips, (no r6/7xx yet, but soon(tm)). > > I have a patch available for testing at > http://people.freebsd.org/~rnoland/drm-update-7-010609.patch.bz2 Applied fine to my RELENG_7 / amd64 system (freshly cvsup'ed and built yesterday): r...@kg-v2# uname -a FreeBSD kg-v2.kg4.no 7.1-STABLE FreeBSD 7.1-STABLE #1: Tue Jan 6 21:49:31 CET 2009 r...@kg-v2.kg4.no:/usr/obj/usr/src/sys/GENERIC amd64 - except for the patch to sys/modules/drm/i915/Makefile: The text leading up to this was: -------------------------- |diff -uNrp -x .svn |sys/modules/drm/i915/Makefile /home/rnoland/freebsd/base/stable/7/sys/modules/drm/i915/Makefile |--- sys/modules/drm/i915/Makefile 2009-01-06 10:58:41.000000000 |-0500 ++ |+ /home/rnoland/freebsd/base/stable/7/sys/modules/drm/i915/Makefile |2008-12-10 21:48:19.000000000 -0500 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 2. 1 out of 1 hunks failed--saving rejects to Makefile.rej Apparently patch gets confuseed when it finds a file with the same name in the current directory (which was /usr/src), or perhaps I don't know how to tell patch how to find the right file. I just did: cd /usr/src patch < /dir/name/patchfile Anyway, a 'make kernel' fails: mkdep -f .depend -a -nostdinc -D_KERNEL -DKLD_MODULE -DHAVE_KERNEL_OPTION_HEADERS -I. -I@ -I@/contrib/altq -I/usr/obj/usr/src/sys/GENERIC /usr/src/sys/modules/drm/drm/../../../dev/drm/ati_pcigart.c /usr/src/sys/modules/drm/drm/.. /../../dev/drm/drm_agpsupport.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_auth.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_bufs.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_context.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_dma.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_drawable.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_drv.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_fops.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_ioctl.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_irq.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_lock.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_memory.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_pci.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_scatter.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_sysctl.c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_vm.c In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/ati_pcigart.c:37: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_agpsupport.c:39: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_auth.c:39: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_bufs.c:40: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_context.c:38: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_dma.c:42: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_drawable.c:39: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_drv.c:41: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_fops.c:40: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_ioctl.c:39: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_irq.c:36: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_lock.c:53: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_memory.c:42: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_pci.c:34: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_scatter.c:40: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_sysctl.c:32: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory In file included from /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_vm.c:31: @/dev/drm/drmP.h:96:34: error: dev/drm/drm_internal.h: No such file or directory mkdep: compile failed *** Error code 1 Stop in /usr/src/sys/modules/drm/drm. *** Error code 1 Stop in /usr/src/sys/modules/drm. *** Error code 1 Stop in /usr/src/sys/modules. *** Error code 1 Stop in /usr/obj/usr/src/sys/GENERIC. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. HTH -- Regards, Torfinn Ingolfsen _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
