X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.34;h=a1fdba05aae44186e644c67a5c279f51378fa5e7;hb=3c7b1952ca8b91e0a9c25170de7c7a0c494ff138;hp=715b304087e45b2180901eefcb6f031a9be2a686;hpb=57d4f97eb316c7227ddf75a7bcb523b20dd533f0;p=releases.git diff --git a/deblob-2.6.34 b/deblob-2.6.34 index 715b304087e4..a1fdba05aae4 100755 --- a/deblob-2.6.34 +++ b/deblob-2.6.34 @@ -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 # @@ -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' @@ -854,6 +855,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 @@ -861,6 +863,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 @@ -1287,18 +1291,27 @@ clean_blob drivers/net/wireless/orinoco/fw.c clean_kconfig drivers/net/wireless/Kconfig 'HERMES' clean_mk CONFIG_HERMES 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 @@ -1384,7 +1397,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' @@ -1449,7 +1462,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' @@ -2163,7 +2176,6 @@ clean_mk CONFIG_DX_SEP drivers/staging/sep/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