[oe-issues] [Bug 1877] New: linux-rp-2.6.20 will not build for collie (do_patch fails)

[bugzilla-daemon at tinman.treke.net]

http://bugs.openembedded.org/show_bug.cgi?id=1877

           Summary: linux-rp-2.6.20 will not build for collie (do_patch
                    fails)
           Product: Openembedded
           Version: Angstrom
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Build
        AssignedTo: openembedded-issues at lists.openembedded.org
        ReportedBy: bugs.openembedded.org at rolf.leggewie.biz
         QAContact: tinderbox-oe at gmx.net
OtherBugsDependingO 919
             nThis:


BB>> build linux-rp-2.6.20
SHELL: Building atmelwlandriver
NOTE: preferred version 2.5 of glibc not available
NOTE: package linux-rp-2.6.20: started
NOTE: package linux-rp-2.6.20-r2: task do_patch: started
[...]
NOTE: Applying patch 'mtd-sharp-flash-hack-r0.patch'
Command Error: exit status: 1  Output:
Applying patch mtd-sharp-flash-hack-r0.patch
patching file drivers/mtd/chips/sharp.c
Hunk #5 FAILED at 152.
Hunk #6 succeeded at 185 (offset -2 lines).
[...]
Hunk #19 succeeded at 567 (offset -2 lines).
1 out of 19 hunks FAILED -- saving rejects to file
drivers/mtd/chips/sharp.c.rej
patching file drivers/mtd/maps/Kconfig
Hunk #1 succeeded at 410 (offset -17 lines).
patching file drivers/mtd/maps/sa1100-flash.c
Hunk #1 succeeded at 210 (offset -1 lines).
patching file arch/arm/mach-sa1100/collie.c
Hunk #1 succeeded at 206 (offset -4 lines).
Applied patch mtd-sharp-flash-hack-r0.patch (forced; needs refresh)
NOTE: dropping user into a shell, so that patch rejects can be fixed manually.
$ cat drivers/mtd/chips/sharp.c.rej
***************
*** 143,149 ****
        mtd->name = map->name;

        memset(sharp, 0, sizeof(*sharp));
-       sharp->chipshift = 23;
        sharp->numchips = 1;
        sharp->chips[0].start = 0;
        sharp->chips[0].state = FL_READY;
--- 152,158 ----
        mtd->name = map->name;

        memset(sharp, 0, sizeof(*sharp));
+       sharp->chipshift = 24;
        sharp->numchips = 1;
        sharp->chips[0].start = 0;
        sharp->chips[0].state = FL_READY;


-- 
Configure bugmail: http://bugs.openembedded.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.