On Wed, Mar 17, 2004 at 09:14:52AM +0000, Keith Whitwell wrote: > Jon Smirl wrote: > >This patch switches the dri build over to use the new standalone drm tree. > > > >You will need to check out the new drm tree from the dri CVS root > >Apply the patch to dri > >DRMSrcDir in config/cf/host.def needs to be edited to point to your copy > >of the > >drm tree > >You will also need to fix MesaSrcDir > >make World > > > >dri branches will also need to apply this patch > > > Checkout still fails: > > [EMAIL PROTECTED] xc-trunk]$ cvs checkout drm > cvs checkout: Updating drm > cvs checkout: Updating drm/bsd > U drm/bsd/Imakefile > U drm/bsd/Makefile.bsd > U drm/bsd/ati_pcigart.h > U drm/bsd/drmP.h > U drm/bsd/drm_agpsupport.h > U drm/bsd/drm_auth.h > U drm/bsd/drm_bufs.h > U drm/bsd/drm_context.h > U drm/bsd/drm_dma.h > U drm/bsd/drm_drawable.h > U drm/bsd/drm_drv.h > U drm/bsd/drm_fops.h > U drm/bsd/drm_ioctl.h > U drm/bsd/drm_irq.h > U drm/bsd/drm_lock.h > U drm/bsd/drm_memory.h > U drm/bsd/drm_memory_debug.h > U drm/bsd/drm_os_freebsd.h > U drm/bsd/drm_os_netbsd.h > U drm/bsd/drm_pci.h > U drm/bsd/drm_scatter.h > U drm/bsd/drm_sysctl.h > U drm/bsd/drm_vm.h > U drm/bsd/mga_drv.c > U drm/bsd/r128_drv.c > U drm/bsd/radeon_drv.c > U drm/bsd/sis_drv.c > U drm/bsd/tdfx_drv.c > cvs checkout: Updating drm/bsd/drm > cvs checkout: failed to create lock directory for `/cvs/dri/drm/bsd/drm' > (/cvs/dri/drm/bsd/drm/#cvs.lock): Permission denied > cvs checkout: failed to obtain dir lock in repository `/cvs/dri/drm/bsd/drm' > cvs [checkout aborted]: read lock failed - giving up > > > >I tried to patch up the bsd build but I don't run bsd so could someone > >please > >check it. > > > >Give me feedback and I can adjust the drm directory structure or the > >patch. When > >everyone likes the new setup I will commit the patch. It will only take a > >minute > >to do the switch over, I'll recopy the drm CVS v files when switching to > >pick up > >any new checkins. > > > >After the switch I can remove these directories from dri: > >/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel > >/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel > >/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel > >Delete these locally if you want to make sure the patch is working > > We want to make sure it is still relatively easy for XFree86 to pull in new > versions of the DRM. If we're making a shellscript to translate our files > into the kernel's structure, maybe one to do the same job for XFree86 is > sensible.
Indeed Keith. I'd also like to mention that the Imakefile's or Makefile.linux/bsd will still need to be in some form in these three directories. xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel The reason being is that this new drm module is more than likely going to get imported into... xc/extras/drm and then symlinked into the original directories with the Imakefile during the XFree86 build process. Alan. ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click -- _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
