From owner-freebsd-bugs@FreeBSD.ORG Mon Jun 25 12:50:03 2007 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2959D16A469 for ; Mon, 25 Jun 2007 12:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 0A37113C45D for ; Mon, 25 Jun 2007 12:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l5PCo295012910 for ; Mon, 25 Jun 2007 12:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l5PCo27i012909; Mon, 25 Jun 2007 12:50:02 GMT (envelope-from gnats) Resent-Date: Mon, 25 Jun 2007 12:50:02 GMT Resent-Message-Id: <200706251250.l5PCo27i012909@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Cedric GROSS Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B84B316A469 for ; Mon, 25 Jun 2007 12:47:57 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id A9CB513C4BA for ; Mon, 25 Jun 2007 12:47:57 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l5PClvP6055376 for ; Mon, 25 Jun 2007 12:47:57 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l5PClvdm055375; Mon, 25 Jun 2007 12:47:57 GMT (envelope-from nobody) Message-Id: <200706251247.l5PClvdm055375@www.freebsd.org> Date: Mon, 25 Jun 2007 12:47:57 GMT From: Cedric GROSS To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: conf/114013: [patch] WITHOUT_USB allow to compil a lot of USB stuff X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 12:50:03 -0000 >Number: 114013 >Category: conf >Synopsis: [patch] WITHOUT_USB allow to compil a lot of USB stuff >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jun 25 12:50:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Cedric GROSS >Release: FreeBSD 7.0-CURRENT >Organization: CNV >Environment: FreeBSD 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Wed Jun 20 10:22:30 CEST 2007 root@:/usr/obj/usr/src/sys/VIRT i386 >Description: WITHOUT_USB set in src.conf allow to compile usb kernel modules (umass,umodem,uscanner etc...) >How-To-Repeat: Set WITHOUT_USB to yes, make buildworld >Fix: Change src/sys/modules/Makefile to doesn't include usb related module or device. Patch also apply on src/tools/build/mk/OptionalObsoleteFiles.inc for make delete-old* feature. Patch attached with submission follows: --- src/tools/build/mk/OptionalObsoleteFiles.inc.origin 2007-04-06 04:13:30.000000000 +0200 +++ src/tools/build/mk/OptionalObsoleteFiles.inc 2007-06-22 05:08:58.000000000 +0200 @@ -1173,6 +1173,14 @@ # to be filled in #.endif -#.if ${MK_USB} == no -# to be filled in -#.endif +.if ${MK_USB} == no +OLD_FILES+=usr/bin/usbhidaction +OLD_FILES+=usr/bin/usbhidctl +OLD_FILES+=usr/sbin/usbdevs +OLD_LIBS+=usr/lib/libusbhid.a +OLD_LIBS+=usr/lib/libusbhid.so +OLD_LIBS+=usr/lib/libusbhid.so.2 +OLD_LIBS+=usr/lib/libusbhid.so.3 +OLD_LIBS+=usr/lib/libusbhid_p.a +OLD_FILES+=usr/share/man/man3/libusbhid.3.gz +.endif --- src/sys/modules/Makefile.origin 2007-06-16 03:56:05.000000000 +0200 +++ src/sys/modules/Makefile 2007-06-22 05:05:41.000000000 +0200 @@ -30,10 +30,10 @@ ath_rate_amrr \ ath_rate_onoe \ ${_ath_rate_sample} \ - aue \ + ${_aue} \ ${_auxio} \ ${_awi} \ - axe \ + ${_axe} \ bce \ bfe \ bge \ @@ -47,7 +47,7 @@ ${_cbb} \ cd9660 \ cd9660_iconv \ - cdce \ + ${_cdce} \ ${_ce} \ ${_ciss} \ ${_cm} \ @@ -60,7 +60,7 @@ ${_cryptodev} \ ${_cs} \ ${_ctau} \ - cue \ + ${_cue} \ cxgb \ ${_cx} \ dc \ @@ -134,7 +134,7 @@ ${_ixgb} \ joy \ kbdmux \ - kue \ + ${_kue} \ le \ lge \ libalias \ @@ -218,8 +218,8 @@ rl \ rp \ ${_rr232x} \ - rue \ - rum \ + ${_rue} \ + ${_rum} \ ${_s3} \ ${_safe} \ ${_sbni} \ @@ -256,38 +256,38 @@ twe \ tx \ txp \ - uark \ + ${_uark} \ uart \ - ubsa \ + ${_ubsa} \ ubsec \ - ubser \ - ucom \ - ucycom \ - udav \ - udbp \ + ${_ubser} \ + ${_ucom} \ + ${_ucycom} \ + ${_udav} \ + ${_udbp} \ udf \ udf_iconv \ - ufm \ + ${_ufm} \ ${_ufs} \ - ufoma \ - uftdi \ - ugen \ - uhid \ - ukbd \ - ulpt \ - umass \ - umct \ - umodem \ - ums \ + ${_ufoma} \ + ${_uftdi} \ + ${_ugen} \ + ${_uhid} \ + ${_ukbd} \ + ${_ulpt} \ + ${_umass} \ + ${_umct} \ + ${_umodem} \ + ${_ums} \ unionfs \ - uplcom \ - ural \ - urio \ - usb \ - uscanner \ + ${_uplcom}\ + ${_ural} \ + ${_urio} \ + ${_usb} \ + ${_uscanner} \ utopia \ - uvisor \ - uvscom \ + ${_uvisor} \ + ${_uvscom} \ ${_vesa} \ vge \ vkbd \ @@ -339,6 +339,42 @@ _pflog= pflog .endif +.if ${MK_USB} != "no" || defined(ALL_MODULES) +_aue=aue +_axe=axe +_cdce=cdce +_cue=cue +_kue=kue +_rue=rue +_rum=rum +_uark=uark +_ubsa=ubsa +_ubser=ubser +_ucom=ucom +_ucycom=ucycom +_udav=udav +_udbp=udbp +_ufm=ufm +_ufoma=ufoma +_uftdi=uftdi +_ugen=ugen +_uhid=uhid +_uipaq=uipaq +_ukbd=ukbd +_ulpt=ulpt +_umass=umass +_umct=umct +_umodem=umodem +_ums=ums +_uplcom=uplcom +_ural=ural +_urio=urio +_usb=usb +_uscanner=uscanner +_uvisor=uvisor +_uvscom=uvscom +.endif + .if ${MACHINE_ARCH} == "i386" # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. >Release-Note: >Audit-Trail: >Unformatted: