From 8d030e05ac3d6a809333ee4bebc2a38883583cd0 Mon Sep 17 00:00:00 2001 From: Jason Self Date: Mon, 4 Feb 2019 18:18:53 -0800 Subject: [PATCH] deblob-2.6.24-libre1 --- deblob-2.6.24 | 283 +++++++++++++++++++++++++++----------------------- deblob-check | 99 ++++++++++++------ deblob-main | 28 +++-- 3 files changed, 239 insertions(+), 171 deletions(-) diff --git a/deblob-2.6.24 b/deblob-2.6.24 index efd00d3fed5..9eef94de5c5 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -40,7 +40,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=2.6.25 extra= +kver=2.6.24 extra=1 sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile @@ -58,15 +58,24 @@ function clean_file { rm -v $1 } +function check_changed { + if cmp $1.deblob $1 > /dev/null; then + echo $1 did not change, something is wrong >&2 + exit 1 + fi + mv $1.deblob $1 +} + check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check 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 - mv $name.deblob $name + check_changed $name else clean_file $1 fi @@ -74,21 +83,31 @@ function clean_blob { function clean_kconfig { #$1 = filename $2 = things to remove - sed -i "/^config $2\$/{p;i\ + echo Marking config $2 as depending on NONFREE in $1 + sed "/^config \\($2\\)\$/{p;i\ depends on NONFREE -d;}" $1 +d;}" $1 > $1.deblob + check_changed $1 } 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 - mv $1.deblob $1 + check_changed $1 } ####################### @@ -109,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 ######################## @@ -125,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 ######################### @@ -158,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 # @@ -265,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 @@ -327,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 @@ -337,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' +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 @@ -364,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. @@ -373,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 ######################## @@ -390,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 # @@ -399,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 ####################### @@ -426,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. @@ -435,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 ######################### @@ -514,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 ######################### @@ -534,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-check b/deblob-check index 2c5c94e2bd1..bc396a31a76 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2008-03-29 $Rev: 3476 $ +# deblob-check version 2008-05-18 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -473,34 +473,40 @@ fi set_except () { # Look for a multi-line definition starting with a line that matches # $1 (implicitly anchored to the beginning of the line), and ending - # at the first ';'. + # at the first ';'. $2 may optionally name the files in which this + # match is to be disregarded as a potential blob. initnc () { - addx "$1[^;]*;" + addx "$1[^;]*;\\?" $2 } # Look for a multi-line definition starting with a line that matches # $1 (implicitly anchored to the beginning of the line), and ending # at the first ';' that's not within comments. initc () { - addx "$1\\([^;]*\\|$comment\\)*;" + addx "$1\\([^;]*\\|$comment\\)*;\\?" $2 } # Accept as a non-blob an expression $1 that would have otherwise # triggered blob detection. The expression must end in a way that # would trigger the blob detection machinery. accept () { - addx "$1" + addx "$1" $2 } # Match up to the end a comment started in $1. ocomment () { - addx "$1\\([^*]\\|[*][*]*[^*/]\\|[*]*[\\n]\\)*[*]*[*][/]" + addx "$1\\([^*]\\|[*][*]*[^*/]\\|[*]*[\\n]\\)*[*]*[*][/]" $2 } # Match $1 followed by backslash-terminated lines and a last # non-backslash-terminated line. oprepline () { - addx "$1\\([^\\n]*\\\\[\\n]\\)*[^\\n\\\\]*$eol" + addx "$1\\([^\\n]*\\\\[\\n]\\)*[^\\n\\\\]*$eol" $2 + } + + # Match $1 in $2 as a blob. Not implemented yet. + blob () { + : } case /$1 in @@ -531,8 +537,7 @@ set_except () { initnc ' \.initial_reg_values = (struct ixp2000_reg_value \[\]) {' # drivers/net/ixp2000/ixp2400_rx.ucode -> ixp2400_rx.uc initnc ' \.initial_reg_values = (struct ixp2000_reg_value \[\]) {' - # crypto/tcrypt.h - initnc '[ ]*\.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= {' + initnc '[ ]*\.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= [{"]' crypto/tcrypt.h # checked: @@ -611,7 +616,7 @@ set_except () { initnc ' static const unsigned char invert5\[\] =' initnc 'static unsigned char alpa2target\[\] =' initnc 'static unsigned char target2alpa\[\] =' - oprepline '#define INIT_THREAD [{0},]\+[ ]*\\[ ]*[{0},]\+' + oprepline '#define INIT_THREAD [{0},]\+[ ]*\\[\n][ ]*[{0},]\+' initnc 'static uint tas300\(1c\|4\)_\(master\|mixer\|treble\|bass\)_tab\[\]=' initnc 'static short dmasound_[au]law2dma16\[\] =' initnc 'static const unsigned short DACVolTable\[101\] =' @@ -653,8 +658,8 @@ set_except () { accept '[ ]\{1,2\}err = sn9c102_write_const_regs(cam\(,[ \n]\+{0x[0-9a-fA-F][0-9a-fA-F], 0x[0-9a-fA-F][0-9a-fA-F]}\)*);' # too lax? - initnc 'static yyconst flex_int\(16\|32\)_t yy_[^[]*\[[][0-9]*\] =' - initnc 'static const \(yytype_u\?int\(8\|16\)\|unsigned \(short\( int\)\?\|char\)\) yy[^[]*\[\] =' + initnc 'static yyconst \(flex_int\(16\|32\)_t\|\(\(short \)\?int\)\) yy_[^[]*\[[][0-9]*\] =' + initnc 'static const \(yytype_u\?int\(8\|16\)\|\(unsigned \)\?\(short\( int\)\?\|char\)\) yy[^[]*\[\] =' initnc '\(\| \)static \(const \|\)\(unsigned \(short\|char\)\|struct SiS_[^ ]*\) SiS[^[]*\(\[[] [*0-9]*\]\)\+ *=' initnc 'static const a3d_Hrtf_t A3dHrirZeros = {' @@ -828,7 +833,7 @@ set_except () { initnc 'static const u32 treble_table\[41\]\[5\] =' initnc 'static const u64 [CT][0-7]\[256\] =' initnc 'static const u64 sbox[1-4]\[256\] =' - initnc 'static const u64 sha512_K\[80\] =' + initnc 'static const u64 sha512_K\[80\] =' 'crypto/sha512\(_generic\)\?.c' initnc 'static const u8 Tr\[4\]\[8\] =' initnc 'static const u8 aes_sbox\[256\] =' initnc 'static const u8 calc_sb_tbl\[512\] =' @@ -910,9 +915,9 @@ set_except () { initnc 'static struct cipher_testvec xtea_dec_tv_template\[\] =' initnc 'static struct cipher_testvec xtea_enc_tv_template\[\] =' initnc 'static struct comp_testvec deflate_decomp_tv_template\[\] =' - initnc 'static struct hash_testvec aes_xcbc128_tv_template\[\] =' + initnc 'static struct hash_testvec aes_xcbc128_tv_template\[\] =' crypto/tcrypt.h initnc 'static struct hash_testvec crc32c_tv_template\[\] =' - initnc 'static struct hash_testvec hmac_sha256_tv_template\[\] =' + initnc 'static struct hash_testvec hmac_sha256_tv_template\[\] =' crypto/tcrypt.h initnc 'static struct hash_testvec sha256_tv_template\[\] =' initnc 'static struct hash_testvec sha384_tv_template\[\] =' initnc 'static struct hash_testvec sha512_tv_template\[\] =' @@ -951,8 +956,10 @@ set_except () { initnc 'static u8 ini_time_value\[\]\[8\] =' initnc 'static u8 init_tab \[\] =' initnc 'static u8 mac_reader\[\] =' - initnc 'static u8 mt2131_config1\[\] =' - initnc 'static u8 mt2266_init2\[\] =' + initnc 'static u8 mt2131_config1\[\] =' drivers/media/dvb/frontends/mt2131.c # <= 2.6.25 + initnc 'static u8 mt2131_config1\[\] =' drivers/media/common/tuners/mt2131.c # >= 2.6.26 + initnc 'static u8 mt2266_init2\[\] =' drivers/media/dvb/frontends/mt2266.c # <= 2.6.25 + initnc 'static u8 mt2266_init2\[\] =' drivers/media/common/tuners/mt2266.c # >= 2.6.26 initnc 'static u8 opera1_inittab\[\] =' initnc 'static u8 rco_time_value\[\]\[8\] =' initnc 'static u8 saa7113_init_regs\[\] =' @@ -1056,8 +1063,8 @@ set_except () { initnc 'u_short shift_ctrl_map\[NR_KEYS\] =' initnc 'u_short shift_map\[NR_KEYS\] *=' initnc 'uint patch_2[0f]00\[\] =' - initnc 'uint16_t e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' - initnc 'uint16_t e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' + initnc '\(uint16_t\|u16\) e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c # u16 on 2.6.26 + initnc '\(uint16_t\|u16\) e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c # u16 on 2.6.26 initnc '} euc2sjisibm_jisx0212_map\[\] =' initnc '} freq\[\] =' initnc '} hps_h_coeff_tab \[\] =' @@ -1066,13 +1073,50 @@ set_except () { initnc '} maven_gamma\[\] =' initnc '} mem_table\[\] =' initnc '} mxb_saa7740_init\[\] =' - initnc '} pll_table\[\] =' + initnc '} pll_table\[\] =' drivers/video/geode/lxfb_ops.c initnc '} qam256_snr_tab\[\] =' initnc '} qam64_snr_tab\[\] =' initnc '} sil_port\[\] =' initnc '} vsb_snr_tab\[\] =' initnc '} yss225_registers\[\] __devinitdata =' ;; + */patch*2.6.26-rc*) + initnc 'static u64 vec2off\[68\] =' arch/ia64/kvm/process.c + initnc " interrupts = <\\(0x\\)\\?3 \\(0x\\)\\?0 \\(0x\\)\\?0 $blobpat*>;" 'arch/powerpc/boot/dts/\(cm5200\|lite5200b\?\|kuroboxHG\|pcm030\|tqm5200\).dts' + initnc 'static const u32 crctab32\[\] =' arch/x86/boot/tools/build.c + initnc 'static const u64 sha512_K\[80\] =' 'crypto/sha512\(_generic\)\?.c' + initnc 'static struct hash_testvec \(hmac_sha\(224\|256\)\|aes_xcbc128\|crc32c\)_tv_template\[\] =' crypto/tcrypt.h + initnc 'static struct cipher_testvec \(bf_cbc\|serpent\|tnepres\|aes\(_\(cbc\|ctr\|xts\)\)\?\|x\?tea\|anubis\(_cbc\)\?\|xeta\|camellia_cbc\|cts_mode\)_\(enc\|dec\)_tv_template\[\] =' crypto/tcrypt.h + initnc ' \.\(digest\|entries\|input\|key\|output\|plaintext\|result\)[ ]*= [{"]' crypto/tcrypt.h + initnc 'static const u8 speedtab \[3\]\[12\] =' drivers/ide/legacy/umc8672.c + initnc 'static u8 cvs_time_value\[\]\[XFER_UDMA_6 - XFER_UDMA_0 + 1\] =' drivers/ide/pci/sis5513.c + initnc 'static u8 \(ini\|act\|rco\)_time_value\[\]\[8\] =' drivers/ide/pci/sis5513.c + initnc 'static u8 mt2131_config1\[\] =' drivers/media/common/tuners/mt2131.c + initnc 'static u8 mt2266_init2\[\] =' drivers/media/common/tuners/mt2266.c + initnc 'u16 e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c + initnc '\(uint16_t\|u16\) e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' drivers/net/e1000/e1000_hw.c # u16 on 2.6.26 + oprepline '#define AR5K_RATES_11[ABG] ' drivers/net/wireless/ath5k/ath5k.h + oprepline ' { 1, MODULATION_XR, 1000, 2, 139, 1 }, ' drivers/net/wireless/ath5k/ath5k.h + initnc 'static const struct ath5k_ini_mode rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c + initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =[*][/];' scripts/kconfig/zconf.tab.c_shipped + initnc 'static const yytype_u\?int\(8\|16\) yy[^\n []*\[\] =' scripts/kconfig/zconf.tab.c_shipped + # new in 2.6.26 + initnc 'static struct mse2snr_tab \(vsb\|qam\(64\|256\)\)_mse2snr_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} \(VSB\|QAM\)_mod_tab\[\] =' drivers/media/dvb/frontends/au8522.c + initnc '} itd1000_\(lpf_pga\|fre_values\)\[\] =' drivers/media/dvb/frontends/itd1000.c + initnc '} \(vsb\|qam\(64\|256\)\)_snr_tab\[\] =' drivers/media/dvb/frontends/s5h1411.c + initnc '} snr_tab\[\] =' drivers/media/dvb/frontends/tda10048.c + initnc ' static const u8 biphase_tbl\[\] =' drivers/media/video/cx18/cx18-av-vbi.c + initnc ' static const u8 mpeg_hdr_data\[\] =' drivers/media/video/cx18/cx18-vbi.c + initnc 'static u32 reg_init_initialize\[\] =' drivers/media/video/saa717x.c + initnc ' } vals\[\] =' drivers/media/video/saa717x.c + initnc 'static const u32 \(main\|gear\)_seedset\[BACKOFF_SEEDSET_ROWS\]\[BACKOFF_SEEDSET_LFSRS\] =' drivers/net/forcedeth.c + blob '^unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\) = '"$blobsep$blobseq*$blobsep;" drivers/s390/net/qeth_core_mpc.c # from drivers/s390/net/qeth_mpc.c in 2.6.25 + initnc '} pll_table\[\] =' drivers/video/geode/lxfb_ops.c + accept " { 0x00014284, 19688 },[\n] { 0x00011104, 20400 },[\n] { $blobpat* }," drivers/video/geode/lxfb_ops.c # won't be necessary in rc3 + initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c + accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/logo_blackfin_clut224.ppm + ;; */patch*2.6.25-rc*) initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static uchar sbox\[8\]\[4\]\[16\] = {[*][/];' accept ' \$3 = {{pge = {{ste = {\(\([0-9][0-9a-fx{},\n ]*\|\(pge\|ste\) =\|\)[{},\n ]*\)*}'"$eol" @@ -1094,14 +1138,9 @@ set_except () { initnc 'static const struct arb_line write_arb_data\[NUM_WR_Q\]\[MAX_WR_ORD + 1\] =' initnc 'uint16_t e1000_igp_cable_length_table\[IGP01E1000_AGC_LENGTH_TABLE_SIZE\] =' initnc 'uint16_t e1000_igp_2_cable_length_table\[IGP02E1000_AGC_LENGTH_TABLE_SIZE\] =' - oprepline '#define AR5K_RATES_11A ' - oprepline '#define AR5K_RATES_11B ' - oprepline '#define AR5K_RATES_11G ' - oprepline '#define AR5K_RATES_TURBO ' - oprepline '#define AR5K_RATES_XR ' + oprepline '#define AR5K_RATES_11\([ABG]\|TURBO\|XR\) ' drivers/net/wireless/ath5k/ath5k.h initnc ' } blinkrates\[\] =' initnc 'static const struct ath5k_ini ar5212_ini\[\] =' - initnc 'static const struct ath5k_ini_mode rf5413_ini_mode_end\[\] =' initnc 'static const struct ath5k_ini_rf rfregs_5111\[\] =' initnc 'static const struct ath5k_ini_rf rfregs_5112\[\] =' initnc 'static const struct ath5k_ini_rf rfregs_5112a\[\] =' @@ -1172,7 +1211,7 @@ set_except () { oprepline '#define AR5K_RATES_TURBO ' oprepline '#define AR5K_RATES_XR ' initnc 'static const struct ath5k_ini ar5212_ini\[\] =' - initnc 'static const struct ath5k_ini_mode rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\] =' + initnc 'static const struct ath5k_ini_mode rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c # ? initnc ' } blinkrates\[\] =' # git logs @@ -1783,8 +1822,10 @@ check () { falsepos_name=`mktemp -t deblob-check-falsepos-XXXXXX` tempfiles="$falsepos_name" - # Add $1 to falsepos. Its usage makes it implicitly anchored to - # the beginning of the line. + + # Add $1 to falsepos. Its usage makes it implicitly anchored to the + # beginning of the line. $2, if present, will some day narrow the + # falsepos matches to files that match it. addx () { if test -n "$1"; then echo -n "\\|$1" >> $falsepos_name diff --git a/deblob-main b/deblob-main index 3d8d5f5192b..ba716c2ef32 100755 --- a/deblob-main +++ b/deblob-main @@ -147,6 +147,8 @@ fi trap "status=$?; echo cleaning up...; rm -rf orig-linux-$kver linux-$kver linux-$kver-$libre linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.tar.bz2 linux-$kver-$libre.patch linux-$kver-$libre.xdelta; (exit $status); exit" 0 1 2 15 +set -e + echo Uncompressing linux-$kver.tar.bz2 into linux-$kver.tar rm -rf linux-$kver linux-$kver.tar bunzip2 < linux-$kver.tar.bz2 > linux-$kver.tar @@ -155,22 +157,25 @@ echo Extracing linux-$kver.tar into linux-$kver tar -xf linux-$kver.tar rm -rf linux-$kver-$libre linux-$kver-$libre.tar -echo Copying linux-$kver to linux-$kver-$libre.tar +echo Copying linux-$kver to linux-$kver-$libre cp linux-$kver.tar linux-$kver-$libre.tar cp -lR linux-$kver/. linux-$kver-$libre echo Deblobbing within linux-$kver-$libre -(cd linux-$kver-$libre && /bin/sh ../$deblob) +(cd linux-$kver-$libre && /bin/sh ../$deblob) || exit 1 rm -f linux-$kver-$libre.patch +# Do not copy these scripts for now, deblob-check regards itself as a blog. +# cp -p $0 $deblob deblob-check linux-$kver-$libre + echo Generating linux-$kver-$libre.patch -diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch +diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch || : echo Removing removed or modified files from linux-$kver-$libre.tar diff -rq linux-$kver linux-$kver-$libre | sed -n " - s,^Only in \(linux-$kver/.*\): \(.*\),\1/\2,p; - s,^Files \(linux-$kver/.*\) and libre-\1 differ,\1,p; + s,^Only in \\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\1/\3,p; + s,^Files \\(linux-$kver\\)/\\(.*\\) and \\1-$libre/\\2 differ,\\1/\\2,p; " | xargs tar --delete -f linux-$kver-$libre.tar @@ -180,8 +185,8 @@ mv linux-$kver orig-linux-$kver mv linux-$kver-$libre linux-$kver diff -rq orig-linux-$kver linux-$kver | sed -n " - s,^Files orig-\(linux-$kver/.*\) and \1 differ,\1,p; - s,^Only in \(linux-$kver/.*\): \(.*\),\1/\2,p; + s,^Files orig-\\(linux-$kver/.*\\) and \\1 differ,\\1,p; + s,^Only in \\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\\1/\\3,p; " | xargs tar --append -f linux-$kver-$libre.tar @@ -189,11 +194,11 @@ echo Wiping out extracted trees rm -rf linux-$kver orig-linux-$kver echo Creating xdelta between linux-$kver.tar and linux-$kver-$libre.tar -xdelta delta -0 linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.xdelta +xdelta delta -0 linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.xdelta || : -echo Compressing linux-$kver-$libre.tar +echo Compressing linux-$kver-$libre.tar and linux-$kver-$libre.xdelta rm -f linux-$kver.tar -bzip2 -9 linux-$kver-$libre.tar +bzip2 -9 linux-$kver-$libre.tar linux-$kver-$libre.xdelta trap "status=$?; (exit $status); exit" 0 1 2 15 @@ -201,6 +206,9 @@ echo Done except for signing, feel free to interrupt gpg -a --detach-sign linux-$kver-$libre.tar.bz2 mv linux-$kver-$libre.tar.bz2.asc linux-$kver-$libre.tar.bz2.sign +gpg -a --detach-sign linux-$kver-$libre.xdelta.bz2 +mv linux-$kver-$libre.xdelta.bz2.asc linux-$kver-$libre.xdelta.bz2.sign + echo All set, please review linux-$kver-$libre.patch exit 0 -- 2.25.1