John Seghers wrote: > I am using the MokoMakefile. I've tried to get the "make update" to use the > patch from bug #599 many different ways and can't seem to get it to work. > > If I manually edit the target file, it will build the openmoko-devel-image, > but any time I "make update" it reverts to the problematic code.
Yes, that is intentional. > I downloaded the patch file to "pulseaudio-bitbake-fix.patch" and placed > that in /home/moko/patches/openmoko-HEAD. If it's a patch to the OE stuff, rather than the openmoko svn, then it needs to go in the oe-related subdir of patches, not the openmoko subdir. > Then I created a series file > there containing: > > silence-retrieved-revisions.patch > pulseaudio-bitbake-fix.patch You'll need to add this to the series file in the other patches subdir which gets applied to the OE checkout. > The first four lines of the pulseaudio patch are: > > Index: oe/packages/pulseaudio/pulseaudio_0.9.6.bb > =================================================================== > --- oe/packages/pulseaudio/pulseaudio_0.9.6.bb (revision 2207) > +++ oe/packages/pulseaudio/pulseaudio_0.9.6.bb (working copy) > > This is referring to the file at > /home/moko/oe/packages/pulseaudio/pulseaudio_0.9.6.bb > which is also the file at > /home/moko/openmoko/trunk/oe/packages/pulseaudio/pulseaudio_0.9.6.bb > since /home/moko/oe is a link to the deeper tree. > > The beginning of silence-retrieved-revisions.patch contains: > > --- > trunk/oe/classes/base.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: openmoko/trunk/oe/classes/base.bbclass > =================================================================== > --- openmoko.org/trunk/oe/classes/base.bbclass > +++ openmoko/trunk/oe/classes/base.bbclass > > > When I try to run "make update" however, it states it cannot find the file > to be patched. Yes, cause it's looking for it in the openmoko svn area instead of the OE checkout area. Put it in the other patches subdir, and it should work as expected. -- Rod
