X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.32;h=1d63e7d18dcbe78e561f068b90d6df567f0cf67b;hb=6dd83f6f521e3a3add49c5f2ff54d02988b13160;hp=54f59323b998a5df580395a79a327f3c1bd9e598;hpb=8146f451aec77d62c6e893e69c04ca8e5800c5ac;p=releases.git diff --git a/deblob-2.6.32 b/deblob-2.6.32 index 54f59323b998..1d63e7d18dcb 100755 --- a/deblob-2.6.32 +++ b/deblob-2.6.32 @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010 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' @@ -421,6 +422,9 @@ clean_sed ' s,\([" ]\)request_firmware(,\1reject_firmware(, ' arch/arm/mach-netx/xc.c 'disabled non-Free firmware-loading machinery' clean_blob arch/arm/mach-netx/xc.c +if grep MODULE_FIRMWARE drivers/net/netx-eth.c > /dev/null; then + clean_blob drivers/net/netx-eth.c +fi clean_kconfig arch/arm/Kconfig 'ARCH_NETX' clean_mk CONFIG_ARCH_NETX arch/arm/Makefile @@ -822,6 +826,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 @@ -829,6 +834,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 @@ -1026,7 +1033,12 @@ announce NETXEN_NIC - "NetXen Multi port (1/10) Gigabit Ethernet NIC" reject_firmware drivers/net/netxen/netxen_nic.h reject_firmware drivers/net/netxen/netxen_nic_main.c reject_firmware drivers/net/netxen/netxen_nic_init.c -clean_blob drivers/net/netxen/netxen_nic_init.c +if grep ROMIMAGE_NAME drivers/net/netxen/netxen_nic_init.c > /dev/null; then + clean_blob drivers/net/netxen/netxen_nic.h + clean_blob drivers/net/netxen/netxen_nic_main.c +else + clean_blob drivers/net/netxen/netxen_nic_init.c +fi clean_kconfig drivers/net/Kconfig 'NETXEN_NIC' clean_mk CONFIG_NETXEN_NIC drivers/net/Makefile @@ -1051,6 +1063,9 @@ announce SPIDER_NET - "Spider Gigabit Ethernet driver" reject_firmware drivers/net/spider_net.c clean_sed 's,spider_fw\.bin,DEBLOBBED.bin,g' \ drivers/net/spider_net.c 'removed non-Free firmware notes' +if grep MODULE_FIRMWARE drivers/net/spider_net.c > /dev/null; then + clean_blob drivers/net/spider_net.c +fi clean_blob drivers/net/spider_net.h clean_kconfig drivers/net/Kconfig 'SPIDER_NET' clean_mk CONFIG_SPIDER_NET drivers/net/Makefile @@ -1305,7 +1320,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' @@ -1370,7 +1385,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' @@ -2072,7 +2087,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