rod at whitby.id.au
Wed Apr 11 03:22:57 CEST 2007
Eric Heinemann wrote:
> I just updated to the newest Mokomakefile and I get the following error
> on gentoo and Ubuntu
> Applying patch sysvinit-inittab-duplicated-lines.patch
> patching file trunk/oe/packages/sysvinit/sysvinit/fic-gta01/inittab
> Hunk #1 FAILED at 33.
> 1 out of 1 hunk FAILED -- rejects in file
> Patch sysvinit-inittab-duplicated-lines.patch can be reverse-applied
> make: *** [setup-patches] Error 1
The "can be reverse-applied" is the key. Mickey applied this patch to
the OpenMoko SVN overnight. I've removed the patch from MokoMakefile now.
If this happens again, you can just comment out the offending patch from
the patches/openmoko-HEAD/series file until I wake up, notice that the
patch has been applied upstream, and remove it from MokoMakefile.
As soon as anonymous svn access is fixed on projects.openmoko.org, I
will be moving all this back there and giving write access to trusted
developers - then there should be multiple people around the world
(including those on the core team) who can remove patches that are
applied upstream or change the frozen OE version, etc.
More information about the community