Hey,
I want a picture to be changed before building. So I changed and commited it in my local repo. How can I make the patch file?
I tried git diff --text and git diff --binary, but I get an error on build:
Failed to apply patch
git format-patch -1 HEAD -n; #automatic name
git format-patch -1 HEAD --stdout > name-of-patch
change -1 to the number of commits backwards you want
Did this, but I got the same error
Post the error? Context? What are you trying to accomplish?
I’m trying to change an image.
This is the patch file: Ubuntu Pastebin
this is the metadata entry:
patch:
- 19.0-groovy.patch
- change-splash.patch
This is the build log:
git version 2.32.0.rc0
2021-07-06 16:36:53,499 INFO: Using git version 2.32.0.rc0
2021-07-06 16:36:53,500 INFO: Building version 19.1 (1901000) of org.xbmc.kodi
2021-07-06 16:36:53,500 WARNING: org.xbmc.kodi:19.1 runs this on the buildserver with sudo:
apt-get update || apt-get update && apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
These commands were skipped because fdroid build is not running on a dedicated build server.
2021-07-06 16:36:53,501 INFO: Getting source for revision 19.1-Matrix
2021-07-06 16:36:57,249 INFO: Applying patches
2021-07-06 16:36:57,250 INFO: Applying 19.0-groovy.patch
patching file xbmc/interfaces/swig/CMakeLists.txt
2021-07-06 16:36:57,455 INFO: Applying change-splash.patch
File media/splash.jpg: git binary diffs are not supported.
2021-07-06 16:36:57,661 ERROR: Could not build app org.xbmc.kodi: Failed to apply patch metadata/org.xbmc.kodi/change-splash.patch
2021-07-06 16:36:57,661 INFO: Finished
2021-07-06 16:36:57,662 INFO: 1 build failed
Remove it from patch: and add a git apply change-splash.patch to metadata/org.xbmc.kodi.yml · master · F-Droid / Data · GitLab
or instead simply copy your file in at that step
This topic was automatically closed 60 days after the last reply. New replies are no longer allowed.