From: lxoliva Date: Mon, 19 May 2008 00:27:18 +0000 (+0000) Subject: Make all actions verbose. Remove ./ from pathnames. X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=045cd27ce15ba088fa9d8bc2ef29b38129e57586;p=releases.git Make all actions verbose. Remove ./ from pathnames. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3554 559672b5-ba27-0410-b829-e8f1faed8b1b --- diff --git a/deblob-2.6.23 b/deblob-2.6.23 index 9ba01b10675..55a65af8b39 100755 --- a/deblob-2.6.23 +++ b/deblob-2.6.23 @@ -71,6 +71,7 @@ function clean_blob { #$1 = filename if test -f $check; then name=$1 + echo Removing blobs from $name set fnord "$@" -d shift 2 $check "$@" $name > $name.deblob @@ -82,6 +83,7 @@ function clean_blob { function clean_kconfig { #$1 = filename $2 = things to remove + echo Marking config $2 as depending on NONFREE in $1 sed "/^config $2\$/{p;i\ depends on NONFREE d;}" $1 > $1.deblob @@ -91,11 +93,19 @@ d;}" $1 > $1.deblob function clean_mk { #$1 = config $2 = Makefile name # We don't clean up Makefiles any more --lxoliva - : sed -i "/($1)/d" $2 + # sed -i "/($1)/d" $2 + # check_changed $2 + if sed -n "/($1)/p" $2 | grep . > /dev/null; then + : + else + echo $2 does not contain matches for $1 + exit 1 + fi } function clean_ifdef { #$1 = filename $2 = macro to -U + echo unifdefing $1 with -U$2 unifdef $1 -U$2 > $1.deblob check_changed $1 } @@ -118,14 +128,14 @@ clean_blob drivers/atm/atmsar11.data # There's only GPLed code in this one. --lxoliva # clean_file drivers/atm/fore200e_mkfirm.c -clean_kconfig ./drivers/atm/Kconfig 'ATM_\(FORE\).*' -clean_mk CONFIG_ATM_FORE200E ./drivers/atm/Makefile +clean_kconfig drivers/atm/Kconfig 'ATM_\(FORE\).*' +clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile clean_file drivers/atm/pca200e.data clean_file drivers/atm/pca200e_ecd.data clean_file drivers/atm/sba200e_ecd.data -clean_kconfig ./drivers/atm/Kconfig 'ATM_AMBASSADOR' -clean_mk CONFIG_ATM_AMBASSADOR ./drivers/atm/Makefile +clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR' +clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile ######################## @@ -134,30 +144,30 @@ clean_mk CONFIG_ATM_AMBASSADOR ./drivers/atm/Makefile # COMPUTONE - Computone IntelliPort Plus serial clean_blob drivers/char/ip2/fip_firm.h -clean_kconfig ./drivers/char/Kconfig 'COMPUTONE' -clean_mk CONFIG_COMPUTONE ./drivers/char/Makefile +clean_kconfig drivers/char/Kconfig 'COMPUTONE' +clean_mk CONFIG_COMPUTONE drivers/char/Makefile # DSP56001 Device Driver clean_blob drivers/char/dsp56k.c -clean_kconfig ./arch/m68k/Kconfig 'ATARI_DSP56K' -clean_mk CONFIG_ATARI_DSP56K ./drivers/char/Makefile +clean_kconfig arch/m68k/Kconfig 'ATARI_DSP56K' +clean_mk CONFIG_ATARI_DSP56K drivers/char/Makefile # drm # DRM_MGA - Matrox g200/g400 clean_blob drivers/char/drm/mga_ucode.h -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_MGA' -clean_mk CONFIG_DRM_MGA ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_MGA' +clean_mk CONFIG_DRM_MGA drivers/char/drm/Makefile # DRM_R128 - ATI Rage 128 clean_blob drivers/char/drm/r128_cce.c -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_R128' -clean_mk CONFIG_DRM_R128 ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_R128' +clean_mk CONFIG_DRM_R128 drivers/char/drm/Makefile # DRM_RADEON - ATI Radeon clean_blob drivers/char/drm/radeon_cp.c -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_RADEON' -clean_mk CONFIG_DRM_RADEON ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_RADEON' +clean_mk CONFIG_DRM_RADEON drivers/char/drm/Makefile ######################### @@ -167,105 +177,105 @@ clean_mk CONFIG_DRM_RADEON ./drivers/char/drm/Makefile # dvb/dvb-usb clean_blob drivers/media/dvb/dvb-usb/af9005-script.h -clean_kconfig ./drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' -clean_mk CONFIG_DVB_USB_AF9005 ./drivers/media/dvb/dvb-usb/Makefile +clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' +clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile # dvb/frontends # DVB_TDA10021 - Philips TDA10021 based clean_blob drivers/media/dvb/frontends/tda10021.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' -clean_mk CONFIG_DVB_TDA10021 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' +clean_mk CONFIG_DVB_TDA10021 drivers/media/dvb/frontends/Makefile # DVB_TDA8083 - Philips TDA8083 based clean_blob drivers/media/dvb/frontends/tda8083.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' -clean_mk CONFIG_DVB_TDA8083 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' +clean_mk CONFIG_DVB_TDA8083 drivers/media/dvb/frontends/Makefile # DVB_VES1820 - VLSI VES1820 based clean_blob drivers/media/dvb/frontends/ves1820.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' -clean_mk CONFIG_DVB_VES1820 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' +clean_mk CONFIG_DVB_VES1820 drivers/media/dvb/frontends/Makefile # DVB_VES1X93 - VLSI VES1893 or VES1993 based clean_blob drivers/media/dvb/frontends/ves1x93.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' -clean_mk CONFIG_DVB_VES1X93 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' +clean_mk CONFIG_DVB_VES1X93 drivers/media/dvb/frontends/Makefile # dvb/ttpci # DVB_AV7110 - AV7110 cards clean_blob drivers/media/dvb/ttpci/av7110_hw.c clean_blob drivers/media/dvb/ttpci/av7110.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' -clean_mk CONFIG_DVB_AV7110 ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' +clean_mk CONFIG_DVB_AV7110 drivers/media/dvb/ttpci/Makefile # DVB_BUDGET_AV - Budget cards with analog video inputs clean_blob drivers/media/dvb/ttpci/budget-av.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' -clean_mk CONFIG_DVB_BUDGET_AV ./drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET_PATCH ./drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' +clean_mk CONFIG_DVB_BUDGET_AV drivers/media/dvb/ttpci/Makefile +clean_mk CONFIG_DVB_BUDGET_PATCH drivers/media/dvb/ttpci/Makefile +clean_mk CONFIG_DVB_BUDGET drivers/media/dvb/ttpci/Makefile # DVB_BUDGET_CI - Budget cards with onboard CI connector clean_blob drivers/media/dvb/ttpci/budget-ci.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' -clean_mk CONFIG_DVB_BUDGET_CI ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' +clean_mk CONFIG_DVB_BUDGET_CI drivers/media/dvb/ttpci/Makefile # dvb/ttusb-budget # DVB_TTUSB_BUDGET - Technotrend/Hauppauge Nova-USB devices clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c -clean_kconfig ./drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' -clean_mk CONFIG_DVB_TTUSB_BUDGET ./drivers/media/dvb/ttusb-budget/Makefile +clean_kconfig drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' +clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/dvb/ttusb-budget/Makefile # video # USB_PWC - USB Philips Cameras clean_blob drivers/media/video/pwc/pwc-kiara.c clean_blob drivers/media/video/pwc/pwc-timon.c -clean_kconfig ./drivers/media/video/pwc/Kconfig 'USB_PWC' -clean_mk CONFIG_USB_PWC ./drivers/media/video/Makefile +clean_kconfig drivers/media/video/pwc/Kconfig 'USB_PWC' +clean_mk CONFIG_USB_PWC drivers/media/video/Makefile # VIDEO_CPIA - CPiA Video For Linux clean_blob drivers/media/video/cpia2/cpia2patch.h -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA' -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA_PP' -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA_USB' -clean_kconfig ./drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' -clean_mk CONFIG_VIDEO_CPIA ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_PP ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_USB ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA2 ./drivers/media/video/Makefile +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA' +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_PP' +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_USB' +clean_kconfig drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' +clean_mk CONFIG_VIDEO_CPIA drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA_PP drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA_USB drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/Makefile # USB_DABUSB - DABUSB driver clean_blob drivers/media/video/dabfirmware.h -clean_kconfig ./drivers/media/Kconfig 'USB_DABUSB' -clean_mk CONFIG_USB_DABUSB ./drivers/media/video/Makefile +clean_kconfig drivers/media/Kconfig 'USB_DABUSB' +clean_mk CONFIG_USB_DABUSB drivers/media/video/Makefile # video/usbvideo # USB_IBMCAM - USB IBM (Xirlink) C-it Camera support clean_blob drivers/media/video/usbvideo/ibmcam.c -clean_kconfig ./drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' -clean_mk CONFIG_USB_IBMCAM ./drivers/media/video/usbvideo/Makefile +clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' +clean_mk CONFIG_USB_IBMCAM drivers/media/video/usbvideo/Makefile # USB_VICAM - USB 3com HomeConnect (aka vicam) clean_blob drivers/media/video/usbvideo/vicam.c -clean_kconfig ./drivers/media/video/usbvideo/Kconfig 'USB_VICAM' -clean_mk CONFIG_USB_VICAM ./drivers/media/video/usbvideo/Makefile +clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM' +clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile # other... # disable -- appears to neeed other DVB bits -clean_mk CONFIG_DVB_CORE ./drivers/media/Makefile -clean_mk CONFIG_VIDEOBUF_DVB ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_SAA7134 ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CX88 ./drivers/media/video/Makefile -clean_kconfig ./drivers/media/Kconfig 'VIDEOBUF_DVB' +clean_mk CONFIG_DVB_CORE drivers/media/Makefile +clean_mk CONFIG_VIDEOBUF_DVB drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_SAA7134 drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CX88 drivers/media/video/Makefile +clean_kconfig drivers/media/Kconfig 'VIDEOBUF_DVB' ####################### # Removed net Drivers # @@ -274,42 +284,42 @@ clean_kconfig ./drivers/media/Kconfig 'VIDEOBUF_DVB' # ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit clean_blob drivers/net/acenic_firmware.h -clean_kconfig ./drivers/net/Kconfig 'ACENIC' -clean_mk CONFIG_ACENIC ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'ACENIC' +clean_mk CONFIG_ACENIC drivers/net/Makefile # ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support # This adds restrictions on top of GPLv2, but after deblobbing, # nothing copyrightable remains. clean_blob drivers/net/starfire_firmware.h -clean_kconfig ./drivers/net/Kconfig 'ADAPTEC_STARFIRE' -clean_mk CONFIG_ADAPTEC_STARFIRE ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE' +clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile # BNX2 - Broadcom NetXtremeII clean_blob drivers/net/bnx2_fw.h clean_blob drivers/net/bnx2_fw2.h -clean_kconfig ./drivers/net/Kconfig 'BNX2' -clean_mk CONFIG_BNX2 ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'BNX2' +clean_mk CONFIG_BNX2 drivers/net/Makefile # CASSINI - Sun Cassini clean_blob drivers/net/cassini.h -clean_kconfig ./drivers/net/Kconfig 'CASSINI' -clean_mk CONFIG_CASSINI ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'CASSINI' +clean_mk CONFIG_CASSINI drivers/net/Makefile # Digi RightSwitch SE-X clean_blob drivers/net/dgrs_firmware.c -clean_kconfig ./drivers/net/Kconfig 'DGRS' -clean_mk CONFIG_DGRS ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'DGRS' +clean_mk CONFIG_DGRS drivers/net/Makefile # E100 - Intel(R) PRO/100+ clean_blob drivers/net/e100.c sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c -# clean_kconfig ./drivers/net/Kconfig 'E100' -# clean_mk CONFIG_E100 ./drivers/net/Makefile +# clean_kconfig drivers/net/Kconfig 'E100' +# clean_mk CONFIG_E100 drivers/net/Makefile # MYRI_SBUS - MyriCOM Gigabit Ethernet clean_blob drivers/net/myri_code.h -clean_kconfig ./drivers/net/Kconfig 'MYRI_SBUS' -clean_mk CONFIG_MYRI_SBUS ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'MYRI_SBUS' +clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile # TIGON3 - Broadcom Tigon3 patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch @@ -336,8 +346,8 @@ sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c # TYPHOON - 3cr990 series Typhoon clean_blob drivers/net/typhoon-firmware.h -clean_kconfig ./drivers/net/Kconfig 'TYPHOON' -clean_mk CONFIG_TYPHOON ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'TYPHOON' +clean_mk CONFIG_TYPHOON drivers/net/Makefile # appletalk @@ -346,23 +356,23 @@ clean_mk CONFIG_TYPHOON ./drivers/net/Makefile # clean_blob drivers/net/appletalk/cops.h clean_blob drivers/net/appletalk/cops_ffdrv.h clean_blob drivers/net/appletalk/cops_ltdrv.h -clean_kconfig ./drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT' -clean_mk CONFIG_COPS ./drivers/net/appletalk/Makefile +clean_kconfig drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT' +clean_mk CONFIG_COPS drivers/net/appletalk/Makefile # hamradio # YAM - YAM driver for AX.25 clean_blob drivers/net/hamradio/yam1200.h clean_blob drivers/net/hamradio/yam9600.h -clean_kconfig ./drivers/net/hamradio/Kconfig 'YAM' -clean_mk CONFIG_YAM ./drivers/net/hamradio/Makefile +clean_kconfig drivers/net/hamradio/Kconfig 'YAM' +clean_mk CONFIG_YAM drivers/net/hamradio/Makefile # pcmcia # PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA clean_blob drivers/net/pcmcia/ositech.h -clean_kconfig ./drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' -clean_mk CONFIG_PCMCIA_SMC91C92 ./drivers/net/pcmcia/Makefile +clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' +clean_mk CONFIG_PCMCIA_SMC91C92 drivers/net/pcmcia/Makefile # tokenring @@ -373,8 +383,8 @@ clean_mk CONFIG_PCMCIA_SMC91C92 ./drivers/net/pcmcia/Makefile # clean_blob drivers/net/tokenring/3c359.h # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/3c359_microcode.h -clean_kconfig ./drivers/net/tokenring/Kconfig '3C359' -clean_mk CONFIG_3C359 ./drivers/net/tokenring/Makefile +clean_kconfig drivers/net/tokenring/Kconfig '3C359' +clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile # SMCTR - SMC ISA/MCA adapter # No need to remove these, they don't contain non-Free code. @@ -382,15 +392,15 @@ clean_mk CONFIG_3C359 ./drivers/net/tokenring/Makefile # clean_blob drivers/net/tokenring/smctr.h # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/smctr_firmware.h -clean_kconfig ./drivers/net/tokenring/Kconfig 'SMCTR' -clean_mk CONFIG_SMCTR ./drivers/net/tokenring/Makefile +clean_kconfig drivers/net/tokenring/Kconfig 'SMCTR' +clean_mk CONFIG_SMCTR drivers/net/tokenring/Makefile # usb # USB_KAWETH - USB KLSI KL5USB101-based ethernet device support clean_blob drivers/net/usb/kawethfw.h -clean_kconfig ./drivers/net/usb/Kconfig 'USB_KAWETH' -clean_mk CONFIG_USB_KAWETH ./drivers/net/usb/Makefile +clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH' +clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile ######################## @@ -399,8 +409,8 @@ clean_mk CONFIG_USB_KAWETH ./drivers/net/usb/Makefile # QETH - Gigabit Ethernet device support clean_blob drivers/s390/net/qeth_mpc.c -clean_kconfig ./drivers/s390/net/Kconfig 'QETH' -clean_mk CONFIG_QETH ./drivers/s390/net/Makefile +clean_kconfig drivers/s390/net/Kconfig 'QETH' +clean_mk CONFIG_QETH drivers/s390/net/Makefile ######################## # Removed SCSI Drivers # @@ -408,20 +418,20 @@ clean_mk CONFIG_QETH ./drivers/s390/net/Makefile # SCSI_QLOGICPTI - PTI Qlogic, ISP Driver clean_blob drivers/scsi/qlogicpti_asm.c -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_QLOGICPTI' -clean_mk CONFIG_SCSI_QLOGICPTI ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGICPTI' +clean_mk CONFIG_SCSI_QLOGICPTI drivers/scsi/Makefile # SCSI_ADVANSYS - AdvanSys SCSI clean_blob drivers/scsi/advansys.c -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_ADVANSYS' -clean_mk CONFIG_SCSI_ADVANSYS ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_ADVANSYS' +clean_mk CONFIG_SCSI_ADVANSYS drivers/scsi/Makefile # SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI clean_blob drivers/scsi/ql1280_fw.h clean_blob drivers/scsi/ql1040_fw.h clean_blob drivers/scsi/ql12160_fw.h -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_QLOGIC_1280' -clean_mk CONFIG_SCSI_QLOGIC_1280 ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGIC_1280' +clean_mk CONFIG_SCSI_QLOGIC_1280 drivers/scsi/Makefile ####################### @@ -435,8 +445,8 @@ clean_mk CONFIG_SCSI_QLOGIC_1280 ./drivers/scsi/Makefile # clean_blob drivers/usb/misc/emi26.c # This file is not under the GPL, better remove it all. clean_file drivers/usb/misc/emi26_fw.h -clean_kconfig ./drivers/usb/misc/Kconfig 'USB_EMI26' -clean_mk CONFIG_USB_EMI26 ./drivers/usb/misc/Makefile +clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI26' +clean_mk CONFIG_USB_EMI26 drivers/usb/misc/Makefile # USB_EMI62 - EMI 6|2m USB Audio interface # No need to remove this, it doesn't contain non-Free code. @@ -444,77 +454,77 @@ clean_mk CONFIG_USB_EMI26 ./drivers/usb/misc/Makefile # This file are probably not under the GPL, better remove them all. clean_file drivers/usb/misc/emi62_fw_m.h clean_file drivers/usb/misc/emi62_fw_s.h -clean_kconfig ./drivers/usb/misc/Kconfig 'USB_EMI62' -clean_mk CONFIG_USB_EMI62 ./drivers/usb/misc/Makefile +clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI62' +clean_mk CONFIG_USB_EMI62 drivers/usb/misc/Makefile # USB_SISUSBVGA - USB 2.0 SVGA dongle support (Net2280/SiS315) clean_blob drivers/usb/misc/sisusbvga/sisusb_init.h -clean_kconfig ./drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA' -clean_mk CONFIG_USB_SISUSBVGA ./drivers/usb/misc/sisusbvga/Makefile +clean_kconfig drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA' +clean_mk CONFIG_USB_SISUSBVGA drivers/usb/misc/sisusbvga/Makefile # serial # USB_SERIAL_KEYSPAN_MPR - USB Keyspan MPR Firmware clean_file drivers/usb/serial/keyspan_mpr_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' # USB_SERIAL_KEYSPAN_USA18X - USB Keyspan USA-18X Firmware clean_file drivers/usb/serial/keyspan_usa18x_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' # USB_SERIAL_KEYSPAN_USA19 - USB Keyspan USA-19 Firmware clean_file drivers/usb/serial/keyspan_usa19_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' # USB_SERIAL_KEYSPAN_USA19QI - USB Keyspan USA-19QI Firmware clean_file drivers/usb/serial/keyspan_usa19qi_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' # USB_SERIAL_KEYSPAN_USA19QW - USB Keyspan USA-19QW Firmware clean_file drivers/usb/serial/keyspan_usa19qw_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' # USB_SERIAL_KEYSPAN_USA19W - USB Keyspan USA-19W Firmware clean_file drivers/usb/serial/keyspan_usa19w_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' # USB_SERIAL_KEYSPAN_USA28 - USB Keyspan USA-28 Firmware clean_file drivers/usb/serial/keyspan_usa28_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' # USB_SERIAL_KEYSPAN_USA28XA - USB Keyspan USA-28XA Firmware clean_file drivers/usb/serial/keyspan_usa28xa_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' # USB_SERIAL_KEYSPAN_USA28XB - USB Keyspan USA-28XB Firmware clean_file drivers/usb/serial/keyspan_usa28xb_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' # USB_SERIAL_KEYSPAN_USA28X - USB Keyspan USA-28X Firmware clean_file drivers/usb/serial/keyspan_usa28x_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' # USB_SERIAL_KEYSPAN_USA49W - USB Keyspan USA-49W Firmware clean_file drivers/usb/serial/keyspan_usa49w_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' # USB_SERIAL_KEYSPAN_USA49WLC - USB Keyspan USA-49WLC Firmware clean_file drivers/usb/serial/keyspan_usa49wlc_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' -clean_mk CONFIG_USB_SERIAL_KEYSPAN ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' +clean_mk CONFIG_USB_SERIAL_KEYSPAN drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT - USB Inside Out Edgeport Serial Driver clean_file drivers/usb/serial/io_fw_boot.h clean_file drivers/usb/serial/io_fw_down.h clean_file drivers/usb/serial/io_fw_down2.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' -clean_mk CONFIG_USB_SERIAL_EDGEPORT ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' +clean_mk CONFIG_USB_SERIAL_EDGEPORT drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT_TI - USB Inside Out Edgeport Serial Driver (TI devices) clean_file drivers/usb/serial/io_fw_boot2.h clean_file drivers/usb/serial/io_fw_down3.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' -clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' +clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile # USB_SERIAL_TI - USB TI 3410/5052 Serial Driver clean_blob drivers/usb/serial/ti_fw_3410.h clean_blob drivers/usb/serial/ti_fw_5052.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_TI' -clean_mk CONFIG_USB_SERIAL_TI ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_TI' +clean_mk CONFIG_USB_SERIAL_TI drivers/usb/serial/Makefile # USB_SERIAL_WHITEHEAT - USB ConnectTech WhiteHEAT Serial Driver clean_blob drivers/usb/serial/whiteheat_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' -clean_mk CONFIG_USB_SERIAL_WHITEHEAT ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' +clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile ######################### @@ -523,13 +533,13 @@ clean_mk CONFIG_USB_SERIAL_WHITEHEAT ./drivers/usb/serial/Makefile # FB_ASILIANT - Asiliant (Chips) 69000 display support clean_blob drivers/video/asiliantfb.c -clean_kconfig ./drivers/video/Kconfig 'FB_ASILIANT' -clean_mk CONFIG_FB_ASILIANT ./drivers/video/Makefile +clean_kconfig drivers/video/Kconfig 'FB_ASILIANT' +clean_mk CONFIG_FB_ASILIANT drivers/video/Makefile # FB_CT65550 - Chips 65550 display support clean_blob drivers/video/chipsfb.c -clean_kconfig ./drivers/video/Kconfig 'FB_CT65550' -clean_mk CONFIG_FB_CT65550 ./drivers/video/Makefile +clean_kconfig drivers/video/Kconfig 'FB_CT65550' +clean_mk CONFIG_FB_CT65550 drivers/video/Makefile ######################### @@ -543,8 +553,8 @@ clean_file sound/pci/cs46xx/imgs/cwc4630.h clean_file sound/pci/cs46xx/imgs/cwcasync.h clean_file sound/pci/cs46xx/imgs/cwcdma.h clean_file sound/pci/cs46xx/imgs/cwcsnoop.h -clean_kconfig ./sound/pci/Kconfig 'SND_CS46XX' -# sed -i '/cs46xx\/ \\/d' ./sound/pci/Makefile +clean_kconfig sound/pci/Kconfig 'SND_CS46XX' +# sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL diff --git a/deblob-2.6.24 b/deblob-2.6.24 index 4da941e3659..5e08f606763 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -71,6 +71,7 @@ function clean_blob { #$1 = filename if test -f $check; then name=$1 + echo Removing blobs from $name set fnord "$@" -d shift 2 $check "$@" $name > $name.deblob @@ -82,6 +83,7 @@ function clean_blob { function clean_kconfig { #$1 = filename $2 = things to remove + echo Marking config $2 as depending on NONFREE in $1 sed "/^config $2\$/{p;i\ depends on NONFREE d;}" $1 > $1.deblob @@ -91,11 +93,19 @@ d;}" $1 > $1.deblob function clean_mk { #$1 = config $2 = Makefile name # We don't clean up Makefiles any more --lxoliva - : sed -i "/($1)/d" $2 + # sed -i "/($1)/d" $2 + # check_changed $2 + if sed -n "/($1)/p" $2 | grep . > /dev/null; then + : + else + echo $2 does not contain matches for $1 + exit 1 + fi } function clean_ifdef { #$1 = filename $2 = macro to -U + echo unifdefing $1 with -U$2 unifdef $1 -U$2 > $1.deblob check_changed $1 } @@ -118,14 +128,14 @@ clean_blob drivers/atm/atmsar11.data # There's only GPLed code in this one. --lxoliva # clean_file drivers/atm/fore200e_mkfirm.c -clean_kconfig ./drivers/atm/Kconfig 'ATM_\(FORE\).*' -clean_mk CONFIG_ATM_FORE200E ./drivers/atm/Makefile +clean_kconfig drivers/atm/Kconfig 'ATM_\(FORE\).*' +clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile clean_file drivers/atm/pca200e.data clean_file drivers/atm/pca200e_ecd.data clean_file drivers/atm/sba200e_ecd.data -clean_kconfig ./drivers/atm/Kconfig 'ATM_AMBASSADOR' -clean_mk CONFIG_ATM_AMBASSADOR ./drivers/atm/Makefile +clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR' +clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile ######################## @@ -134,30 +144,30 @@ clean_mk CONFIG_ATM_AMBASSADOR ./drivers/atm/Makefile # COMPUTONE - Computone IntelliPort Plus serial clean_blob drivers/char/ip2/fip_firm.h -clean_kconfig ./drivers/char/Kconfig 'COMPUTONE' -clean_mk CONFIG_COMPUTONE ./drivers/char/Makefile +clean_kconfig drivers/char/Kconfig 'COMPUTONE' +clean_mk CONFIG_COMPUTONE drivers/char/Makefile # DSP56001 Device Driver clean_blob drivers/char/dsp56k.c -clean_kconfig ./arch/m68k/Kconfig 'ATARI_DSP56K' -clean_mk CONFIG_ATARI_DSP56K ./drivers/char/Makefile +clean_kconfig arch/m68k/Kconfig 'ATARI_DSP56K' +clean_mk CONFIG_ATARI_DSP56K drivers/char/Makefile # drm # DRM_MGA - Matrox g200/g400 clean_blob drivers/char/drm/mga_ucode.h -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_MGA' -clean_mk CONFIG_DRM_MGA ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_MGA' +clean_mk CONFIG_DRM_MGA drivers/char/drm/Makefile # DRM_R128 - ATI Rage 128 clean_blob drivers/char/drm/r128_cce.c -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_R128' -clean_mk CONFIG_DRM_R128 ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_R128' +clean_mk CONFIG_DRM_R128 drivers/char/drm/Makefile # DRM_RADEON - ATI Radeon clean_blob drivers/char/drm/radeon_cp.c -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_RADEON' -clean_mk CONFIG_DRM_RADEON ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_RADEON' +clean_mk CONFIG_DRM_RADEON drivers/char/drm/Makefile ######################### @@ -167,105 +177,105 @@ clean_mk CONFIG_DRM_RADEON ./drivers/char/drm/Makefile # dvb/dvb-usb clean_blob drivers/media/dvb/dvb-usb/af9005-script.h -clean_kconfig ./drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' -clean_mk CONFIG_DVB_USB_AF9005 ./drivers/media/dvb/dvb-usb/Makefile +clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' +clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile # dvb/frontends # DVB_TDA10021 - Philips TDA10021 based clean_blob drivers/media/dvb/frontends/tda10021.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' -clean_mk CONFIG_DVB_TDA10021 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' +clean_mk CONFIG_DVB_TDA10021 drivers/media/dvb/frontends/Makefile # DVB_TDA8083 - Philips TDA8083 based clean_blob drivers/media/dvb/frontends/tda8083.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' -clean_mk CONFIG_DVB_TDA8083 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' +clean_mk CONFIG_DVB_TDA8083 drivers/media/dvb/frontends/Makefile # DVB_VES1820 - VLSI VES1820 based clean_blob drivers/media/dvb/frontends/ves1820.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' -clean_mk CONFIG_DVB_VES1820 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' +clean_mk CONFIG_DVB_VES1820 drivers/media/dvb/frontends/Makefile # DVB_VES1X93 - VLSI VES1893 or VES1993 based clean_blob drivers/media/dvb/frontends/ves1x93.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' -clean_mk CONFIG_DVB_VES1X93 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' +clean_mk CONFIG_DVB_VES1X93 drivers/media/dvb/frontends/Makefile # dvb/ttpci # DVB_AV7110 - AV7110 cards clean_blob drivers/media/dvb/ttpci/av7110_hw.c clean_blob drivers/media/dvb/ttpci/av7110.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' -clean_mk CONFIG_DVB_AV7110 ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' +clean_mk CONFIG_DVB_AV7110 drivers/media/dvb/ttpci/Makefile # DVB_BUDGET_AV - Budget cards with analog video inputs clean_blob drivers/media/dvb/ttpci/budget-av.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' -clean_mk CONFIG_DVB_BUDGET_AV ./drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET_PATCH ./drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' +clean_mk CONFIG_DVB_BUDGET_AV drivers/media/dvb/ttpci/Makefile +clean_mk CONFIG_DVB_BUDGET_PATCH drivers/media/dvb/ttpci/Makefile +clean_mk CONFIG_DVB_BUDGET drivers/media/dvb/ttpci/Makefile # DVB_BUDGET_CI - Budget cards with onboard CI connector clean_blob drivers/media/dvb/ttpci/budget-ci.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' -clean_mk CONFIG_DVB_BUDGET_CI ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' +clean_mk CONFIG_DVB_BUDGET_CI drivers/media/dvb/ttpci/Makefile # dvb/ttusb-budget # DVB_TTUSB_BUDGET - Technotrend/Hauppauge Nova-USB devices clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c -clean_kconfig ./drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' -clean_mk CONFIG_DVB_TTUSB_BUDGET ./drivers/media/dvb/ttusb-budget/Makefile +clean_kconfig drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' +clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/dvb/ttusb-budget/Makefile # video # USB_PWC - USB Philips Cameras clean_blob drivers/media/video/pwc/pwc-kiara.c clean_blob drivers/media/video/pwc/pwc-timon.c -clean_kconfig ./drivers/media/video/pwc/Kconfig 'USB_PWC' -clean_mk CONFIG_USB_PWC ./drivers/media/video/Makefile +clean_kconfig drivers/media/video/pwc/Kconfig 'USB_PWC' +clean_mk CONFIG_USB_PWC drivers/media/video/Makefile # VIDEO_CPIA - CPiA Video For Linux clean_blob drivers/media/video/cpia2/cpia2patch.h -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA' -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA_PP' -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA_USB' -clean_kconfig ./drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' -clean_mk CONFIG_VIDEO_CPIA ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_PP ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_USB ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA2 ./drivers/media/video/Makefile +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA' +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_PP' +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_USB' +clean_kconfig drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' +clean_mk CONFIG_VIDEO_CPIA drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA_PP drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA_USB drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/Makefile # USB_DABUSB - DABUSB driver clean_blob drivers/media/video/dabfirmware.h -clean_kconfig ./drivers/media/Kconfig 'USB_DABUSB' -clean_mk CONFIG_USB_DABUSB ./drivers/media/video/Makefile +clean_kconfig drivers/media/Kconfig 'USB_DABUSB' +clean_mk CONFIG_USB_DABUSB drivers/media/video/Makefile # video/usbvideo # USB_IBMCAM - USB IBM (Xirlink) C-it Camera support clean_blob drivers/media/video/usbvideo/ibmcam.c -clean_kconfig ./drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' -clean_mk CONFIG_USB_IBMCAM ./drivers/media/video/usbvideo/Makefile +clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' +clean_mk CONFIG_USB_IBMCAM drivers/media/video/usbvideo/Makefile # USB_VICAM - USB 3com HomeConnect (aka vicam) clean_blob drivers/media/video/usbvideo/vicam.c -clean_kconfig ./drivers/media/video/usbvideo/Kconfig 'USB_VICAM' -clean_mk CONFIG_USB_VICAM ./drivers/media/video/usbvideo/Makefile +clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM' +clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile # other... # disable -- appears to neeed other DVB bits -clean_mk CONFIG_DVB_CORE ./drivers/media/Makefile -clean_mk CONFIG_VIDEOBUF_DVB ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_SAA7134 ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CX88 ./drivers/media/video/Makefile -clean_kconfig ./drivers/media/Kconfig 'VIDEOBUF_DVB' +clean_mk CONFIG_DVB_CORE drivers/media/Makefile +clean_mk CONFIG_VIDEOBUF_DVB drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_SAA7134 drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CX88 drivers/media/video/Makefile +clean_kconfig drivers/media/Kconfig 'VIDEOBUF_DVB' ####################### # Removed net Drivers # @@ -274,42 +284,42 @@ clean_kconfig ./drivers/media/Kconfig 'VIDEOBUF_DVB' # ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit clean_blob drivers/net/acenic_firmware.h -clean_kconfig ./drivers/net/Kconfig 'ACENIC' -clean_mk CONFIG_ACENIC ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'ACENIC' +clean_mk CONFIG_ACENIC drivers/net/Makefile # ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support # This adds restrictions on top of GPLv2, but after deblobbing, # nothing copyrightable remains. clean_blob drivers/net/starfire_firmware.h -clean_kconfig ./drivers/net/Kconfig 'ADAPTEC_STARFIRE' -clean_mk CONFIG_ADAPTEC_STARFIRE ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE' +clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile # BNX2 - Broadcom NetXtremeII clean_blob drivers/net/bnx2_fw.h clean_blob drivers/net/bnx2_fw2.h -clean_kconfig ./drivers/net/Kconfig 'BNX2' -clean_mk CONFIG_BNX2 ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'BNX2' +clean_mk CONFIG_BNX2 drivers/net/Makefile # CASSINI - Sun Cassini clean_blob drivers/net/cassini.h -clean_kconfig ./drivers/net/Kconfig 'CASSINI' -clean_mk CONFIG_CASSINI ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'CASSINI' +clean_mk CONFIG_CASSINI drivers/net/Makefile # E100 - Intel(R) PRO/100+ clean_blob drivers/net/e100.c sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c -# clean_kconfig ./drivers/net/Kconfig 'E100' -# clean_mk CONFIG_E100 ./drivers/net/Makefile +# clean_kconfig drivers/net/Kconfig 'E100' +# clean_mk CONFIG_E100 drivers/net/Makefile # MYRI_SBUS - MyriCOM Gigabit Ethernet clean_blob drivers/net/myri_code.h -clean_kconfig ./drivers/net/Kconfig 'MYRI_SBUS' -clean_mk CONFIG_MYRI_SBUS ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'MYRI_SBUS' +clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile # TEHUTI - Tehuti Networks 10G Ethernet clean_blob drivers/net/tehuti_fw.h -clean_kconfig ./drivers/net/Kconfig 'TEHUTI' -clean_mk CONFIG_TEHUTI ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'TEHUTI' +clean_mk CONFIG_TEHUTI drivers/net/Makefile # TIGON3 - Broadcom Tigon3 patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch @@ -336,8 +346,8 @@ sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c # TYPHOON - 3cr990 series Typhoon clean_blob drivers/net/typhoon-firmware.h -clean_kconfig ./drivers/net/Kconfig 'TYPHOON' -clean_mk CONFIG_TYPHOON ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'TYPHOON' +clean_mk CONFIG_TYPHOON drivers/net/Makefile # appletalk @@ -346,23 +356,23 @@ clean_mk CONFIG_TYPHOON ./drivers/net/Makefile # clean_blob drivers/net/appletalk/cops.h clean_blob drivers/net/appletalk/cops_ffdrv.h clean_blob drivers/net/appletalk/cops_ltdrv.h -clean_kconfig ./drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT' -clean_mk CONFIG_COPS ./drivers/net/appletalk/Makefile +clean_kconfig drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT' +clean_mk CONFIG_COPS drivers/net/appletalk/Makefile # hamradio # YAM - YAM driver for AX.25 clean_blob drivers/net/hamradio/yam1200.h clean_blob drivers/net/hamradio/yam9600.h -clean_kconfig ./drivers/net/hamradio/Kconfig 'YAM' -clean_mk CONFIG_YAM ./drivers/net/hamradio/Makefile +clean_kconfig drivers/net/hamradio/Kconfig 'YAM' +clean_mk CONFIG_YAM drivers/net/hamradio/Makefile # pcmcia # PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA clean_blob drivers/net/pcmcia/ositech.h -clean_kconfig ./drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' -clean_mk CONFIG_PCMCIA_SMC91C92 ./drivers/net/pcmcia/Makefile +clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' +clean_mk CONFIG_PCMCIA_SMC91C92 drivers/net/pcmcia/Makefile # tokenring @@ -373,8 +383,8 @@ clean_mk CONFIG_PCMCIA_SMC91C92 ./drivers/net/pcmcia/Makefile # clean_blob drivers/net/tokenring/3c359.h # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/3c359_microcode.h -clean_kconfig ./drivers/net/tokenring/Kconfig '3C359' -clean_mk CONFIG_3C359 ./drivers/net/tokenring/Makefile +clean_kconfig drivers/net/tokenring/Kconfig '3C359' +clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile # SMCTR - SMC ISA/MCA adapter # No need to remove these, they don't contain non-Free code. @@ -382,15 +392,15 @@ clean_mk CONFIG_3C359 ./drivers/net/tokenring/Makefile # clean_blob drivers/net/tokenring/smctr.h # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/smctr_firmware.h -clean_kconfig ./drivers/net/tokenring/Kconfig 'SMCTR' -clean_mk CONFIG_SMCTR ./drivers/net/tokenring/Makefile +clean_kconfig drivers/net/tokenring/Kconfig 'SMCTR' +clean_mk CONFIG_SMCTR drivers/net/tokenring/Makefile # usb # USB_KAWETH - USB KLSI KL5USB101-based ethernet device support clean_blob drivers/net/usb/kawethfw.h -clean_kconfig ./drivers/net/usb/Kconfig 'USB_KAWETH' -clean_mk CONFIG_USB_KAWETH ./drivers/net/usb/Makefile +clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH' +clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile ######################## @@ -399,8 +409,8 @@ clean_mk CONFIG_USB_KAWETH ./drivers/net/usb/Makefile # QETH - Gigabit Ethernet device support clean_blob drivers/s390/net/qeth_mpc.c -clean_kconfig ./drivers/s390/net/Kconfig 'QETH' -clean_mk CONFIG_QETH ./drivers/s390/net/Makefile +clean_kconfig drivers/s390/net/Kconfig 'QETH' +clean_mk CONFIG_QETH drivers/s390/net/Makefile ######################## # Removed SCSI Drivers # @@ -408,20 +418,20 @@ clean_mk CONFIG_QETH ./drivers/s390/net/Makefile # SCSI_QLOGICPTI - PTI Qlogic, ISP Driver clean_blob drivers/scsi/qlogicpti_asm.c -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_QLOGICPTI' -clean_mk CONFIG_SCSI_QLOGICPTI ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGICPTI' +clean_mk CONFIG_SCSI_QLOGICPTI drivers/scsi/Makefile # SCSI_ADVANSYS - AdvanSys SCSI clean_blob drivers/scsi/advansys.c -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_ADVANSYS' -clean_mk CONFIG_SCSI_ADVANSYS ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_ADVANSYS' +clean_mk CONFIG_SCSI_ADVANSYS drivers/scsi/Makefile # SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI clean_blob drivers/scsi/ql1280_fw.h clean_blob drivers/scsi/ql1040_fw.h clean_blob drivers/scsi/ql12160_fw.h -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_QLOGIC_1280' -clean_mk CONFIG_SCSI_QLOGIC_1280 ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGIC_1280' +clean_mk CONFIG_SCSI_QLOGIC_1280 drivers/scsi/Makefile ####################### @@ -435,8 +445,8 @@ clean_mk CONFIG_SCSI_QLOGIC_1280 ./drivers/scsi/Makefile # clean_blob drivers/usb/misc/emi26.c # This file is not under the GPL, better remove it all. clean_file drivers/usb/misc/emi26_fw.h -clean_kconfig ./drivers/usb/misc/Kconfig 'USB_EMI26' -clean_mk CONFIG_USB_EMI26 ./drivers/usb/misc/Makefile +clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI26' +clean_mk CONFIG_USB_EMI26 drivers/usb/misc/Makefile # USB_EMI62 - EMI 6|2m USB Audio interface # No need to remove this, it doesn't contain non-Free code. @@ -444,77 +454,77 @@ clean_mk CONFIG_USB_EMI26 ./drivers/usb/misc/Makefile # This file are probably not under the GPL, better remove them all. clean_file drivers/usb/misc/emi62_fw_m.h clean_file drivers/usb/misc/emi62_fw_s.h -clean_kconfig ./drivers/usb/misc/Kconfig 'USB_EMI62' -clean_mk CONFIG_USB_EMI62 ./drivers/usb/misc/Makefile +clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI62' +clean_mk CONFIG_USB_EMI62 drivers/usb/misc/Makefile # USB_SISUSBVGA - USB 2.0 SVGA dongle support (Net2280/SiS315) clean_blob drivers/usb/misc/sisusbvga/sisusb_init.h -clean_kconfig ./drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA' -clean_mk CONFIG_USB_SISUSBVGA ./drivers/usb/misc/sisusbvga/Makefile +clean_kconfig drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA' +clean_mk CONFIG_USB_SISUSBVGA drivers/usb/misc/sisusbvga/Makefile # serial # USB_SERIAL_KEYSPAN_MPR - USB Keyspan MPR Firmware clean_file drivers/usb/serial/keyspan_mpr_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' # USB_SERIAL_KEYSPAN_USA18X - USB Keyspan USA-18X Firmware clean_file drivers/usb/serial/keyspan_usa18x_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' # USB_SERIAL_KEYSPAN_USA19 - USB Keyspan USA-19 Firmware clean_file drivers/usb/serial/keyspan_usa19_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' # USB_SERIAL_KEYSPAN_USA19QI - USB Keyspan USA-19QI Firmware clean_file drivers/usb/serial/keyspan_usa19qi_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' # USB_SERIAL_KEYSPAN_USA19QW - USB Keyspan USA-19QW Firmware clean_file drivers/usb/serial/keyspan_usa19qw_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' # USB_SERIAL_KEYSPAN_USA19W - USB Keyspan USA-19W Firmware clean_file drivers/usb/serial/keyspan_usa19w_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' # USB_SERIAL_KEYSPAN_USA28 - USB Keyspan USA-28 Firmware clean_file drivers/usb/serial/keyspan_usa28_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' # USB_SERIAL_KEYSPAN_USA28XA - USB Keyspan USA-28XA Firmware clean_file drivers/usb/serial/keyspan_usa28xa_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' # USB_SERIAL_KEYSPAN_USA28XB - USB Keyspan USA-28XB Firmware clean_file drivers/usb/serial/keyspan_usa28xb_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' # USB_SERIAL_KEYSPAN_USA28X - USB Keyspan USA-28X Firmware clean_file drivers/usb/serial/keyspan_usa28x_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' # USB_SERIAL_KEYSPAN_USA49W - USB Keyspan USA-49W Firmware clean_file drivers/usb/serial/keyspan_usa49w_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' # USB_SERIAL_KEYSPAN_USA49WLC - USB Keyspan USA-49WLC Firmware clean_file drivers/usb/serial/keyspan_usa49wlc_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' -clean_mk CONFIG_USB_SERIAL_KEYSPAN ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' +clean_mk CONFIG_USB_SERIAL_KEYSPAN drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT - USB Inside Out Edgeport Serial Driver clean_file drivers/usb/serial/io_fw_boot.h clean_file drivers/usb/serial/io_fw_down.h clean_file drivers/usb/serial/io_fw_down2.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' -clean_mk CONFIG_USB_SERIAL_EDGEPORT ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' +clean_mk CONFIG_USB_SERIAL_EDGEPORT drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT_TI - USB Inside Out Edgeport Serial Driver (TI devices) clean_file drivers/usb/serial/io_fw_boot2.h clean_file drivers/usb/serial/io_fw_down3.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' -clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' +clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile # USB_SERIAL_TI - USB TI 3410/5052 Serial Driver clean_blob drivers/usb/serial/ti_fw_3410.h clean_blob drivers/usb/serial/ti_fw_5052.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_TI' -clean_mk CONFIG_USB_SERIAL_TI ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_TI' +clean_mk CONFIG_USB_SERIAL_TI drivers/usb/serial/Makefile # USB_SERIAL_WHITEHEAT - USB ConnectTech WhiteHEAT Serial Driver clean_blob drivers/usb/serial/whiteheat_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' -clean_mk CONFIG_USB_SERIAL_WHITEHEAT ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' +clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile ######################### @@ -523,13 +533,13 @@ clean_mk CONFIG_USB_SERIAL_WHITEHEAT ./drivers/usb/serial/Makefile # FB_ASILIANT - Asiliant (Chips) 69000 display support clean_blob drivers/video/asiliantfb.c -clean_kconfig ./drivers/video/Kconfig 'FB_ASILIANT' -clean_mk CONFIG_FB_ASILIANT ./drivers/video/Makefile +clean_kconfig drivers/video/Kconfig 'FB_ASILIANT' +clean_mk CONFIG_FB_ASILIANT drivers/video/Makefile # FB_CT65550 - Chips 65550 display support clean_blob drivers/video/chipsfb.c -clean_kconfig ./drivers/video/Kconfig 'FB_CT65550' -clean_mk CONFIG_FB_CT65550 ./drivers/video/Makefile +clean_kconfig drivers/video/Kconfig 'FB_CT65550' +clean_mk CONFIG_FB_CT65550 drivers/video/Makefile ######################### @@ -543,8 +553,8 @@ clean_file sound/pci/cs46xx/imgs/cwc4630.h clean_file sound/pci/cs46xx/imgs/cwcasync.h clean_file sound/pci/cs46xx/imgs/cwcdma.h clean_file sound/pci/cs46xx/imgs/cwcsnoop.h -clean_kconfig ./sound/pci/Kconfig 'SND_CS46XX' -# sed -i '/cs46xx\/ \\/d' ./sound/pci/Makefile +clean_kconfig sound/pci/Kconfig 'SND_CS46XX' +# sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL diff --git a/deblob-2.6.25 b/deblob-2.6.25 index 5f2d55263b0..8d8e018feb8 100755 --- a/deblob-2.6.25 +++ b/deblob-2.6.25 @@ -71,6 +71,7 @@ function clean_blob { #$1 = filename if test -f $check; then name=$1 + echo Removing blobs from $name set fnord "$@" -d shift 2 $check "$@" $name > $name.deblob @@ -82,6 +83,7 @@ function clean_blob { function clean_kconfig { #$1 = filename $2 = things to remove + echo Marking config $2 as depending on NONFREE in $1 sed "/^config $2\$/{p;i\ depends on NONFREE d;}" $1 > $1.deblob @@ -91,11 +93,19 @@ d;}" $1 > $1.deblob function clean_mk { #$1 = config $2 = Makefile name # We don't clean up Makefiles any more --lxoliva - : sed -i "/($1)/d" $2 + # sed -i "/($1)/d" $2 + # check_changed $2 + if sed -n "/($1)/p" $2 | grep . > /dev/null; then + : + else + echo $2 does not contain matches for $1 + exit 1 + fi } function clean_ifdef { #$1 = filename $2 = macro to -U + echo unifdefing $1 with -U$2 unifdef $1 -U$2 > $1.deblob check_changed $1 } @@ -118,14 +128,14 @@ clean_blob drivers/atm/atmsar11.data # There's only GPLed code in this one. --lxoliva # clean_file drivers/atm/fore200e_mkfirm.c -clean_kconfig ./drivers/atm/Kconfig 'ATM_\(FORE\).*' -clean_mk CONFIG_ATM_FORE200E ./drivers/atm/Makefile +clean_kconfig drivers/atm/Kconfig 'ATM_\(FORE\).*' +clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile clean_file drivers/atm/pca200e.data clean_file drivers/atm/pca200e_ecd.data clean_file drivers/atm/sba200e_ecd.data -clean_kconfig ./drivers/atm/Kconfig 'ATM_AMBASSADOR' -clean_mk CONFIG_ATM_AMBASSADOR ./drivers/atm/Makefile +clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR' +clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile ######################## @@ -134,30 +144,30 @@ clean_mk CONFIG_ATM_AMBASSADOR ./drivers/atm/Makefile # COMPUTONE - Computone IntelliPort Plus serial clean_blob drivers/char/ip2/fip_firm.h -clean_kconfig ./drivers/char/Kconfig 'COMPUTONE' -clean_mk CONFIG_COMPUTONE ./drivers/char/Makefile +clean_kconfig drivers/char/Kconfig 'COMPUTONE' +clean_mk CONFIG_COMPUTONE drivers/char/Makefile # DSP56001 Device Driver clean_blob drivers/char/dsp56k.c -clean_kconfig ./arch/m68k/Kconfig 'ATARI_DSP56K' -clean_mk CONFIG_ATARI_DSP56K ./drivers/char/Makefile +clean_kconfig arch/m68k/Kconfig 'ATARI_DSP56K' +clean_mk CONFIG_ATARI_DSP56K drivers/char/Makefile # drm # DRM_MGA - Matrox g200/g400 clean_blob drivers/char/drm/mga_ucode.h -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_MGA' -clean_mk CONFIG_DRM_MGA ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_MGA' +clean_mk CONFIG_DRM_MGA drivers/char/drm/Makefile # DRM_R128 - ATI Rage 128 clean_blob drivers/char/drm/r128_cce.c -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_R128' -clean_mk CONFIG_DRM_R128 ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_R128' +clean_mk CONFIG_DRM_R128 drivers/char/drm/Makefile # DRM_RADEON - ATI Radeon clean_blob drivers/char/drm/radeon_cp.c -clean_kconfig ./drivers/char/drm/Kconfig 'DRM_RADEON' -clean_mk CONFIG_DRM_RADEON ./drivers/char/drm/Makefile +clean_kconfig drivers/char/drm/Kconfig 'DRM_RADEON' +clean_mk CONFIG_DRM_RADEON drivers/char/drm/Makefile ######################### @@ -167,105 +177,105 @@ clean_mk CONFIG_DRM_RADEON ./drivers/char/drm/Makefile # dvb/dvb-usb clean_blob drivers/media/dvb/dvb-usb/af9005-script.h -clean_kconfig ./drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' -clean_mk CONFIG_DVB_USB_AF9005 ./drivers/media/dvb/dvb-usb/Makefile +clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' +clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile # dvb/frontends # DVB_TDA10021 - Philips TDA10021 based clean_blob drivers/media/dvb/frontends/tda10021.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' -clean_mk CONFIG_DVB_TDA10021 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' +clean_mk CONFIG_DVB_TDA10021 drivers/media/dvb/frontends/Makefile # DVB_TDA8083 - Philips TDA8083 based clean_blob drivers/media/dvb/frontends/tda8083.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' -clean_mk CONFIG_DVB_TDA8083 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' +clean_mk CONFIG_DVB_TDA8083 drivers/media/dvb/frontends/Makefile # DVB_VES1820 - VLSI VES1820 based clean_blob drivers/media/dvb/frontends/ves1820.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' -clean_mk CONFIG_DVB_VES1820 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' +clean_mk CONFIG_DVB_VES1820 drivers/media/dvb/frontends/Makefile # DVB_VES1X93 - VLSI VES1893 or VES1993 based clean_blob drivers/media/dvb/frontends/ves1x93.c -clean_kconfig ./drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' -clean_mk CONFIG_DVB_VES1X93 ./drivers/media/dvb/frontends/Makefile +clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' +clean_mk CONFIG_DVB_VES1X93 drivers/media/dvb/frontends/Makefile # dvb/ttpci # DVB_AV7110 - AV7110 cards clean_blob drivers/media/dvb/ttpci/av7110_hw.c clean_blob drivers/media/dvb/ttpci/av7110.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' -clean_mk CONFIG_DVB_AV7110 ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' +clean_mk CONFIG_DVB_AV7110 drivers/media/dvb/ttpci/Makefile # DVB_BUDGET_AV - Budget cards with analog video inputs clean_blob drivers/media/dvb/ttpci/budget-av.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' -clean_mk CONFIG_DVB_BUDGET_AV ./drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET_PATCH ./drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' +clean_mk CONFIG_DVB_BUDGET_AV drivers/media/dvb/ttpci/Makefile +clean_mk CONFIG_DVB_BUDGET_PATCH drivers/media/dvb/ttpci/Makefile +clean_mk CONFIG_DVB_BUDGET drivers/media/dvb/ttpci/Makefile # DVB_BUDGET_CI - Budget cards with onboard CI connector clean_blob drivers/media/dvb/ttpci/budget-ci.c -clean_kconfig ./drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' -clean_mk CONFIG_DVB_BUDGET_CI ./drivers/media/dvb/ttpci/Makefile +clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' +clean_mk CONFIG_DVB_BUDGET_CI drivers/media/dvb/ttpci/Makefile # dvb/ttusb-budget # DVB_TTUSB_BUDGET - Technotrend/Hauppauge Nova-USB devices clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c -clean_kconfig ./drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' -clean_mk CONFIG_DVB_TTUSB_BUDGET ./drivers/media/dvb/ttusb-budget/Makefile +clean_kconfig drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' +clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/dvb/ttusb-budget/Makefile # video # USB_PWC - USB Philips Cameras clean_blob drivers/media/video/pwc/pwc-kiara.c clean_blob drivers/media/video/pwc/pwc-timon.c -clean_kconfig ./drivers/media/video/pwc/Kconfig 'USB_PWC' -clean_mk CONFIG_USB_PWC ./drivers/media/video/Makefile +clean_kconfig drivers/media/video/pwc/Kconfig 'USB_PWC' +clean_mk CONFIG_USB_PWC drivers/media/video/Makefile # VIDEO_CPIA - CPiA Video For Linux clean_blob drivers/media/video/cpia2/cpia2patch.h -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA' -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA_PP' -clean_kconfig ./drivers/media/video/Kconfig 'VIDEO_CPIA_USB' -clean_kconfig ./drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' -clean_mk CONFIG_VIDEO_CPIA ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_PP ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_USB ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA2 ./drivers/media/video/Makefile +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA' +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_PP' +clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_USB' +clean_kconfig drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' +clean_mk CONFIG_VIDEO_CPIA drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA_PP drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA_USB drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/Makefile # USB_DABUSB - DABUSB driver clean_blob drivers/media/video/dabfirmware.h -clean_kconfig ./drivers/media/Kconfig 'USB_DABUSB' -clean_mk CONFIG_USB_DABUSB ./drivers/media/video/Makefile +clean_kconfig drivers/media/Kconfig 'USB_DABUSB' +clean_mk CONFIG_USB_DABUSB drivers/media/video/Makefile # video/usbvideo # USB_IBMCAM - USB IBM (Xirlink) C-it Camera support clean_blob drivers/media/video/usbvideo/ibmcam.c -clean_kconfig ./drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' -clean_mk CONFIG_USB_IBMCAM ./drivers/media/video/usbvideo/Makefile +clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' +clean_mk CONFIG_USB_IBMCAM drivers/media/video/usbvideo/Makefile # USB_VICAM - USB 3com HomeConnect (aka vicam) clean_blob drivers/media/video/usbvideo/vicam.c -clean_kconfig ./drivers/media/video/usbvideo/Kconfig 'USB_VICAM' -clean_mk CONFIG_USB_VICAM ./drivers/media/video/usbvideo/Makefile +clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM' +clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile # other... # disable -- appears to neeed other DVB bits -clean_mk CONFIG_DVB_CORE ./drivers/media/Makefile -clean_mk CONFIG_VIDEOBUF_DVB ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_SAA7134 ./drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CX88 ./drivers/media/video/Makefile -clean_kconfig ./drivers/media/Kconfig 'VIDEOBUF_DVB' +clean_mk CONFIG_DVB_CORE drivers/media/Makefile +clean_mk CONFIG_VIDEOBUF_DVB drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_SAA7134 drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CX88 drivers/media/video/Makefile +clean_kconfig drivers/media/Kconfig 'VIDEOBUF_DVB' ####################### # Removed net Drivers # @@ -274,46 +284,46 @@ clean_kconfig ./drivers/media/Kconfig 'VIDEOBUF_DVB' # ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit clean_blob drivers/net/acenic_firmware.h -clean_kconfig ./drivers/net/Kconfig 'ACENIC' -clean_mk CONFIG_ACENIC ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'ACENIC' +clean_mk CONFIG_ACENIC drivers/net/Makefile # ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support # This adds restrictions on top of GPLv2, but after deblobbing, # nothing copyrightable remains. clean_blob drivers/net/starfire_firmware.h -clean_kconfig ./drivers/net/Kconfig 'ADAPTEC_STARFIRE' -clean_mk CONFIG_ADAPTEC_STARFIRE ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE' +clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile # BNX2 - Broadcom NetXtremeII clean_blob drivers/net/bnx2_fw.h clean_blob drivers/net/bnx2_fw2.h -clean_kconfig ./drivers/net/Kconfig 'BNX2' -clean_mk CONFIG_BNX2 ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'BNX2' +clean_mk CONFIG_BNX2 drivers/net/Makefile clean_blob drivers/net/bnx2x_init_values.h -clean_kconfig ./drivers/net/Kconfig 'BNX2X' -clean_mk CONFIG_BNX2X ./divers/net/Makefile +clean_kconfig drivers/net/Kconfig 'BNX2X' +clean_mk CONFIG_BNX2X divers/net/Makefile # CASSINI - Sun Cassini clean_blob drivers/net/cassini.h -clean_kconfig ./drivers/net/Kconfig 'CASSINI' -clean_mk CONFIG_CASSINI ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'CASSINI' +clean_mk CONFIG_CASSINI drivers/net/Makefile # E100 - Intel(R) PRO/100+ clean_blob drivers/net/e100.c sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c -# clean_kconfig ./drivers/net/Kconfig 'E100' -# clean_mk CONFIG_E100 ./drivers/net/Makefile +# clean_kconfig drivers/net/Kconfig 'E100' +# clean_mk CONFIG_E100 drivers/net/Makefile # MYRI_SBUS - MyriCOM Gigabit Ethernet clean_blob drivers/net/myri_code.h -clean_kconfig ./drivers/net/Kconfig 'MYRI_SBUS' -clean_mk CONFIG_MYRI_SBUS ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'MYRI_SBUS' +clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile # TEHUTI - Tehuti Networks 10G Ethernet clean_blob drivers/net/tehuti_fw.h -clean_kconfig ./drivers/net/Kconfig 'TEHUTI' -clean_mk CONFIG_TEHUTI ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'TEHUTI' +clean_mk CONFIG_TEHUTI drivers/net/Makefile # TIGON3 - Broadcom Tigon3 patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch @@ -340,8 +350,8 @@ sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c # TYPHOON - 3cr990 series Typhoon clean_blob drivers/net/typhoon-firmware.h -clean_kconfig ./drivers/net/Kconfig 'TYPHOON' -clean_mk CONFIG_TYPHOON ./drivers/net/Makefile +clean_kconfig drivers/net/Kconfig 'TYPHOON' +clean_mk CONFIG_TYPHOON drivers/net/Makefile # appletalk @@ -350,23 +360,23 @@ clean_mk CONFIG_TYPHOON ./drivers/net/Makefile # clean_blob drivers/net/appletalk/cops.h clean_blob drivers/net/appletalk/cops_ffdrv.h clean_blob drivers/net/appletalk/cops_ltdrv.h -clean_kconfig ./drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT' -clean_mk CONFIG_COPS ./drivers/net/appletalk/Makefile +clean_kconfig drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT' +clean_mk CONFIG_COPS drivers/net/appletalk/Makefile # hamradio # YAM - YAM driver for AX.25 clean_blob drivers/net/hamradio/yam1200.h clean_blob drivers/net/hamradio/yam9600.h -clean_kconfig ./drivers/net/hamradio/Kconfig 'YAM' -clean_mk CONFIG_YAM ./drivers/net/hamradio/Makefile +clean_kconfig drivers/net/hamradio/Kconfig 'YAM' +clean_mk CONFIG_YAM drivers/net/hamradio/Makefile # pcmcia # PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA clean_blob drivers/net/pcmcia/ositech.h -clean_kconfig ./drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' -clean_mk CONFIG_PCMCIA_SMC91C92 ./drivers/net/pcmcia/Makefile +clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' +clean_mk CONFIG_PCMCIA_SMC91C92 drivers/net/pcmcia/Makefile # tokenring @@ -377,8 +387,8 @@ clean_mk CONFIG_PCMCIA_SMC91C92 ./drivers/net/pcmcia/Makefile # clean_blob drivers/net/tokenring/3c359.h # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/3c359_microcode.h -clean_kconfig ./drivers/net/tokenring/Kconfig '3C359' -clean_mk CONFIG_3C359 ./drivers/net/tokenring/Makefile +clean_kconfig drivers/net/tokenring/Kconfig '3C359' +clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile # SMCTR - SMC ISA/MCA adapter # No need to remove these, they don't contain non-Free code. @@ -386,15 +396,15 @@ clean_mk CONFIG_3C359 ./drivers/net/tokenring/Makefile # clean_blob drivers/net/tokenring/smctr.h # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/smctr_firmware.h -clean_kconfig ./drivers/net/tokenring/Kconfig 'SMCTR' -clean_mk CONFIG_SMCTR ./drivers/net/tokenring/Makefile +clean_kconfig drivers/net/tokenring/Kconfig 'SMCTR' +clean_mk CONFIG_SMCTR drivers/net/tokenring/Makefile # usb # USB_KAWETH - USB KLSI KL5USB101-based ethernet device support clean_blob drivers/net/usb/kawethfw.h -clean_kconfig ./drivers/net/usb/Kconfig 'USB_KAWETH' -clean_mk CONFIG_USB_KAWETH ./drivers/net/usb/Makefile +clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH' +clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile ######################## @@ -403,8 +413,8 @@ clean_mk CONFIG_USB_KAWETH ./drivers/net/usb/Makefile # QETH - Gigabit Ethernet device support clean_blob drivers/s390/net/qeth_mpc.c -clean_kconfig ./drivers/s390/net/Kconfig 'QETH' -clean_mk CONFIG_QETH ./drivers/s390/net/Makefile +clean_kconfig drivers/s390/net/Kconfig 'QETH' +clean_mk CONFIG_QETH drivers/s390/net/Makefile ######################## # Removed SCSI Drivers # @@ -412,20 +422,20 @@ clean_mk CONFIG_QETH ./drivers/s390/net/Makefile # SCSI_QLOGICPTI - PTI Qlogic, ISP Driver clean_blob drivers/scsi/qlogicpti_asm.c -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_QLOGICPTI' -clean_mk CONFIG_SCSI_QLOGICPTI ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGICPTI' +clean_mk CONFIG_SCSI_QLOGICPTI drivers/scsi/Makefile # SCSI_ADVANSYS - AdvanSys SCSI clean_blob drivers/scsi/advansys.c -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_ADVANSYS' -clean_mk CONFIG_SCSI_ADVANSYS ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_ADVANSYS' +clean_mk CONFIG_SCSI_ADVANSYS drivers/scsi/Makefile # SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI clean_blob drivers/scsi/ql1280_fw.h clean_blob drivers/scsi/ql1040_fw.h clean_blob drivers/scsi/ql12160_fw.h -clean_kconfig ./drivers/scsi/Kconfig 'SCSI_QLOGIC_1280' -clean_mk CONFIG_SCSI_QLOGIC_1280 ./drivers/scsi/Makefile +clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGIC_1280' +clean_mk CONFIG_SCSI_QLOGIC_1280 drivers/scsi/Makefile ####################### @@ -439,8 +449,8 @@ clean_mk CONFIG_SCSI_QLOGIC_1280 ./drivers/scsi/Makefile # clean_blob drivers/usb/misc/emi26.c # This file is not under the GPL, better remove it all. clean_file drivers/usb/misc/emi26_fw.h -clean_kconfig ./drivers/usb/misc/Kconfig 'USB_EMI26' -clean_mk CONFIG_USB_EMI26 ./drivers/usb/misc/Makefile +clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI26' +clean_mk CONFIG_USB_EMI26 drivers/usb/misc/Makefile # USB_EMI62 - EMI 6|2m USB Audio interface # No need to remove this, it doesn't contain non-Free code. @@ -448,77 +458,77 @@ clean_mk CONFIG_USB_EMI26 ./drivers/usb/misc/Makefile # This file are probably not under the GPL, better remove them all. clean_file drivers/usb/misc/emi62_fw_m.h clean_file drivers/usb/misc/emi62_fw_s.h -clean_kconfig ./drivers/usb/misc/Kconfig 'USB_EMI62' -clean_mk CONFIG_USB_EMI62 ./drivers/usb/misc/Makefile +clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI62' +clean_mk CONFIG_USB_EMI62 drivers/usb/misc/Makefile # USB_SISUSBVGA - USB 2.0 SVGA dongle support (Net2280/SiS315) clean_blob drivers/usb/misc/sisusbvga/sisusb_init.h -clean_kconfig ./drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA' -clean_mk CONFIG_USB_SISUSBVGA ./drivers/usb/misc/sisusbvga/Makefile +clean_kconfig drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA' +clean_mk CONFIG_USB_SISUSBVGA drivers/usb/misc/sisusbvga/Makefile # serial # USB_SERIAL_KEYSPAN_MPR - USB Keyspan MPR Firmware clean_file drivers/usb/serial/keyspan_mpr_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' # USB_SERIAL_KEYSPAN_USA18X - USB Keyspan USA-18X Firmware clean_file drivers/usb/serial/keyspan_usa18x_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' # USB_SERIAL_KEYSPAN_USA19 - USB Keyspan USA-19 Firmware clean_file drivers/usb/serial/keyspan_usa19_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' # USB_SERIAL_KEYSPAN_USA19QI - USB Keyspan USA-19QI Firmware clean_file drivers/usb/serial/keyspan_usa19qi_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' # USB_SERIAL_KEYSPAN_USA19QW - USB Keyspan USA-19QW Firmware clean_file drivers/usb/serial/keyspan_usa19qw_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' # USB_SERIAL_KEYSPAN_USA19W - USB Keyspan USA-19W Firmware clean_file drivers/usb/serial/keyspan_usa19w_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' # USB_SERIAL_KEYSPAN_USA28 - USB Keyspan USA-28 Firmware clean_file drivers/usb/serial/keyspan_usa28_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' # USB_SERIAL_KEYSPAN_USA28XA - USB Keyspan USA-28XA Firmware clean_file drivers/usb/serial/keyspan_usa28xa_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' # USB_SERIAL_KEYSPAN_USA28XB - USB Keyspan USA-28XB Firmware clean_file drivers/usb/serial/keyspan_usa28xb_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' # USB_SERIAL_KEYSPAN_USA28X - USB Keyspan USA-28X Firmware clean_file drivers/usb/serial/keyspan_usa28x_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' # USB_SERIAL_KEYSPAN_USA49W - USB Keyspan USA-49W Firmware clean_file drivers/usb/serial/keyspan_usa49w_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' # USB_SERIAL_KEYSPAN_USA49WLC - USB Keyspan USA-49WLC Firmware clean_file drivers/usb/serial/keyspan_usa49wlc_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' -clean_mk CONFIG_USB_SERIAL_KEYSPAN ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' +clean_mk CONFIG_USB_SERIAL_KEYSPAN drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT - USB Inside Out Edgeport Serial Driver clean_file drivers/usb/serial/io_fw_boot.h clean_file drivers/usb/serial/io_fw_down.h clean_file drivers/usb/serial/io_fw_down2.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' -clean_mk CONFIG_USB_SERIAL_EDGEPORT ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' +clean_mk CONFIG_USB_SERIAL_EDGEPORT drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT_TI - USB Inside Out Edgeport Serial Driver (TI devices) clean_file drivers/usb/serial/io_fw_boot2.h clean_file drivers/usb/serial/io_fw_down3.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' -clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' +clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile # USB_SERIAL_TI - USB TI 3410/5052 Serial Driver clean_blob drivers/usb/serial/ti_fw_3410.h clean_blob drivers/usb/serial/ti_fw_5052.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_TI' -clean_mk CONFIG_USB_SERIAL_TI ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_TI' +clean_mk CONFIG_USB_SERIAL_TI drivers/usb/serial/Makefile # USB_SERIAL_WHITEHEAT - USB ConnectTech WhiteHEAT Serial Driver clean_blob drivers/usb/serial/whiteheat_fw.h -clean_kconfig ./drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' -clean_mk CONFIG_USB_SERIAL_WHITEHEAT ./drivers/usb/serial/Makefile +clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' +clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile ######################### @@ -527,13 +537,13 @@ clean_mk CONFIG_USB_SERIAL_WHITEHEAT ./drivers/usb/serial/Makefile # FB_ASILIANT - Asiliant (Chips) 69000 display support clean_blob drivers/video/asiliantfb.c -clean_kconfig ./drivers/video/Kconfig 'FB_ASILIANT' -clean_mk CONFIG_FB_ASILIANT ./drivers/video/Makefile +clean_kconfig drivers/video/Kconfig 'FB_ASILIANT' +clean_mk CONFIG_FB_ASILIANT drivers/video/Makefile # FB_CT65550 - Chips 65550 display support clean_blob drivers/video/chipsfb.c -clean_kconfig ./drivers/video/Kconfig 'FB_CT65550' -clean_mk CONFIG_FB_CT65550 ./drivers/video/Makefile +clean_kconfig drivers/video/Kconfig 'FB_CT65550' +clean_mk CONFIG_FB_CT65550 drivers/video/Makefile ######################### @@ -547,8 +557,8 @@ clean_file sound/pci/cs46xx/imgs/cwc4630.h clean_file sound/pci/cs46xx/imgs/cwcasync.h clean_file sound/pci/cs46xx/imgs/cwcdma.h clean_file sound/pci/cs46xx/imgs/cwcsnoop.h -clean_kconfig ./sound/pci/Kconfig 'SND_CS46XX' -# sed -i '/cs46xx\/ \\/d' ./sound/pci/Makefile +clean_kconfig sound/pci/Kconfig 'SND_CS46XX' +# sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL