r1521 - in branches/kernel-2.4/source/2.4.27-build-system-testing/debian: . patches/series

[Joshua Kwan]

Author: joshk
Date: 2004-09-02 19:24:05 -0600 (Thu, 02 Sep 2004)
New Revision: 1521

Modified:
   branches/kernel-2.4/source/2.4.27-build-system-testing/debian/apply
   branches/kernel-2.4/source/2.4.27-build-system-testing/debian/patches/series/2.4.27-1
   branches/kernel-2.4/source/2.4.27-build-system-testing/debian/prune-non-free
Log:
trim some Xs, fix prune-non-free

Modified: branches/kernel-2.4/source/2.4.27-build-system-testing/debian/apply
===================================================================
--- branches/kernel-2.4/source/2.4.27-build-system-testing/debian/apply	2004-09-03 01:11:51 UTC (rev 1520)
+++ branches/kernel-2.4/source/2.4.27-build-system-testing/debian/apply	2004-09-03 01:24:05 UTC (rev 1521)
@@ -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
 }
@@ -69,9 +71,9 @@
 				bakfile="$(dirname $patch)/.$(basename $patch).bak"
 				if [ -f "$bakfile" ]; then
 					mv -f "$bakfile" "$patch"
-					printf "%-32s\tRESTORED (X)\n" "$patch"
+					printf "%-${length}s\tRESTORED (X)\n" "$patch"
 				else
-					printf "%-32s\tNO BACKUP (X)\n" "$patch"
+					printf "%-${length}s\tNO BACKUP (X)\n" "$patch"
 				fi
 			;;
 		esac
@@ -91,9 +93,9 @@
 				bakfile="$(dirname $patch)/.$(basename $patch).bak"
 				if [ -f "$patch" ]; then
 					mv -f "$patch" "$bakfile"
-					printf "%-32s\tREMOVED (X)\n" "$patch"
+					printf "%-${length}s\tREMOVED (X)\n" "$patch"
 				else
-					printf "%-32s\tNO FILE (X)\n" "$patch"
+					printf "%-${length}s\tNO FILE (X)\n" "$patch"
 				fi
 			;;
 		esac

Modified: branches/kernel-2.4/source/2.4.27-build-system-testing/debian/patches/series/2.4.27-1
===================================================================
--- branches/kernel-2.4/source/2.4.27-build-system-testing/debian/patches/series/2.4.27-1	2004-09-03 01:11:51 UTC (rev 1520)
+++ branches/kernel-2.4/source/2.4.27-build-system-testing/debian/patches/series/2.4.27-1	2004-09-03 01:24:05 UTC (rev 1521)
@@ -69,16 +69,6 @@
 X drivers/net/acenic_firmware.h
 X drivers/net/dgrs_firmware.c
 X drivers/net/tokenring/smctr_firmware.h
-X drivers/net/tg3.c
-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
@@ -91,5 +81,3 @@
 X drivers/usb/serial/keyspan_usa28xb_fw.h
 X drivers/usb/serial/keyspan_usa49w_fw.h
 X drivers/usb/serial/keyspan_usa49wlc_fw.h
-X drivers/sound/724hwmcode.h
-X drivers/sound/Hwmcode.h

Modified: branches/kernel-2.4/source/2.4.27-build-system-testing/debian/prune-non-free
===================================================================
--- branches/kernel-2.4/source/2.4.27-build-system-testing/debian/prune-non-free	2004-09-03 01:11:51 UTC (rev 1520)
+++ branches/kernel-2.4/source/2.4.27-build-system-testing/debian/prune-non-free	2004-09-03 01:24:05 UTC (rev 1521)
@@ -10,6 +10,6 @@
     exit 1
 fi
 
-for blobfile in grep ^X debian/patches/series/*; do
+for blobfile in $(grep -h ^X debian/patches/series/* | cut -d' ' -f2); do
     rm -f $blobfile
 done