projects
/
releases.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start dealing with files moved to firmware/
[releases.git]
/
deblob-2.6.23
diff --git
a/deblob-2.6.23
b/deblob-2.6.23
index c3d22c71438da7e927092ae9540a2015402a9eb7..daf15b017df673d3c2b0f930dd99868055a6e9f8 100755
(executable)
--- a/
deblob-2.6.23
+++ b/
deblob-2.6.23
@@
-53,23
+53,41
@@
sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi
if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi
+check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
+if [ ! -f $check ] ; then
+ echo "optional deblob-check missing, will remove entire files"
+ have_check=false
+else
+ have_check=:
+fi
+
function clean_file {
#$1 = filename
function clean_file {
#$1 = filename
+ if test ! -f $1; then
+ echo $1 does not exist, something is wrong >&2
+ exit 1
+ fi
rm -v $1
}
function check_changed {
rm -v $1
}
function check_changed {
- if cmp $1.deblob $1 > /dev/null; then
+ if test ! -f $1; then
+ echo $1 does not exist, something is wrong >&2
+ exit 1
+ elif cmp $1.deblob $1 > /dev/null; then
echo $1 did not change, something is wrong >&2
exit 1
fi
mv $1.deblob $1
}
echo $1 did not change, something is wrong >&2
exit 1
fi
mv $1.deblob $1
}
-check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
function clean_blob {
#$1 = filename
function clean_blob {
#$1 = filename
- if test -f $check; then
+ if $have_check; then
+ if test ! -f $1; then
+ echo $1 does not exist, something is wrong >&2
+ exit 1
+ fi
name=$1
echo Removing blobs from $name
set fnord "$@" -d
name=$1
echo Removing blobs from $name
set fnord "$@" -d
@@
-303,9
+321,12
@@
clean_mk CONFIG_DGRS drivers/net/Makefile
# E100 - Intel(R) PRO/100+
clean_blob drivers/net/e100.c
# E100 - Intel(R) PRO/100+
clean_blob drivers/net/e100.c
-sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c
-# clean_kconfig drivers/net/Kconfig 'E100'
-# clean_mk CONFIG_E100 drivers/net/Makefile
+if $have_check; then
+ sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c
+else
+ clean_kconfig drivers/net/Kconfig 'E100'
+ clean_mk CONFIG_E100 drivers/net/Makefile
+fi
# MYRI_SBUS - MyriCOM Gigabit Ethernet
clean_blob drivers/net/myri_code.h
# MYRI_SBUS - MyriCOM Gigabit Ethernet
clean_blob drivers/net/myri_code.h
@@
-333,7
+354,12
@@
patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch
EOF
clean_blob drivers/net/tg3.c -s 9
EOF
clean_blob drivers/net/tg3.c -s 9
-sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
+if $have_check; then
+ sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
+else
+ clean_kconfig drivers/net/Kconfig 'TIGON3'
+ clean_mk CONFIG_TIGON3 drivers/net/Makefile
+fi
# TYPHOON - 3cr990 series Typhoon
clean_blob drivers/net/typhoon-firmware.h
# TYPHOON - 3cr990 series Typhoon
clean_blob drivers/net/typhoon-firmware.h