r1945 - in trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian: . patches patches/series
Joshua Kwan
joshk@haydn.debian.org
Sat, 27 Nov 2004 17:09:02 -0700
Author: joshk
Date: 2004-11-27 17:08:38 -0700 (Sat, 27 Nov 2004)
New Revision: 1945
Added:
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4
Modified:
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/apply
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/rules
Log:
fix bw2/cyber2000fb, update debian/apply
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/apply
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/apply 2004-11-27 00:01:45 UTC (rev 1944)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/apply 2004-11-28 00:08:38 UTC (rev 1945)
@@ -61,7 +61,7 @@
unpatch_series() {
series=$1
- [ -f "$series" ] || die "I wasn't passed a series!"
+ [ -f "$series" ] || die "I wasn't passed a series: $series"
tac $series | while read action patch; do
case "$action" in
@@ -83,7 +83,7 @@
patch_series() {
series=$1
- [ -f "$series" ] || die "I wasn't passed a series!"
+ [ -f "$series" ] || die "I wasn't passed a series: $series"
while read action patch; do
case "$action" in
@@ -157,24 +157,22 @@
exit 0
fi
- for sver in $(ls -d $home/series/* | sort -r); do
- base=$(basename "$sver")
+ for base in $((cd $home/series/ && ls -d *) | sort -rnt- -k 2); do
srev=${base#*-}
if [ -n "$srev" ]; then
if [ $srev -le $current_rev ]; then
- unpatch_series $sver
+ unpatch_series $home/series/$base
fi
else
die "Series doesn't have a revision!"
fi
done
elif [ "$current_rev" = "$upstream" ] || [ $target_rev -gt $current_rev ]; then
- for sver in $home/series/*; do
- base=$(basename "$sver")
+ for base in $((cd $home/series/ && ls -d *) | sort -nt- -k 2); do
srev=${base#*-}
if [ -n "$srev" ]; then
if [ $srev -gt $current_rev ] && [ $srev -le $target_rev ]; then
- patch_series $sver
+ patch_series $home/series/$base
fi
else
die "Series doesn't have a revision!"
@@ -184,13 +182,12 @@
echo "Nothing to do, exiting."
exit 0
elif [ $target_rev -lt $current_rev ]; then
- for sver in $(ls -d $home/series/* | sort -r); do
- base=$(basename "$sver")
+ for base in $((cd $home/series/ && ls -d *) | sort -rnt- -k 2); do
srev=${base#*-}
if [ -n "$srev" ]; then
# -gt because you don't want to unapply the target series
if [ $srev -le $current_rev ] && [ $srev -gt $target_rev ]; then
- unpatch_series $sver
+ unpatch_series $home/series/$base
fi
else
die "Series doesn't have a revision!"
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog 2004-11-27 00:01:45 UTC (rev 1944)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog 2004-11-28 00:08:38 UTC (rev 1945)
@@ -1,3 +1,12 @@
+kernel-source-2.6.9 (2.6.9-4) UNRELEASED; urgency=low
+
+ * Add bw2/cyber2000fb fixes from BK to fix compilation problems.
+ (Joshua Kwan)
+
+ * Yank fixed debian/apply from kernel-source-2.6.8. (Joshua Kwan)
+
+ -- Joshua Kwan <joshk@triplehelix.org> Sat, 27 Nov 2004 16:07:47 -0800
+
kernel-source-2.6.9 (2.6.9-3) unstable; urgency=low
* Include dm_io-ENOMEM-goof patch that was included in final 2.6.8-8
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff 2004-11-27 00:01:45 UTC (rev 1944)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff 2004-11-28 00:08:38 UTC (rev 1945)
@@ -0,0 +1,52 @@
+# origin: bk
+# cset: 1.1988.121.63
+# description: fix bw2/cyber2000fb compile
+# inclusion: 2.6.10
+# revision date: 2004-11-27
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/10/19 08:09:41-07:00 adaplas@hotpop.com
+# [PATCH] fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb
+#
+# Trivial fb_get_options fix for
+# - cyber200fb
+# - bw2fb
+#
+# Signed-off-by: Antonino Daplas <adaplas@pol.net>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# drivers/video/bw2.c
+# 2004/10/19 02:40:23-07:00 adaplas@hotpop.com +1 -1
+# fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb
+#
+# drivers/video/cyber2000fb.c
+# 2004/10/19 02:40:23-07:00 adaplas@hotpop.com +1 -1
+# fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb
+#
+diff -Nru a/drivers/video/bw2.c b/drivers/video/bw2.c
+--- a/drivers/video/bw2.c 2004-11-27 16:05:09 -08:00
++++ b/drivers/video/bw2.c 2004-11-27 16:05:09 -08:00
+@@ -386,7 +386,7 @@
+ struct sbus_bus *sbus;
+ struct sbus_dev *sdev;
+
+- if (fb_get_options("bw2fb", &option))
++ if (fb_get_options("bw2fb", NULL))
+ return -ENODEV;
+
+ #ifdef CONFIG_SUN4
+diff -Nru a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
+--- a/drivers/video/cyber2000fb.c 2004-11-27 16:05:09 -08:00
++++ b/drivers/video/cyber2000fb.c 2004-11-27 16:05:09 -08:00
+@@ -1724,7 +1724,7 @@
+ #ifndef MODULE
+ char *option = NULL;
+
+- if (fb_get_options("cyber2000fb", NULL))
++ if (fb_get_options("cyber2000fb", &option))
+ return -ENODEV;
+ cyber2000fb_setup(option);
+ #endif
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4 2004-11-27 00:01:45 UTC (rev 1944)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4 2004-11-28 00:08:38 UTC (rev 1945)
@@ -0,0 +1 @@
++ fb_get_option-fix.diff
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/rules
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/rules 2004-11-27 00:01:45 UTC (rev 1944)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/rules 2004-11-28 00:08:38 UTC (rev 1945)
@@ -8,7 +8,7 @@
#
release := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-upstream := $(shell echo "$(release)" | sed 's/:\?\([0-9\.]\+\)-[0-9]*/\1/')
+upstream := $(shell echo "$(release)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
patch_home := debian/kernel-patch-debian-$(upstream)/usr/src/kernel-patches/all/$(upstream)
# Little things that help you...
@@ -18,7 +18,20 @@
unpatch:
override_version=$(release) home=debian/patches sh debian/apply $(upstream)
+../orig/kernel-source-$(upstream)-$(upstream):
+ifneq (,$(wildcard ../kernel-source-$(upstream)_$(upstream).orig.tar.gz))
+ mkdir -p ../orig
+ tar -C ../orig -xzf ../kernel-source-$(upstream)_$(upstream).orig.tar.gz
+else
+$(error "Can't find orig tarball.")
+endif
+orig: ../orig/kernel-source-$(upstream)-$(upstream)
+ rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .
+
+diff: ../orig/kernel-source-$(upstream)-$(upstream)
+ (cd .. && diff --exclude debian --exclude .svn -ur orig/kernel-source-$(upstream)-$(upstream) kernel-source-$(upstream)-$(upstream))
+
#####################
# Below comes Herbert's stuff with minimal additions