Re: [Quilt-dev] odd push/refresh problem

[Andreas Grünbacher]

Am Mo., 10. Sep. 2018 um 22:43 Uhr schrieb Randy Dunlap <address@hidden>:
>
> Hi,
>
> [quilt version 0.65]
>
> Summary: one file in a patch (lib/Makefile) is not part of the updated patch
>
>
> I'm trying to apply patch 4 (only; the rest aren't needed just to build
> lib/generic-radix-tree.c):
> https://lore.kernel.org/lkml/address@hidden/
>
>  include/linux/generic-radix-tree.h | 222 +++++++++++++++++++++++++++++
>  lib/Makefile                       |   3 +-
>  lib/generic-radix-tree.c           | 180 +++++++++++++++++++++++
>  3 files changed, 404 insertions(+), 1 deletion(-)
>
>
> I'm applying the patch to linux-next-20180910.
> lib/Makefile does not apply cleanly:
>
> address@hidden:linux-next-20180910> quilt push
> Applying patch generic-radix-trees.patch
> patching file include/linux/generic-radix-tree.h
> patching file lib/Makefile
> Hunk #1 FAILED at 38.
> 1 out of 1 hunk FAILED -- rejects in file lib/Makefile
> patching file lib/generic-radix-tree.c
> Patch generic-radix-trees.patch does not apply (enforce with -f)
> address@hidden:linux-next-20180910> quilt push -f
> Applying patch generic-radix-trees.patch
> patching file include/linux/generic-radix-tree.h
> patching file lib/Makefile
> Hunk #1 FAILED at 38.
> 1 out of 1 hunk FAILED -- saving rejects to file lib/Makefile.rej
> patching file lib/generic-radix-tree.c
> Applied patch generic-radix-trees.patch (forced; needs refresh)
>
> address@hidden:linux-next-20180910> quilt files | more
> include/linux/generic-radix-tree.h
> lib/generic-radix-tree.c
>
> <fix lib/Makefile hunk failure>
>
> address@hidden:linux-next-20180910> quilt ref
> Refreshed patch generic-radix-trees.patch
> address@hidden:linux-next-20180910> quilt files | more
> include/linux/generic-radix-tree.h
> lib/generic-radix-tree.c
>
>
> lib/Makefile is not part of the patch, although diff does see that
> generic-radix-tree.o has been added to it:
>
> address@hidden:lib> diff -u Makefile.orig  Makefile
> --- Makefile.orig       2018-08-12 13:41:04.000000000 -0700
> +++ Makefile    2018-09-10 13:34:23.844918294 -0700
> @@ -37,8 +37,9 @@
>          bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
>          gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \
>          bsearch.o find_bit.o llist.o memweight.o kfifo.o \
> -        percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o \
> -        once.o refcount.o usercopy.o errseq.o bucket_locks.o
> +        percpu-refcount.o rhashtable.o reciprocal_div.o \
> +        once.o refcount.o usercopy.o errseq.o bucket_locks.o \
> +        generic-radix-tree.o
>
>
> What happened?  Help?

Hmm, "quilt push -f" applies the patch with something like:

  patch --unified -p1 --backup
--prefix=.pc/PATCH-4-6-Generic-radix-trees.txt/ -f -i
patches/PATCH-4-6-Generic-radix-trees.txt

This should leave a backup file of lib/Makefile in
.pc/PATCH-4-6-Generic-radix-trees.txt/lib/Makefile, but apparently it
doesn't, and so quilt thinks lib/Makefile is not part of the patch.
This should probably be fixed in patch. For now, a workaround is to
explicitly add lib/Makefile to the patch before editing it:

  quilt add lib/Makefile

Andreas