Bug 13931 - patch applied twice?
Summary: patch applied twice?
Status: RESOLVED INVALID
Alias: None
Product: buildroot
Classification: Unclassified
Component: Other (show other bugs)
Version: unspecified
Hardware: All Linux
: P5 normal
Target Milestone: ---
Assignee: unassigned
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-07-07 00:04 UTC by stsp
Modified: 2021-07-09 13:19 UTC (History)
1 user (show)

See Also:
Host:
Target:
Build:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description stsp 2021-07-07 00:04:59 UTC 
Updated from git.

Now on first run I get this:
---
>>> readline 8.1 Extracting
gzip -d -c /home/stas/src/fdpp-buildroot/buildroot/dl/readline/readline-8.1.tar.gz | tar --strip-components=1 -C /home/stas/src/fdpp-buildroot/buildroot/output/build/readline-8.1   -xf -
>>> readline 8.1 Patching

Applying 0000-curses-link.patch using patch: 
patching file support/shobj-conf

Applying 0001-curses-link.patch using patch: 
patching file support/shobj-conf
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file support/shobj-conf.rej
make[1]: *** [package/pkg-generic.mk:227: /home/stas/src/fdpp-buildroot/buildroot/output/build/readline-8.1/.stamp_patched] Ошибка 1
---

And on a second run:
---
>>> readline 8.1 Patching

Applying 0000-curses-link.patch using patch: 
Error: duplicate filename '0000-curses-link.patch'
Conflicting files are:
  already applied: /home/stas/src/fdpp-buildroot/buildroot/package/readline/0000-curses-link.patch
  to be applied  : /home/stas/src/fdpp-buildroot/buildroot/package/readline/0000-curses-link.patch
make[1]: *** [package/pkg-generic.mk:227: /home/stas/src/fdpp-buildroot/buildroot/output/build/readline-8.1/.stamp_patched] Ошибка 1
---


Not sure why it insist on applying
the same patch twice. Some parallel
build problems?
Comment 1 Fabrice Fontaine 2021-07-07 19:36:31 UTC 
I assume that you have an issue on your local repository after updating from git. Indeed, 0000-curses-link.patch has been renumbered to 0001-curses-link.patch with https://git.buildroot.net/buildroot/commit/package/readline?id=575c60ff9aaaa03662555ae9353ad4e441e7fc6f.

So, I would advise to delete 0000-curses-link.patch from your local git repository.
Comment 2 stsp 2021-07-08 21:22:06 UTC 
Applying 0000-curses-link.patch using patch: 
patching file support/shobj-conf

Applying 0001-curses-link.patch using patch:
---


OK, I haven't noticed the names
are different:
0000-curses-link.patch
0001-curses-link.patch

So there are indeed 2 similar
patches under different names.
Please remove one.
Comment 3 stsp 2021-07-09 13:19:13 UTC 
Seems 0000-curses-link.patch is already
removed, but for me - just set as untracked.
Strange...