Dirk,
Thank you for finding that! I was looking for a missing ' or ". Never thought
to look for a missing }.
Next question. I need to patch a file that is not in the main directory.
Here is the dir structure:
~/oe/build/tmp/work/orbiter-11205.1.1-r0> ll
total 45
drwxr-xr-x 3 oc60174 users 384 2006-08-14 23:12 CreateDevice
drwxr-xr-x 3 oc60174 users 2288 2006-08-13 08:25 DCE
drwxr-xr-x 3 oc60174 users 4528 2006-08-14 23:10 Gen_Devices
drwxr-xr-x 20 oc60174 users 6624 2006-08-14 23:12 Orbiter
drwxr-xr-x 3 oc60174 users 856 2006-08-14 23:12 OrbiterGen
drwxr-xr-x 3 oc60174 users 31112 2006-08-13 08:25 pluto_main
drwxr-xr-x 4 oc60174 users 1600 2006-08-14 23:11 PlutoUtils
drwxr-xr-x 3 oc60174 users 560 2006-08-13 08:25 RA
drwxr-xr-x 3 oc60174 users 272 2006-08-13 08:25 SerializeClass
drwxr-xr-x 3 oc60174 users 408 2006-08-14 23:12 Splitter
drwxr-xr-x 2 oc60174 users 464 2006-08-14 23:11 temp
drwxr-xr-x 6 oc60174 users 144 2006-08-13 08:27 utilities
I need to add a line to a file (CommonIncludes.h) in the PlutoUtils dir.
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0> cd PlutoUtils/
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/PlutoUtils> quilt
new commonincludes_h.patch
Patch patches/commonincludes_h.patch is now on top
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/PlutoUtils> quilt
add CommonIncludes.h
File CommonIncludes.h added to patch patches/commonincludes_h.patch
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/PlutoUtils> quilt
edit CommonIncludes.h
File CommonIncludes.h is already in patch patches/commonincludes_h.patch
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/PlutoUtils> quilt
refresh
Refreshed patch patches/commonincludes_h.patch
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/PlutoUtils> quilt
diff -u > commonincludes_h.patch
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/PlutoUtils> cp
commonincludes_h.patch ~/oe/org.openembedded.oz354x/packages/Orbiter/
Then I run "bitbake orbiter" and get the following error:
NOTE: package orbiter-11205.1.1-r0: task do_patch: started
NOTE: Applying patch 'orbiter_make.patch'
NOTE: Applying patch 'commonincludes_h.patch'
ERROR: function do_patchcmd failed
ERROR: log data follows
(/home/oc60174/oe/build/tmp/work/orbiter-11205.1.1-r0/temp/log.do_patchcmd.18034)
| Importing patch
patches//home/oc60174/oe/org.openembedded.oz354x/packages/Orbiter/commonincludes_h.patch
(stored as patches/commonincludes_h.patch)
| Applying patch patches/commonincludes_h.patch
| can't find file to patch at input line 5
| Perhaps you used the wrong -p or --strip option?
| The text leading up to this was:
| --------------------------
| |Index: PlutoUtils/CommonIncludes.h
| |===================================================================
| |--- PlutoUtils.orig/CommonIncludes.h
| |+++ PlutoUtils/CommonIncludes.h
| --------------------------
| No file to patch. Skipping patch.
| 1 out of 1 hunk ignored
| Patch patches/commonincludes_h.patch does not apply (enforce with -f)
NOTE: Task failed:
/home/oc60174/oe/build/tmp/work/orbiter-11205.1.1-r0/temp/log.do_patchcmd.18034
NOTE: package orbiter-11205.1.1-r0: task do_patch: failed
ERROR: TaskFailed event exception, aborting
NOTE: package orbiter-11205.1.1: failed
ERROR: Build of orbiter failed
It doesn't seem to know where to look for the CommonIncludes.h file?
I tried it in the dir above orbiter-11205.1.1-r0 and got the same error.
When I tried it in the Orbiter dir I get this:
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/Orbiter> quilt new
commonincludes_h.patch
Patch patches/commonincludes_h.patch is now on top
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/Orbiter> quilt add
../PlutoUtils/CommonIncludes.h
File ../PlutoUtils/CommonIncludes.h added to patch
patches/commonincludes_h.patch
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/Orbiter> quilt edit
../PlutoUtils/CommonIncludes.h
File ../PlutoUtils/CommonIncludes.h is already in patch
patches/commonincludes_h.patch
[EMAIL PROTECTED]:~/oe/build/tmp/work/orbiter-11205.1.1-r0/Orbiter> quilt
refresh
Nothing in patch patches/commonincludes_h.patch
Any ideas on how to fix this?
Rob
-------------- Original message ----------------------
From: "Dirk Opfer" <[EMAIL PROTECTED]>
> Hi,
>
> please correct CPPFLAGS append line in your bb file:
>
> -L${STAGING_LIBDIR}/X11/lib -I${STAGING_INCDIR/X11/include"
> ^
> |
>
>
> Dirk
>
> _______________________________________________
> Oe mailing list
> [email protected]
> https://www.handhelds.org/mailman/listinfo/oe
_______________________________________________
Oe mailing list
[email protected]
https://www.handhelds.org/mailman/listinfo/oe
