X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.39;h=2a76343fdc267686cbc471d31fbcd9102e451282;hb=3c7b1952ca8b91e0a9c25170de7c7a0c494ff138;hp=7c6b2f0f4528e8ae3e33e8c39f30510034660acd;hpb=79abd042a6db918c2337be8367918a60d22fcb21;p=releases.git diff --git a/deblob-2.6.39 b/deblob-2.6.39 index 7c6b2f0f4528..2a76343fdc26 100755 --- a/deblob-2.6.39 +++ b/deblob-2.6.39 @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010, 2011 Alexandre Oliva +# Copyright (C) 2008, 2009, 2010, 2011, 2012 +# Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -44,7 +45,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.39 extra=0- +kver=2.6.39 extra=0++ case $1 in --force) @@ -308,9 +309,9 @@ WHAT IS Linux-libre?\ http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware\ \ Our mascot is Freedo, a light-blue penguin that has just come out\ - of the the shower. Although we like penguins, GNU is a much\ - greater contribution to the entire system, so its mascot deserves\ - more promotion. See our web page for their images.\ + of the shower. Although we like penguins, GNU is a much greater\ + contribution to the entire system, so its mascot deserves more\ + promotion. See our web page for their images.\ http://linux-libre.fsfla.org/\ ' README 'added blurb about Linux-libre' @@ -645,6 +646,7 @@ clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_CXUSB' clean_mk CONFIG_DVB_USB_CXUSB drivers/media/dvb/dvb-usb/Makefile announce DVB_USB_DIB0700 - "DiBcom DiB0700 USB DVB devices" +reject_firmware drivers/media/dvb/dvb-usb/dib0700_devices.c clean_blob drivers/media/dvb/dvb-usb/dib0700_devices.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DIB0700' clean_mk CONFIG_DVB_USB_DIB0700 drivers/media/dvb/dvb-usb/Makefile @@ -885,6 +887,7 @@ clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/dvb/ttusb-budget/Makefile announce DVB_TTUSB_DEC - "Technotrend/Hauppauge USB DEC devices" reject_firmware drivers/media/dvb/ttusb-dec/ttusb_dec.c clean_blob drivers/media/dvb/ttusb-dec/ttusb_dec.c +clean_blob Documentation/dvb/ttusb-dec.txt clean_kconfig drivers/media/dvb/ttusb-dec/Kconfig 'DVB_TTUSB_DEC' clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/dvb/ttusb-dec/Makefile @@ -892,6 +895,8 @@ clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/dvb/ttusb-dec/Makefile announce VIDEO_BT848 - "BT848 Video For Linux" reject_firmware drivers/media/video/bt8xx/bttv-cards.c +clean_blob drivers/media/video/bt8xx/bttv-cards.c +clean_blob Documentation/video4linux/bttv/README clean_kconfig drivers/media/video/bt8xx/Kconfig 'VIDEO_BT848' clean_mk CONFIG_VIDEO_BT848 drivers/media/video/bt8xx/Makefile @@ -1036,7 +1041,7 @@ clean_blob drivers/net/starfire.c clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE' clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile -announce CONFIG_BNA - "Brocade 1010/1020 10Gb Ethernet Driver support" +announce BNA - "Brocade 1010/1020 10Gb Ethernet Driver support" clean_blob drivers/net/bna/bnad.c clean_blob drivers/net/bna/cna.h reject_firmware drivers/net/bna/cna_fwimg.c @@ -1388,18 +1393,27 @@ clean_blob drivers/net/wireless/orinoco/orinoco_usb.c clean_kconfig drivers/net/wireless/orinoco/Kconfig 'ORINOCO_USB' clean_mk CONFIG_ORINOCO_USB drivers/net/wireless/orinoco/Makefile -announce WLAGS49_H2 - 'Agere Systems HERMES II Wireless PC Card Model 0110' +announce WLAGS49_H2 - "Agere Systems HERMES II Wireless PC Card Model 0110" # Some pieces of the firmware images are most definitely data, but # others seem to be code. -clean_file drivers/staging/wlags49_h2/ap_h2.c -clean_file drivers/staging/wlags49_h2/sta_h2.c +clean_blob drivers/staging/wlags49_h2/ap_h2.c +clean_blob drivers/staging/wlags49_h2/sta_h2.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h2.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h2.c clean_blob drivers/staging/wlags49_h2/wl_profile.c +clean_sed ' + s,\(.*hcf_status = \)dhf_download_fw(.*&fw_image );,//& /*(DEBLOBBED)*/\n\1HCF_ERR_INCOMP_FW;, +' drivers/staging/wlags49_h2/wl_main.c 'reject built-in non-Free firmware' clean_kconfig drivers/staging/wlags49_h2/Kconfig 'WLAGS49_H2' clean_mk CONFIG_WLAGS49_H2 drivers/staging/Makefile -announce WLAGS49_H25 - 'Linksys Systems HERMES II.5 Wireless-G_CompactFlash_Card' -clean_file drivers/staging/wlags49_h2/ap_h25.c -clean_file drivers/staging/wlags49_h2/sta_h25.c +announce WLAGS49_H25 - "Linksys Systems HERMES II.5 Wireless-G_CompactFlash_Card" +# Some pieces of the firmware images are most definitely data, but +# others seem to be code. +clean_blob drivers/staging/wlags49_h2/ap_h25.c +clean_blob drivers/staging/wlags49_h2/sta_h25.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h25.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h25.c clean_kconfig drivers/staging/wlags49_h25/Kconfig 'WLAGS49_H25' clean_mk CONFIG_WLAGS49_H25 drivers/staging/Makefile @@ -1502,7 +1516,7 @@ clean_blob drivers/net/wireless/libertas_tf/if_usb.c clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_THINFIRM_USB' clean_mk CONFIG_LIBERTAS_THINFIRM_USB drivers/net/wireless/libertas_tf/Makefile -announce MWL8K - 'Marvell 88W8xxx PCI/PCIe Wireless support' +announce MWL8K - "Marvell 88W8xxx PCI/PCIe Wireless support" reject_firmware drivers/net/wireless/mwl8k.c clean_blob drivers/net/wireless/mwl8k.c clean_kconfig drivers/net/wireless/Kconfig 'MWL8K' @@ -1555,7 +1569,7 @@ clean_blob drivers/net/wireless/p54/p54usb.h clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_USB' clean_mk CONFIG_P54_USB drivers/net/wireless/p54/Makefile -announce PRISM54 - 'Intersil Prism GT/Duette/Indigo PCI/Cardbus' +announce PRISM54 - "Intersil Prism GT/Duette/Indigo PCI/Cardbus" reject_firmware drivers/net/wireless/prism54/islpci_dev.c clean_blob drivers/net/wireless/prism54/islpci_dev.c clean_kconfig drivers/net/wireless/Kconfig 'PRISM54' @@ -1604,17 +1618,17 @@ clean_mk CONFIG_RT2870 drivers/staging/rt2870/Makefile announce RTL8192C_COMMON - "Realtek RTL8192C[EU]/RTL8188C[EU] Wireless Network Adapters" reject_firmware drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c -clean_kconfig drivers/net/wireless/rtlwifi RTL8192C_COMMON +clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192C_COMMON clean_mk CONFIG_RTL8192C_COMMON drivers/net/wireless/rtlwifi/rtl8192c/Makefile announce RTL8192CE - "Realtek RTL8192CE/RTL8188CE Wireless Network Adapter" clean_blob drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -clean_kconfig drivers/net/wireless/rtlwifi RTL8192CE +clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192CE clean_mk CONFIG_RTL8192CE drivers/net/wireless/rtlwifi/rtl8192ce/Makefile announce RTL8192CU - "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter" clean_blob drivers/net/wireless/rtlwifi/rtl8192cu/sw.c -clean_kconfig drivers/net/wireless/rtlwifi RTL8192CU +clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192CU clean_mk CONFIG_RTL8192CU drivers/net/wireless/rtlwifi/rtl8192cu/Makefile announce RTL8192E - "RealTek RTL8192E Wireless LAN NIC driver" @@ -1636,14 +1650,7 @@ clean_kconfig drivers/staging/rtl8712/Kconfig 'R8712U' clean_mk CONFIG_R8712U drivers/staging/rtl8712/Makefile announce VT6656 - "VIA Technologies VT6656 support" -clean_sed ' -/^FIRMWAREbDownload($/,/^}$/ { - /PBYTE.*pBuffer/ i\ - PBYTE abyFirmware[1] = { 0 }; - /-->Download firmware/ i\ - printk("vt6656: missing Free firmware\\n");\ - return (FALSE); -}' drivers/staging/vt6656/firmware.c 'report missing Free firmware' +reject_firmware drivers/staging/vt6656/firmware.c clean_blob drivers/staging/vt6656/firmware.c clean_kconfig drivers/staging/vt6656/Kconfig 'VT6656' clean_mk CONFIG_VT6656 drivers/staging/vt6656/Makefile @@ -2393,7 +2400,6 @@ clean_mk 'CONFIG_SND_USB_6FIRE' sound/usb/6fire/Makefile announce Documentation - "non-Free firmware scripts and documentation" clean_blob Documentation/dvb/avermedia.txt clean_blob Documentation/dvb/opera-firmware.txt -clean_blob Documentation/dvb/ttusb-dec.txt clean_blob Documentation/sound/alsa/ALSA-Configuration.txt clean_blob Documentation/sound/oss/MultiSound clean_blob Documentation/sound/oss/PSS