Bug#403667: Updated patch for /usr/share/initramfs-tools/scripts/init-top/framebuffer
On Mon, 18 Dec 2006, Rob Walker wrote:
> Ooops, I accidentally used some bash specific syntax in the first patch. The
> attached patch fixes this and should work now. It also makes sure the right
> option is passed into parse_video_opts (was $TMP, should be $x)
applied for 0.85e
thanks a lot
> --- framebuffer.orig 2006-11-14 06:54:08.000000000 +0000
> +++ framebuffer.fixed_parse_video_opts 2006-12-18 20:09:51.000000000 +0000
just nitpicking, such a patch can never apply:
max@nancy:~/src/initramfs-tools/scripts/init-top$ patch -p0 <
/tmp/framebuffer.matroxfb.patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- framebuffer.orig 2006-11-14 06:54:08.000000000 +0000
|+++ framebuffer.matroxfb_map 2006-12-18 20:09:51.000000000 +0000
--------------------------
File to patch:
please for the next time just copy the orig and keep
the filename for the changed version.
als you want to run the diff on topdir below the project path,
so that you get for example (sorry other project):
diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
index 2007fa9..acdee86 100644
--- a/usr/utils/Kbuild
+++ b/usr/utils/Kbuild
this does not force the applier to walk into the respective subdir ;)
> @@ -43,8 +43,11 @@
> # Already in the "<arg>=<value>" form
> if [ "$opt" != "${opt#*=}" ]; then
> echo -n "$opt "
> + # In the "<arg>:<value>" form
> + elif [ "$opt" != "${opt#*:}" ]; then
> + echo -n "${opt%:*}=${opt#*:} "
great
> # Presumably a modevalue without the "mode=" prefix
> - elif [ "$opt" != "${opt#[[:digit:]]*x[[:digit:]]}"; then
> + elif [ "$opt" != "${opt#[[:digit:]]*x[[:digit:]]}" ]; then
indeed urgs
> echo -n "mode=$opt "
> # Presumably a boolean
> else
> @@ -72,7 +75,7 @@
> video=*)
> FB=${x#*=}
> FB="${FB%%:*}"
> - OPTS="$(parse_video_opts "$TMP")"
> + OPTS="$(parse_video_opts "$x")"
another uups
> esac
> done
>
best regards
--
maks
Reply to: