r1523 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches/series
Joshua Kwan
joshk@haydn.debian.org
Thu, 02 Sep 2004 19:42:52 -0600
Author: joshk
Date: 2004-09-02 19:42:44 -0600 (Thu, 02 Sep 2004)
New Revision: 1523
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/prune-non-free
Log:
ok.. merge back in
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply 2004-09-03 01:24:30 UTC (rev 1522)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply 2004-09-03 01:42:44 UTC (rev 1523)
@@ -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-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-09-03 01:24:30 UTC (rev 1522)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-09-03 01:42:44 UTC (rev 1523)
@@ -15,8 +15,11 @@
spin_unlock_irqrestore call that caused a hang on SMP.
* 075_lvm_ioctl.diff: Fix some problems with generic LVM ioctl handling,
patch by David S. Miller.
+ * Extend debian/apply to be able to try to remove files (actually, back
+ them up) so that we can run the debian/apply script on a real pristine
+ source tree. (Closes: #269412)
- -- Joshua Kwan <joshk@triplehelix.org> Tue, 31 Aug 2004 22:14:09 -0700
+ -- Joshua Kwan <joshk@triplehelix.org> Thu, 2 Sep 2004 09:37:50 -0700
kernel-source-2.4.27 (2.4.27-4) unstable; urgency=high
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1 2004-09-03 01:24:30 UTC (rev 1522)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1 2004-09-03 01:42:44 UTC (rev 1523)
@@ -61,7 +61,23 @@
+ 060_ipsec_update.diff
+ 061_devmapper_1.00.19-2.diff
+ 062_ide_stroke_runtime.diff
+X drivers/net/tg3.c
+ 063_firmwareless_tg3.diff
+ 064_driver_MODULE_LICENSE.diff
+ 900_changelog.diff
+ 999_spelling_mistakes.diff
+X drivers/net/acenic_firmware.h
+X drivers/net/dgrs_firmware.c
+X drivers/net/tokenring/smctr_firmware.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
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/prune-non-free
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/prune-non-free 2004-09-03 01:24:30 UTC (rev 1522)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/prune-non-free 2004-09-03 01:42:44 UTC (rev 1523)
@@ -10,37 +10,6 @@
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/tokenring/smctr_firmware.h
-rm -f drivers/net/tg3.c
-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
-
-# 2.4 only stuff
-rm -f drivers/sound/724hwmcode.h
-rm -f drivers/sound/Hwmcode.h
-
-# 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
+for blobfile in $(grep -h ^X debian/patches/series/* | cut -d' ' -f2); do
+ rm -f $blobfile
+done