New
[releases.git] / deblob-2.6.27
index d3199ea090cc108a39b0b25fcd728a9cc2e9342e..eba13661c2f2615f7333a5ae29906cf6649c7051 100755 (executable)
 
 # 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.27 extra=
+kver=2.6.27 extra=++
+
+case $1 in
+--force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
+*) die () { echo "$@" >&2; exit 1; };;
+esac
 
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
 if [ ! -f $check ] ; then
@@ -57,19 +62,16 @@ fi
 function clean_file {
        #$1 = filename
        if test ! -f $1; then
-               echo $1 does not exist, something is wrong >&2
-               exit 1
+               die $1 does not exist, something is wrong
        fi
        rm -v $1
 }
 
 function check_changed {
        if test ! -f $1; then
-               echo $1 does not exist, something is wrong >&2
-               exit 1
+               die $1 does not exist, something is wrong
        elif cmp $1.deblob $1 > /dev/null; then
-               echo $1 did not change, something is wrong >&2
-               exit 1
+               die $1 did not change, something is wrong
        fi
        mv $1.deblob $1
 }
@@ -78,8 +80,7 @@ function clean_blob {
        #$1 = filename
        if $have_check; then
            if test ! -f $1; then
-               echo $1 does not exist, something is wrong >&2
-               exit 1
+               die $1 does not exist, something is wrong
            fi
            name=$1
            echo Removing blobs from $name
@@ -97,9 +98,26 @@ function dummy_blob {
        if test -f $1; then
            echo $1 exists, something is wrong >&2
            exit 1
-       else
-           echo '/*(DEBLOBBED)*/' > $1
+       elif test ! -f firmware/Makefile; then
+           echo firmware/Makefile does not exist, something is wrong >&2
+           exit 1
        fi
+
+       sed -i "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
+         firmware/Makefile
+}
+
+function clean_fw {
+       #$1 = firmware text input, $2 = firmware output
+       if test ! -f $1; then
+               echo $1 does not exist, something is wrong >&2
+               exit 1
+       elif test -f $2; then
+               echo $2 exists, something is wrong >&2
+               exit 1
+       fi
+       clean_blob $1 -s 4
+       dummy_blob $2
 }
 
 function clean_kconfig {
@@ -119,8 +137,7 @@ function clean_mk {
        if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
            :
        else
-           echo $2 does not contain matches for $1
-           exit 1
+           die $2 does not contain matches for $1
        fi
 }
 
@@ -164,37 +181,25 @@ for f in \
     sound/pci/cs46xx/imgs/cwcdma.asp \
 ; do
   if test ! $f; then
-    echo $f is not present, something is amiss >&2
-    exit 1
+    die $f is not present, something is amiss
   fi
 done
 
 # Identify the tarball.
 sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
-# We use `# clean_blob\nclean_file' to indicate that a file is
-# allegedly under the GPL or some other compatible license, but we
-# don't have its sources.  Using the default deblobbing machinery
-# doesn't work, because then the binary firmware generators would barf
-# at the deblobbed file.
-
 #######################
 # Removed ATM Drivers #
 #######################
 
 # ATM_AMBASSADOR -  Madge Ambassador (Collage PCI 155 Server)
-# clean_blob
-clean_file firmware/atmsar11.HEX
-empty_blob firmware/atmsar11.fw
+clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw
 
 # ATM_FORE200E_PCA
 # ATM_FORE200E_SBA - SBA-200E
 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
 
@@ -212,17 +217,17 @@ clean_mk CONFIG_COMPUTONE drivers/char/Makefile
 # gpu drm
 
 # DRM_MGA - Matrox g200/g400
-clean_blob drivers/gpu/drm/mga_ucode.h
+clean_blob drivers/gpu/drm/mga/mga_ucode.h
 clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA'
 clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile
 
 # DRM_R128 - ATI Rage 128
-clean_blob drivers/gpu/drm/r128_cce.c
+clean_blob drivers/gpu/drm/r128/r128_cce.c
 clean_kconfig drivers/gpu/drm/Kconfig 'DRM_R128'
 clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile
 
 # DRM_RADEON - ATI Radeon
-clean_blob drivers/gpu/drm/radeon_microcode.h
+clean_blob drivers/gpu/drm/radeon/radeon_microcode.h
 clean_kconfig drivers/gpu/drm/Kconfig 'DRM_RADEON'
 clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile
 
@@ -299,9 +304,7 @@ 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
-clean_file firmware/cpia2/stv0672_vp4.bin.ihex
-dummy_blob firmware/cpia2/stv0672_vp4.bin
+clean_fw firmware/cpia2/stv0672_vp4.bin.ihex firmware/cpia2/stv0672_vp4.bin
 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'
@@ -312,12 +315,8 @@ 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
-clean_file firmware/dabusb/bitstream.bin.ihex
-dummy_blob firmware/dabusb/bitstream.bin
-# clean_blob
-clean_file firmware/dabusb/firmware.HEX
-dummy_blob firmware/dabusb/firmware.fw
+clean_fw firmware/dabusb/bitstream.bin.ihex firmware/dabusb/bitstream.bin
+clean_fw firmware/dabusb/firmware.HEX firmware/dabusb/firmware.fw
 clean_kconfig drivers/media/Kconfig 'USB_DABUSB'
 clean_mk CONFIG_USB_DABUSB drivers/media/video/Makefile
 
@@ -381,12 +380,14 @@ 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_blob drivers/net/tehuti_fw.h -s 4
 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
+patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
+  die failed to remove license comments from drivers/net/tg3.c \
+  # patches/linux-2.6-tg3-clean.patch
 --- drivers/net/tg3.c
 +++ drivers/net/tg3.c
 @@ -5,14 +5,6 @@
@@ -479,6 +480,12 @@ dummy_blob firmware/kaweth/trigger_code_fix.bin
 clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH'
 clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile
 
+# wireless
+
+clean_blob drivers/net/wireless/rtl8187_dev.c
+# clean_kconfig drivers/net/wireless/Kconfig 'RTL8187'
+# clean_mk CONFIG_RTL8187 drivers/net/wireless/Makefile
+
 
 ########################
 # Removed s390 Drivers #
@@ -489,6 +496,24 @@ clean_blob drivers/s390/net/qeth_core_mpc.c
 clean_kconfig drivers/s390/net/Kconfig 'QETH'
 clean_mk CONFIG_QETH drivers/s390/net/Makefile
 
+
+#####################
+# Removed SH boards #
+#####################
+
+# SH_AP325RXA - Renesas AP-325RXA board
+clean_blob arch/sh/boards/board-ap325rxa.c
+clean_kconfig arch/sh/boards/Kconfig 'SH_AP325RXA'
+clean_mk CONFIG_SH_AP325RXA arch/sh/boards/Makefile
+
+# SH_MIGOR - Reneasas Migo-R
+clean_blob arch/sh/boards/mach-migor/lcd_qvga.c -s 16
+clean_blob arch/sh/boards/mach-migor/setup.c
+clean_kconfig arch/sh/boards/Kconfig 'SH_MIGOR'
+clean_kconfig arch/sh/boards/mach-migor/Kconfig 'SH_MIGOR_QVGA'
+clean_mk CONFIG_SH_MIGOR_QVGA arch/sh/boards/mach-migor/Makefile
+
+
 ########################
 # Removed SCSI Drivers #
 ########################
@@ -603,25 +628,15 @@ 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_blob
-clean_file firmware/edgeport/boot.H16
-dummy_blob firmware/edgeport/boot.fw
-# clean_blob
-clean_file firmware/edgeport/down.H16
-dummy_blob firmware/edgeport/down.fw
-# clean_blob
-clean_file firmware/edgeport/down2.H16
-dummy_blob firmware/edgeport/down2.fw
+clean_fw firmware/edgeport/boot.H16 firmware/edgeport/boot.fw
+clean_fw firmware/edgeport/down.H16 firmware/edgeport/down.fw
+clean_fw firmware/edgeport/down2.H16 firmware/edgeport/down2.fw
 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_blob
-clean_file firmware/edgeport/boot2.H16
-dummy_blob firmware/edgeport/boot2.fw
-# clean_blob
-clean_file firmware/edgeport/down3.bin.ihex
-dummy_blob firmware/edgeport/down3.bin
+clean_fw firmware/edgeport/boot2.H16 firmware/edgeport/boot2.fw
+clean_fw firmware/edgeport/down3.bin.ihex firmware/edgeport/down3.bin
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI'
 clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile
 
@@ -634,15 +649,9 @@ 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
-clean_file firmware/whiteheat.HEX
-dummy_blob firmware/whiteheat.fw
-# clean_blob
-clean_file firmware/whiteheat_loader.HEX
-dummy_blob firmware/whiteheat_loader.fw
-# clean_blob
-clean_file firmware/whiteheat_loader_debug.HEX
-dummy_blob firmware/whiteheat_loader_debug.fw
+clean_fw firmware/whiteheat.HEX firmware/whiteheat.fw
+clean_fw firmware/whiteheat_loader.HEX firmware/whiteheat_loader.fw
+clean_fw firmware/whiteheat_loader_debug.HEX firmware/whiteheat_loader_debug.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT'
 clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile
 
@@ -661,6 +670,10 @@ clean_blob drivers/video/chipsfb.c
 clean_kconfig drivers/video/Kconfig 'FB_CT65550'
 clean_mk CONFIG_FB_CT65550 drivers/video/Makefile
 
+# USB_GSPCA - Conexant 11646
+clean_blob drivers/media/video/gspca/conex.c
+# clean_kconfig drivers/video/gspca/Kconfig 'USB_GSPCA'
+# clean_mk CONFIG_USB_GSPCA drivers/video/Makefile
 
 #########################
 # Removed Sound Drivers #
@@ -710,5 +723,6 @@ dummy_blob firmware/sb16/ima_adpcm_playback.csp
 # Most of this file is not matched by deblob-check because of WAIT_IDLE.
 # Just remove it.
 clean_file sound/isa/wavefront/yss225.c
+clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL'
 
 exit 0