# 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;;
have_check=:
fi
-function clean_file {
+clean_file () {
#$1 = filename
if test ! -f $1; then
die $1 does not exist, something is wrong
rm -v $1
}
-function check_changed {
+check_changed () {
if test ! -f $1; then
die $1 does not exist, something is wrong
elif cmp $1.deblob $1 > /dev/null; then
mv $1.deblob $1
}
-function clean_blob {
+clean_blob () {
#$1 = filename
if $have_check; then
if test ! -f $1; then
fi
}
-function dummy_blob {
+dummy_blob () {
#$1 = filename
if test -f $1; then
echo $1 exists, something is wrong >&2
exit 1
- else
- hack_fwmk "NONFREE_FW += $2"
+ 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 {
+clean_fw () {
#$1 = firmware text input, $2 = firmware output
if test ! -f $1; then
echo $1 does not exist, something is wrong >&2
dummy_blob $2
}
-function hack_fwmk {
- if test ! -f firmware/Makefile; then
- echo firmware/Makefile does not exist, something is wrong >&2
- exit 1
- fi
-
- sed -i "/^[ ]*fw-shipped-all[ ]*:=[ ]*/i\
-$1
-" firmware/Makefile
-}
-
-function clean_kconfig {
+clean_kconfig () {
#$1 = filename $2 = things to remove
echo Marking config $2 as depending on NONFREE in $1
sed "/^config \\($2\\)\$/{p;i\
check_changed $1
}
-function clean_mk {
+clean_mk () {
#$1 = config $2 = Makefile name
# We don't clean up Makefiles any more --lxoliva
# sed -i "/\\($1\\)/d" $2
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
}
# Identify the tarball.
sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
-hack_fwmk 'NONFREE_FW :='
-
#######################
# Removed ATM Drivers #
#######################
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 @@
clean_file sound/isa/wavefront/yss225.c
clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL'
-hack_fwmk 'fw-shipped-y := $(filter-out $(NONFREE_FW), $(fw-shipped-y))'
-hack_fwmk 'fw-shipped-m := $(filter-out $(NONFREE_FW), $(fw-shipped-m))'
-hack_fwmk 'fw-shipped- := $(filter-out $(NONFREE_FW), $(fw-shipped-) )'
-
exit 0