Issue with `swupdate` Patch on `kirkstone` Branch - Commit 6918be849ddf1fed5b7a0173e51c7a136e8d4101**

[Axess mail]

Hello,

I would like to report an issue encountered with the `swupdate` build on the `kirkstone` branch, specifically related to the commit [6918be849ddf1fed5b7a0173e51c7a136e8d4101](https://github.com/sbabic/swupdate/commit/6918be849ddf1fed5b7a0173e51c7a136e8d4101).

**Commit Details:**

- **Commit:** 6918be849ddf1fed5b7a0173e51c7a136e8d4101
- **Author:** Stefano Babic <stefan...@swupdate.org>
- **Date:** Thursday, June 20, 2024, 11:54:10 AM
- **Committer:** Stefano Babic
- **Commit Date:** Thursday, June 20, 2024, 11:56:10 AM

**Error Details:**

While building `swupdate`, the following error was encountered during the patch application phase:

```
ERROR: swupdate-2024.05-r0 do_patch: Applying patch '0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch' on target directory '/home/build-kirkstone/tmp/work/cortexa7t2hf-neon-dey-linux-gnueabi/swupdate/2024.05-r0/git'
CmdError('quilt --quiltrc /home/build-kirkstone/tmp/work/cortexa7t2hf-neon-dey-linux-gnueabi/swupdate/2024.05-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch
patching file Makefile
Hunk #1 FAILED at 364.
Hunk #2 succeeded at 479 (offset -1 lines).
1 out of 2 hunks FAILED -- rejects in file Makefile
patching file ipc-static/Makefile
patching symbolic link ipc-static/network_ipc-if.c
patching symbolic link ipc-static/network_ipc.c
patching symbolic link ipc-static/progress_ipc.c
Patch 0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch does not apply (enforce with -f)
stderr: ')
ERROR: Logfile of failure stored in: /home/build-kirkstone/tmp/work/cortexa7t2hf-neon-dey-linux-gnueabi/swupdate/2024.05-r0/temp/log.do_patch.1383252
ERROR: Task (/home/build-kirkstone/../meta-swupdate/recipes-support/swupdate/swupdate_2024.05.bb:do_patch) failed with exit code '1'
```

The specific hunk failure in the `Makefile` occurs at line 364. Here is the relevant portion of the `Makefile` where the failure happens:

```
swupdate-dirs := $(objs-y) $(libs-y)
swupdate-objs := $(patsubst %,%/built-in.o, $(objs-y))
swupdate-libs := $(patsubst %,%/lib.a, $(libs-y))
swupdate-all := $(swupdate-objs) $(swupdate-libs)
```

**Temporary Resolution:**

Reverting to the previous commit (a83abd177935667a774994519c65b3369df4ebe0) allowed the build to proceed without issues.

**Steps to Reproduce:**

1. Check out the `kirkstone` branch.
2. Pull the latest changes.
3. Attempt to build `swupdate` using `bitbake swupdate`.

Please look into this issue to ensure the patch applies correctly on the `Makefile`. If there are any additional details needed or further troubleshooting steps required, please let me know.

Thank you for your assistance.

Best regards,
Axxess

[Stefano Babic]

Hi,

You are wrong. You are patching SWUpdate inside one of your custom
layers. There is no
0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch in
kirkstone branch of meta-swupdate. You have generated yourself the issue.

Best regards,
Stefano Babic