[Bug 658] New: add_lzo.patch fails to apply cleanly to mtd-utils-native

[bugzilla-daemon at bugzilla.openmoko.org]

http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=658

           Summary: add_lzo.patch fails to apply cleanly to mtd-utils-native
           Product: OpenMoko
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: OE bitbake recipes  / build system
        AssignedTo: mickey at vanille-media.de
        ReportedBy: openmoko at twiceasgood.net
                CC: buglog at lists.openmoko.org


I am using the moko Makefile to build OpenMoko on Ubuntu Feisty.

I performed the following steps:

1) make update-makefile
2) make clobber
3) make update
4) make setup
5) make openmoko-devel-image

I get the following output while building:
---------- OUTPUT START -----------------

NOTE: package mtd-utils-native-1.0.0+git: started
NOTE: package mtd-utils-native-1.0.0+git-r2: task do_fetch: started
Already up-to-date.
No changes.
NOTE: Creating tarball of git repository
NOTE: Creating tarball of git checkout
NOTE: package mtd-utils-native-1.0.0+git-r2: task do_fetch: completed
NOTE: package mtd-utils-native-1.0.0+git-r2: task do_unpack: started
NOTE: Unpacking
/home/gordon/svn/moko/sources/git_git.infradead.org.mtd-utils.git_master.tar.gz to /
home/gordon/svn/moko/build/tmp/work/i686-linux/mtd-utils-native-1.0.0+git-r2/
NOTE: package mtd-utils-native-1.0.0+git-r2: task do_unpack: completed
NOTE: package mtd-utils-native-1.0.0+git-r2: task do_patch: started
NOTE: Applying patch 'add_lzo.patch'
Command Error: exit status: 1  Output:
Applying patch add_lzo.patch
patching file Makefile
Hunk #1 FAILED at 58.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file compr.c
Hunk #1 succeeded at 523 with fuzz 2 (offset 49 lines).
Hunk #2 succeeded at 540 with fuzz 2 (offset 52 lines).
patching file compr.h
Hunk #1 FAILED at 21.
Hunk #2 succeeded at 120 with fuzz 2 (offset 7 lines).
1 out of 2 hunks FAILED -- saving rejects to file compr.h.rej
The next patch would create the file compr_lzo.c,
which already exists!  Applying it anyway.
patching file compr_lzo.c
Patch attempted to create file compr_lzo.c, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file compr_lzo.c.rej
patching file include/linux/jffs2.h
Hunk #1 FAILED at 46.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/jffs2.h.rej
Applied patch add_lzo.patch (forced; needs refresh)
NOTE: dropping user into a shell, so that patch rejects can be fixed manually.
$

---------- OUTPUT END -------------------



------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.