Re: [crisos] patch errors

[ Thread Index | Date Index | More lists.tuxfamily.org/crisos Archives ]


Same problem here!

[michele@localhost darwinfox]$ make patch
#remove un-versioned files from build dir
rm -dfr `svn status openwrt/ | grep '^[?]' - | cut -c 8-`
#now i need to revert all change to openwrt files
svn revert -R openwrt/
#FIXME At the moment this is an extreme stupid way to manage patches.
# Any suggestion is welcome!
#finally apply the patch
../helper/patch ./patches ./openwrt
Applying ./patches/001-base-files.patch:
patching file target/linux/etrax/base-files/etc/passwd
patching file target/linux/etrax/base-files/etc/opkg.conf
patching file target/linux/etrax/base-files/etc/banner
patching file target/linux/etrax/base-files/etc/config/system
patching file target/linux/etrax/base-files/etc/config/network
patching file target/linux/etrax/base-files/etc/ipkg.conf
Applying ./patches/001-eboot_source.patch:
patching file target/linux/etrax/image/e100boot/Makefile
Applying ./patches/001-feeds.patch:
patching file feeds.conf.default
Applying ./patches/010-compile-fix.patch:
patching file target/linux/etrax/patches/100-compile_fixes.patch
Applying ./patches/012-iptable-fix.patch:
patching file package/iptables/patches/1.4.0/008-table_alignment_fix.patch
Applying ./patches/020-cris-debroken.patch:
patching file target/linux/etrax/Makefile
Applying ./patches/400-scsi_import.patch:
patching file target/linux/etrax/patches/400-scsi_import.patch
Applying ./patches/401-kernel_config.patch:
patching file target/linux/etrax/config-default
Applying ./patches/800-enable_ipkg.patch:
patching file package/busybox/config/archival/Config.in
Hunk #1 FAILED at 141.
1 out of 1 hunk FAILED -- saving rejects to file
package/busybox/config/archival/Config.in.rej
patching file include/target.mk
FAIL!  Please report problem to http://crisos.org/flyspray (patch error
was: ./patches/800-enable_ipkg.patch)!
make: *** [patch] Error 1
[michele@localhost darwinfox]$



> hi,
>
> using the latest svn checkout I get errors during make patch. (The
> 800-enable_ipkg.patch). The problem is that the file Config.in in my
> repository doesn't contain an entry for ipkg.
>
> Could it be that Claudio uses a different version of the openwrt sources
> than available through the repo?
>
> Greetings
> Chris
>
> ---
> CrisOs mailing list
> Official multi-language http://www.crisos.org/ mailing list
>
> For unsubscribe send empty mail to: crisos-request@xxxxxxxxxxxxxxxxxxx
> with subject unsubscribe.
>



---
CrisOs mailing list
Official multi-language http://www.crisos.org/ mailing list

For unsubscribe send empty mail to: crisos-request@xxxxxxxxxxxxxxxxxxx with subject unsubscribe.


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/