Modify

Opened 5 years ago

Closed 5 years ago

#12414 closed defect (fixed)

Changeset 33966 break make kernel_menuconfig with IXP4xx

Reported by: Mike Brady <mikebrady@…> Owned by: developers
Priority: normal Milestone: Chaos Calmer 15.05
Component: kernel Version: Trunk
Keywords: IXP4xx ARM patchfile Cc:

Description

"make kernel_menuconfig" aborts from Changeset 33966 onwards if you have selected an IXP4xx platform. To reproduce: download a clean trunk to revision 33966. Use "make menuconfig" to select Intel IXP4xx, no other changes. Then use "make kernel_menuconfig". This will fail, with the following messages towards the end:

Applying patch platform/120-compex_support.patch
patching file arch/arm/mach-ixp4xx/Kconfig
patching file arch/arm/mach-ixp4xx/Makefile
patching file arch/arm/mach-ixp4xx/compex-setup.c
patching file arch/arm/mach-ixp4xx/ixdp425-pci.c
patching file arch/arm/tools/mach-types
Hunk #1 FAILED at 1273.
1 out of 1 hunk FAILED -- rejects in file arch/arm/tools/mach-types
Patch platform/120-compex_support.patch does not apply (enforce with -f)
make[2]: *** [/home/mike/openwrt/bleedin/build_dir/linux-ixp4xx_generic/linux-3.3.8/.quilt_checked] Error 1
make[2]: Leaving directory `/home/mike/openwrt/bleedin/target/linux/ixp4xx'
make[1]: *** [menuconfig] Error 2
make[1]: Leaving directory `/home/mike/openwrt/bleedin/target/linux'
make: *** [kernel_menuconfig] Error 2

If you revert to the previous changeset, do a "make clean" and then a "make kernel_menuconfig", all will be okay.

Maybe some patch files need to be refreshed?

Attachments (0)

Change History (3)

comment:1 Changed 5 years ago by hnyman <hannu.nyman@…>

Also buildbots choke with that. E.g. http://buildbot.openwrt.org/builders/ixp4xx/builds/92/steps/compile_4/logs/stdio

Apparently https://dev.openwrt.org/browser/trunk/target/linux/ixp4xx/patches-3.3/120-compex_support.patch need to be patched to reflect the change done to /arch/arm/tools/mach-types by r33966. New board types are now added to the end of the file, instead of being inserted in to middle. For that reason 120-compex_support.patch now fails.

See https://dev.openwrt.org/browser/trunk/target/linux/generic/patches-3.3/980-arm_openwrt_machtypes.patch?rev=33966#L1

comment:2 Changed 5 years ago by anonymous

probably fixed by r34083

comment:3 Changed 5 years ago by florian

  • Resolution set to fixed
  • Status changed from new to closed

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.