Auto patches to Zephyr when compiling

[jakkra]

There are some patches, for example to upscale native_posix SDL display. Would be handy to automatically apply those patches when complinging.

[vChavezB]

Golioth has a script to run a patch command when using the manifest file

https://github.com/golioth/golioth-zephyr-sdk/blob/main/scripts/west_commands/patch.py

and you can see it in action here

https://github.com/golioth/golioth-zephyr-sdk/blob/cc146c1e0d4f2c666a37da3b6de7cc5902367484/west-ncs.yml#L15

This issue would be related to first setting up a manifest file as mentioned in https://github.com/jakkra/ZSWatch/issues/35

[ldab]

@jakkra I can only see “ app/zephyr_patches/sdl_upscale.patch” is there another one?

[Kampi]

@ldab we have a patch for the nPM1300 driver which is necessary for later revisions with the new power management. It´s not checked in in Git, so you can add it if you want. Please rename it to nPM1300 patch or something like this. The name is a bad choice :D

ntc_fix.patch

[jakkra]

@ldab do note that this sdl patch does not work anymore, that code was refactored. It's not necessary, so it can be removed.

[ldab]

@ldab do note that this sdl patch does not work anymore, that code was refactored. It's not necessary, so it can be removed.

both kscan_sdl.c and display_sdl.c are not required anymore? How to make the screen bigger?

[jakkra]

@ldab do note that this sdl patch does not work anymore, that code was refactored. It's not necessary, so it can be removed.

both kscan_sdl.c and display_sdl.c are not required anymore? How to make the screen bigger?

Well they are needed to scale it up, but requires re-doing this patch. But current default not scaled is useable also.

[Kampi]

@jakkra @ldab CI/CD is reporting this

[jakkra]

@jakkra @ldab CI/CD is reporting this

Thought this would fix it but still getting:

Passing ZEPHYR_BASE to -d instead of ../zephyr

patch -p1 -d ${ZEPHYR_BASE} -i ${CMAKE_CURRENT_SOURCE_DIR}/${file} -r - --no-backup-if-mismatch)

patch: **** Can't change to directory -i : No such file or directory
patch: **** Can't change to directory -i : No such file or directory

Edit: it works, but getting above error when doing --pristine build

[ldab]

Strange, main gives me:

-- west build: generating a build system
patching file modules/lvgl/input/lvgl_common_input.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
patching file modules/lvgl/input/lvgl_common_input.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
patching file drivers/sensor/npm1300_charger/npm1300_charger.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored

In order to reproduce I tried:

1. Clean the build folder
2. Pristine build
3. Build again
4. Clean changes on Zephyr repo

Can't reproduce it, my workdir is ~$HOME/ZSWatch

[jakkra]

Fixed now and CI as good. Works locally also for me. https://github.com/jakkra/ZSWatch/commit/694798a6fd55b2753d6025e603d2a14534c9c692