X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.39;h=4117c9120529ba6348fcb5492ae5b773c2e642d8;hb=8b469ab6b40c62385133c5246720f92bf1c4548f;hp=956038bb66a042571592c529b3e9573fb2a85886;hpb=a7a4aa75ce971719c61fc07caed423b9a3584d73;p=releases.git diff --git a/deblob-2.6.39 b/deblob-2.6.39 index 956038bb66a0..4117c9120529 100755 --- a/deblob-2.6.39 +++ b/deblob-2.6.39 @@ -1,9 +1,13 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010, 2011 Alexandre Oliva +# Copyright (C) 2008-2012 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # +# This program is part of GNU Linux-libre, a GNU project that +# publishes scripts to clean up Linux so as to make it suitable for +# use in the GNU Project and in Free System Distributions. +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -44,7 +48,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= case $1 in --force) @@ -273,19 +277,19 @@ for f in \ done # Identify the tarball. -grep -q 'EXTRAVERSION.*-libre' Makefile || -clean_sed "s,^EXTRAVERSION.*,&-libre$extra, -" Makefile 'added -libre to EXTRAVERSION' +grep -q 'EXTRAVERSION.*-gnu' Makefile || +clean_sed "s,^EXTRAVERSION.*,&-gnu$extra, +" Makefile 'added -gnu to EXTRAVERSION' grep -q Linux-libre README || clean_sed ' -1,3 s,Linux kernel release.*kernel\.org.*,Linux-libre , -2,5 s,Linux version 2.6,Linux-libre, +1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre , +2,5 s,Linux version [0-9.]*,GNU Linux-libre, 1,20 s,\(operating system \)\?Unix,Unix kernel, /WHAT IS LINUX/i\ -WHAT IS Linux-libre?\ +WHAT IS GNU Linux-libre?\ \ - Linux-libre is a Free version of the kernel Linux (see below),\ + GNU Linux-libre is a Free version of the kernel Linux (see below),\ suitable for use with the GNU Operating System in 100% Free\ GNU/Linux-libre System Distributions.\ http://www.gnu.org/distros/\ @@ -299,21 +303,22 @@ WHAT IS Linux-libre?\ \ Linux-libre started within the gNewSense GNU/Linux distribution.\ It was later adopted by Jeff Moe, who coined its name, and in 2008\ - it became a project maintained by FSF Latin America.\ + it became a project maintained by FSF Latin America. In 2012, it\ + became part of the GNU Project.\ \ - The Linux-libre project takes a minimal-changes approach to cleaning\ - up Linux, making no effort to substitute components that need to be\ - removed with functionally equivalent Free ones. Nevertheless, we\ - encourage and support efforts towards doing so.\ + The GNU Linux-libre project takes a minimal-changes approach to\ + cleaning up Linux, making no effort to substitute components that\ + need to be removed with functionally equivalent Free ones.\ + Nevertheless, we encourage and support efforts towards doing so.\ 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' +' README 'added blurb about GNU Linux-libre' # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || @@ -886,6 +891,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 @@ -893,6 +899,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 @@ -1037,7 +1045,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 @@ -1389,18 +1397,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 @@ -1503,7 +1520,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' @@ -1556,7 +1573,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' @@ -1605,17 +1622,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" @@ -1637,14 +1654,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 @@ -2394,7 +2404,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