r1567 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches/series
Joshua Kwan
joshk@haydn.debian.org
Mon, 06 Sep 2004 14:50:40 -0600
Author: joshk
Date: 2004-09-06 14:50:31 -0600 (Mon, 06 Sep 2004)
New Revision: 1567
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/apply
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-1
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free
Log:
follow 2.4's suit by adding X directives to the series
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/apply
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/apply 2004-09-06 20:49:14 UTC (rev 1566)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/apply 2004-09-06 20:50:31 UTC (rev 1567)
@@ -3,6 +3,8 @@
set -e
+length=50
+
die() {
echo "E: $@" >&2
exit 1
@@ -39,9 +41,9 @@
patch=$(find_patch $home/$1)
base=$1
if uncompress_patch "$patch" | patch -p1 -s -t --no-backup-if-mismatch; then
- printf "%-32s\tOK (+)\n" "$base"
+ printf "%-${length}s\tOK (+)\n" "$base"
else
- printf "%-32s\tFAIL (+)\n" "$base"
+ printf "%-${length}s\tFAIL (+)\n" "$base"
exit 1
fi
}
@@ -50,9 +52,9 @@
patch=$(find_patch $home/$1)
base=$1
if uncompress_patch "$patch" | patch -p1 -s -t -R --no-backup-if-mismatch; then
- printf "%-32s\tOK (-)\n" "$base"
+ printf "%-${length}s\tOK (-)\n" "$base"
else
- printf "%-32s\tFAIL (-)\n" "$base"
+ printf "%-${length}s\tFAIL (-)\n" "$base"
exit 1
fi
}
@@ -65,6 +67,15 @@
case "$action" in
+) deapply_patch $patch ;;
-) apply_patch $patch ;;
+ X)
+ bakfile="$(dirname $patch)/.$(basename $patch).bak"
+ if [ -f "$bakfile" ]; then
+ mv -f "$bakfile" "$patch"
+ printf "%-${length}s\tRESTORED (X)\n" "$patch"
+ else
+ printf "%-${length}s\tNO BACKUP (X)\n" "$patch"
+ fi
+ ;;
esac
done
echo "--> $(basename $series) fully unapplied."
@@ -78,6 +89,15 @@
case "$action" in
+) apply_patch $patch ;;
-) deapply_patch $patch ;;
+ X)
+ bakfile="$(dirname $patch)/.$(basename $patch).bak"
+ if [ -f "$patch" ]; then
+ mv -f "$patch" "$bakfile"
+ printf "%-${length}s\tREMOVED (X)\n" "$patch"
+ else
+ printf "%-${length}s\tNO FILE (X)\n" "$patch"
+ fi
+ ;;
esac
done < $series
echo "--> $(basename $series) fully applied."
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2004-09-06 20:49:14 UTC (rev 1566)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2004-09-06 20:50:31 UTC (rev 1567)
@@ -24,6 +24,9 @@
* Add CAPI skb freeing fix (closes: #269134) (Christoph Hellwig).
+ * Update debian/apply from 2.4 to allow us to base prune-non-free on
+ file removals in the patch series. (Closes: #267655)
+
* Make sure SCSI disk caches are flushed on shutdown (Christoph Hellwig).
* Handle loaded but no hardware present properly in aic79xx (closes: 270102)
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-1 2004-09-06 20:49:14 UTC (rev 1566)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-1 2004-09-06 20:50:31 UTC (rev 1567)
@@ -6,6 +6,31 @@
+ drivers-input-hiddev-HIDIOCGUCODE.dpatch
+ drivers-input-psaux-hacks.dpatch
+ drivers-net-8139too-locking.dpatch
+X drivers/net/acenic_firmware.h
+X drivers/net/dgrs_firmware.c
+X drivers/net/tg3.c
+X drivers/net/tokenring/smctr_firmware.h
+X drivers/scsi/qla2xxx/ql2100_fw.c
+X drivers/scsi/qla2xxx/ql2200_fw.c
+X drivers/scsi/qla2xxx/ql2300_fw.c
+X drivers/scsi/qla2xxx/ql2322_fw.c
+X drivers/scsi/qla2xxx/ql6312_fw.c
+X drivers/scsi/qla2xxx/ql6322_fw.c
+X drivers/usb/media/dabfirmware.h
+X drivers/usb/misc/emi62_fw_m.h
+X drivers/usb/misc/emi62_fw_s.h
+X drivers/usb/serial/keyspan_mpr_fw.h
+X drivers/usb/serial/keyspan_usa18x_fw.h
+X drivers/usb/serial/keyspan_usa19_fw.h
+X drivers/usb/serial/keyspan_usa19qi_fw.h
+X drivers/usb/serial/keyspan_usa19qw_fw.h
+X drivers/usb/serial/keyspan_usa19w_fw.h
+X drivers/usb/serial/keyspan_usa28_fw.h
+X drivers/usb/serial/keyspan_usa28x_fw.h
+X drivers/usb/serial/keyspan_usa28xa_fw.h
+X drivers/usb/serial/keyspan_usa28xb_fw.h
+X drivers/usb/serial/keyspan_usa49w_fw.h
+X drivers/usb/serial/keyspan_usa49wlc_fw.h
+ drivers-net-tg3-readd.dpatch
+ drivers-scsi_changer.dpatch
+ drivers-scsi-generic_proc_info.dpatch
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free 2004-09-06 20:49:14 UTC (rev 1566)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free 2004-09-06 20:50:31 UTC (rev 1567)
@@ -10,37 +10,10 @@
exit 1
fi
-# outright remove firmware-only files
-rm -f drivers/net/acenic_firmware.h
-rm -f drivers/net/dgrs_firmware.c
-rm -f drivers/net/tg3.c
-rm -f drivers/net/tokenring/smctr_firmware.h
-rm -f drivers/scsi/qla2xxx/ql2100_fw.c
-rm -f drivers/scsi/qla2xxx/ql2200_fw.c
-rm -f drivers/scsi/qla2xxx/ql2300_fw.c
-rm -f drivers/scsi/qla2xxx/ql2322_fw.c
-rm -f drivers/scsi/qla2xxx/ql6312_fw.c
-rm -f drivers/scsi/qla2xxx/ql6322_fw.c
-rm -f drivers/usb/media/dabfirmware.h
-rm -f drivers/usb/misc/emi62_fw_m.h
-rm -f drivers/usb/misc/emi62_fw_s.h
-rm -f drivers/usb/serial/keyspan_mpr_fw.h
-rm -f drivers/usb/serial/keyspan_usa18x_fw.h
-rm -f drivers/usb/serial/keyspan_usa19_fw.h
-rm -f drivers/usb/serial/keyspan_usa19qi_fw.h
-rm -f drivers/usb/serial/keyspan_usa19qw_fw.h
-rm -f drivers/usb/serial/keyspan_usa19w_fw.h
-rm -f drivers/usb/serial/keyspan_usa28_fw.h
-rm -f drivers/usb/serial/keyspan_usa28x_fw.h
-rm -f drivers/usb/serial/keyspan_usa28xa_fw.h
-rm -f drivers/usb/serial/keyspan_usa28xb_fw.h
-rm -f drivers/usb/serial/keyspan_usa49w_fw.h
-rm -f drivers/usb/serial/keyspan_usa49wlc_fw.h
+for file in $(grep -h '^X' debian/patches/series/2.6.8-* | cut -d' ' -f2); do
+ rm -f $file
+fi
-# prune the firmware from the Tigon3 driver, leaving the rest in place
-#awk '/^(static )?u32.*tg3(Tso)?5?Fw(Data|Rodata|Text)/,/^};$/{evil=1}!evil{print}{evil=0}' drivers/net/tg3.c > drivers/net/tg3.c.pruned
-#mv drivers/net/tg3.c.pruned drivers/net/tg3.c
-
# Upstream deletes our debian directory. Bastards.
sed 's#rm -rf $(objtree)/debian/#test -f $(objtree)/debian/official || rm -rf $(objtree)/debian/#' scripts/package/Makefile > scripts/package/Makefile.ouch
mv scripts/package/Makefile.ouch scripts/package/Makefile