Modify

Opened 4 years ago

Closed 4 years ago

#16678 closed defect (fixed)

Patch platform/610-MIPS-ath79-openwrt-machines.patch does not apply

Reported by: anonymous Owned by: developers
Priority: normal Milestone: Chaos Calmer 15.05
Component: base system Version: Trunk
Keywords: Cc:

Description

Applying patch platform/605-MIPS-ath79-db120-fixes.patch
patching file arch/mips/ath79/mach-db120.c
patching file arch/mips/ath79/Kconfig

Applying patch platform/606-MIPS-ath79-pb44-fixes.patch
patching file arch/mips/ath79/mach-pb44.c
patching file arch/mips/ath79/Kconfig

Applying patch platform/607-MIPS-ath79-ubnt-xm-fixes.patch
patching file arch/mips/ath79/Kconfig
patching file arch/mips/ath79/mach-ubnt-xm.c

Applying patch platform/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
patching file arch/mips/ath79/mach-ubnt-xm.c
patching file arch/mips/ath79/Kconfig
patching file arch/mips/ath79/machtypes.h

Applying patch platform/609-MIPS-ath79-ap136-fixes.patch
patching file arch/mips/ath79/mach-ap136.c
patching file arch/mips/ath79/machtypes.h
patching file arch/mips/ath79/Kconfig

Applying patch platform/610-MIPS-ath79-openwrt-machines.patch
patching file arch/mips/ath79/machtypes.h
patch: **** malformed patch at line 146:  #endif /* _ATH79_MACHTYPE_H */

Patch platform/610-MIPS-ath79-openwrt-machines.patch does not apply (enforce with -f)
make[4]: *** [/home/development/src/openwrt-trunk/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.10.36/.quilt_checked] Error 1
make[4]: Leaving directory `/home/development/src/openwrt-trunk/openwrt/target/linux/ar71xx'
make[3]: *** [compile] Error 2
make[3]: Leaving directory `/home/development/src/openwrt-trunk/openwrt/target/linux'
make[2]: *** [target/linux/compile] Error 2
make[2]: Leaving directory `/home/development/src/openwrt-trunk/openwrt'
make[1]: *** [/home/development/src/openwrt-trunk/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_compile] Error 2
make[1]: Leaving directory `/home/development/src/openwrt-trunk/openwrt'
make: *** [world] Error 2
dev@openwrt:~/src/openwrt-trunk/openwrt$

Attachments (0)

Change History (2)

comment:1 Changed 4 years ago by blogic

fix coming up ....

comment:2 Changed 4 years ago by blogic

  • 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.