[plug] OT: random patch failures

[byron ester]

I've had that problem in the past as well.
I think it has something to do with the absence of the -pnum parameter.

You might want to look at the man page for patch.

`man patch`

`patch -pnum <patchfile`


On Sat, Jun 4, 2016 at 8:44 AM, Bill Kenworthy <billk at iinet.net.au> wrote:

> I am having random failures (random in that some patches work, others
> like the example below wont :( of trying to use a unified diff to patch
> files:
>
> to demonstrate: copy the original to 'a'and 'b' - manually patch the
> file under 'b'
>
> diff -u a/drivers/input/touchscreen/Kconfig
> b/drivers/input/touchscreen/Kconfig > c
>
> then:
>
> bunyip linux # patch --dry-run < c
> checking file Kconfig
> Hunk #1 FAILED at 1094.
> 1 out of 1 hunk FAILED
> bunyip linux #
>
> contents of c:
>
> bunyip linux # cat c
> --- a/drivers/input/touchscreen/Kconfig 2016-06-04 08:27:54.457356373 +0800
> +++ b/drivers/input/touchscreen/Kconfig 2016-06-04 07:58:36.849371613 +0800
> @@ -1094,6 +1094,17 @@
>           To compile this driver as a module, choose M here: the
>           module will be called sur40.
>
> +config TOUCHSCREEN_SURFACE3_SPI
> +       tristate "Ntrig/Microsoft Surface 3 SPI touchscreen"
> +       help
> +         Say Y here if you have the Ntrig/Microsoft SPI touchscreen
> +         controller chip as found on the Surface 3 in your system.
> +
> +         If unsure, say N.
> +
> +         To compile this driver as a module, choose M here: the
> +         module will be called surface3_spi.
> +
>  config TOUCHSCREEN_SX8654
>         tristate "Semtech SX8654 touchscreen"
>         depends on I2C
> bunyip linux #
>
> any suggestions before I give up and manually edit the files?
>
> BillK
> _______________________________________________
> PLUG discussion list: plug at plug.org.au
> http://lists.plug.org.au/mailman/listinfo/plug
> Committee e-mail: committee at plug.org.au
> PLUG Membership: http://www.plug.org.au/membership
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.plug.org.au/pipermail/plug/attachments/20160604/2acfe5d2/attachment.html>