-
Notifications
You must be signed in to change notification settings - Fork 2.1k
PKG wakaama fails to apply patches #8106
Description
Hello,
I want to start using the wakaama pakage.
I copied the gnrc_minimal exemple and added to the makefile
USEPKG += wakaama
However, when I try to compile it, I get
Applying: fixed warnings in er-coap-13.c
error: patch failed: core/er-coap-13/er-coap-13.c:1231
error: core/er-coap-13/er-coap-13.c: patch does not apply
Any idea on how to fix it / what I m missing ?
Thanks for your help
Full log
sudo make clean all
make: Nothing to be done for 'clean'.
Building application "gnrc_minimal" for "native" with MCU "native".
rm -Rf /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama
mkdir -p /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama
/home/florian/Documents/prog/riot_clean2/dist/tools/git/git-cache clone "https://github.com/eclipse/wakaama.git" "69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c" "/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama"
Cloning into '/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama'...
remote: Counting objects: 5942, done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 5942 (delta 1), reused 6 (delta 1), pack-reused 5932
Receiving objects: 100% (5942/5942), 2.14 MiB | 108.00 KiB/s, done.
Resolving deltas: 100% (4201/4201), done.
Checking connectivity... done.
HEAD is now at 69a32cf... Merge pull request #57 from eclipse/fix_observe
touch /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama/.git-downloaded
git -C /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama checkout -f 69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c
HEAD is now at 69a32cf... Merge pull request #57 from eclipse/fix_observe
git -C /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama am --ignore-whitespace "/home/florian/Documents/prog/riot_clean2/pkg/wakaama"/patches/.patch
Applying: changing header location
Applying: defined endianness
Applying: fixed warnings in er-coap-13.c
error: patch failed: core/er-coap-13/er-coap-13.c:1231
error: core/er-coap-13/er-coap-13.c: patch does not apply
Patch failed at 0003 fixed warnings in er-coap-13.c
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
/home/florian/Documents/prog/riot_clean2/pkg/pkg.mk:19: recipe for target '/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama/.git-patched' failed
make[1]: *** [/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama/.git-patched] Error 128
/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/../../Makefile.include:352: recipe for target 'pkg-prepare' failed
make: [pkg-prepare] Error 2 (ignored)
"make" -C /home/florian/Documents/prog/riot_clean2/pkg/wakaama
git -C /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama checkout -f 69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c
Warning: you are leaving 2 commits behind, not connected to
any of your branches:
9416404 defined endianness
8c72bde changing header location
If you want to keep them by creating a new branch, this may be a good time
to do so with:
git branch 9416404
HEAD is now at 69a32cf... Merge pull request #57 from eclipse/fix_observe
git -C /home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama am --ignore-whitespace "/home/florian/Documents/prog/riot_clean2/pkg/wakaama"/patches/.patch
fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
/home/florian/Documents/prog/riot_clean2/pkg/pkg.mk:19: recipe for target '/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama/.git-patched' failed
make[1]: *** [/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/pkg/native/wakaama/.git-patched] Error 128
/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/../../Makefile.include:355: recipe for target '/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/native/wakaama.a' failed
make: *** [/home/florian/Documents/prog/riot_clean2/examples/gnrc_wakaama/bin/native/wakaama.a] Error 2