Skip to content

pkg: oonf_api: make patch not working #884

@LudwigKnuepfer

Description

@LudwigKnuepfer

I followed #630 (comment) and got:

make patch
make: *** No rule to make target '/home/lo/native/RIOT/pkg/oonf_api/oonf_api', needed by '/home/lo/native/RIOT/pkg/oonf_api/oonf_api/Makefile'.  Stop.

After mkdir oonf_api I get:

# Here you apply your patch.
cd "/home/lo/native/RIOT/pkg/oonf_api/oonf_api" && git am "../0001-add-RIOT-support.patch"; cd "/home/lo/native/RIOT/pkg/oonf_api/oonf_api" && git am "../0002-port-tests-to-riot.patch"; cd "/home/lo/native/RIOT/pkg/oonf_api/oonf_api" && git am "../0003-port-example-to-riot.patch";
Applying: add RIOT support
/home/lo/native/RIOT/.git/rebase-apply/patch:202: trailing whitespace.
#ifndef DONT_HAVE_SIN6_SCOPE_ID      
error: Makefile: already exists in index
error: src-api/common/autobuf.c: does not exist in index
error: src-api/common/common_types.h: does not exist in index
error: src-api/common/daemonize.c: does not exist in index
error: src-api/common/netaddr.c: does not exist in index
error: src-api/common/netaddr.h: does not exist in index
error: src-api/rfc5444/rfc5444_print.c: does not exist in index
Patch failed at 0001 add RIOT support
The copy of the patch that failed is found in:
   /home/lo/native/RIOT/.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".
previous rebase directory /home/lo/native/RIOT/.git/rebase-apply still exists but mbox given.
previous rebase directory /home/lo/native/RIOT/.git/rebase-apply still exists but mbox given.
Makefile:29: recipe for target '/home/lo/native/RIOT/pkg/oonf_api/oonf_api/Makefile' failed
make: *** [/home/lo/native/RIOT/pkg/oonf_api/oonf_api/Makefile] Error 1

Now:

git st
On branch master
Your branch is up-to-date with 'origin/master'.

You are in the middle of an am session.
  (fix conflicts and then run "git am --continue")
  (use "git am --skip" to skip this patch)
  (use "git am --abort" to restore the original branch)

Would be nice to add some kind of error handling..

Metadata

Metadata

Assignees

Labels

Type: bugThe issue reports a bug / The PR fixes a bug (including spelling errors)

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions