El 10 de febrer de 2012 19:42, Robert Millan <r...@freebsd.org> ha escrit: > Here's a possible solution to this patch (untested). In case it looks > fine to everyone (and my mentors approve it), I'll definitely test > with "make universe" before commit.
Another possibility (perhaps a better one) would be to move those files off sys/${MACHINE}/conf directories, then they won't be picked up by "universe". Since they're not ${MACHINE}-specific, would sys/conf/ be a good location? Patch is attached.
Index: sys/i386/conf/WITHOUT_SOURCELESS_HOST =================================================================== --- sys/i386/conf/WITHOUT_SOURCELESS_HOST (revision 230971) +++ sys/i386/conf/WITHOUT_SOURCELESS_HOST (working copy) @@ -1,10 +0,0 @@ -# -# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless -# native code for host CPU. -# -# $FreeBSD$ - -nodevice hpt27xx -nodevice hptmv -nodevice hptrr -nodevice nve Index: sys/i386/conf/WITHOUT_SOURCELESS_UCODE =================================================================== --- sys/i386/conf/WITHOUT_SOURCELESS_UCODE (revision 230971) +++ sys/i386/conf/WITHOUT_SOURCELESS_UCODE (working copy) @@ -1,41 +0,0 @@ -# -# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless -# microcode. -# -# $FreeBSD$ - -nodevice adw -nodevice bce -nodevice fatm -nodevice fxp -nodevice ispfw -nodevice mwlfw -nodevice ralfw -nodevice runfw -nodevice sf -nodevice sn -nodevice ti -nodevice txp -nodevice ce -nodevice cp -nodevice ctau -nodevice ipwfw -nodevice iwifw -nodevice iwnfw -nodevice wpifw - -# drm -nodevice mga -nodevice r128 -nodevice radeon - -# sound -nodevice csa -nodevice ds1 -nodevice maestro3 - -# usb -nodevice rum -nodevice uath -nodevice zyd -nodevice kue Index: sys/i386/conf/WITHOUT_SOURCELESS =================================================================== --- sys/i386/conf/WITHOUT_SOURCELESS (revision 230971) +++ sys/i386/conf/WITHOUT_SOURCELESS (working copy) @@ -1,7 +0,0 @@ -# -# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code. -# -# $FreeBSD$ - -include WITHOUT_SOURCELESS_HOST -include WITHOUT_SOURCELESS_UCODE Index: sys/amd64/conf/WITHOUT_SOURCELESS_HOST =================================================================== --- sys/amd64/conf/WITHOUT_SOURCELESS_HOST (revision 230971) +++ sys/amd64/conf/WITHOUT_SOURCELESS_HOST (working copy) @@ -1,10 +0,0 @@ -# -# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless -# native code for host CPU. -# -# $FreeBSD$ - -nodevice hpt27xx -nodevice hptmv -nodevice hptrr -nodevice nve Index: sys/amd64/conf/WITHOUT_SOURCELESS_UCODE =================================================================== --- sys/amd64/conf/WITHOUT_SOURCELESS_UCODE (revision 230971) +++ sys/amd64/conf/WITHOUT_SOURCELESS_UCODE (working copy) @@ -1,41 +0,0 @@ -# -# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless -# microcode. -# -# $FreeBSD$ - -nodevice adw -nodevice bce -nodevice fatm -nodevice fxp -nodevice ispfw -nodevice mwlfw -nodevice ralfw -nodevice runfw -nodevice sf -nodevice sn -nodevice ti -nodevice txp -nodevice ce -nodevice cp -nodevice ctau -nodevice ipwfw -nodevice iwifw -nodevice iwnfw -nodevice wpifw - -# drm -nodevice mga -nodevice r128 -nodevice radeon - -# sound -nodevice csa -nodevice ds1 -nodevice maestro3 - -# usb -nodevice rum -nodevice uath -nodevice zyd -nodevice kue Index: sys/amd64/conf/WITHOUT_SOURCELESS =================================================================== --- sys/amd64/conf/WITHOUT_SOURCELESS (revision 230971) +++ sys/amd64/conf/WITHOUT_SOURCELESS (working copy) @@ -1,7 +0,0 @@ -# -# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code. -# -# $FreeBSD$ - -include WITHOUT_SOURCELESS_HOST -include WITHOUT_SOURCELESS_UCODE
_______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"