rendered paste body inflating: ixp400_xscale_sw/src/npeDl/ixNpeDlImageConverter.c
( cd patches/ixp400 ; cat `grep -v \# series` ) | \
patch -d ixp400_xscale_sw -p1
patching file Makefile
patching file ixp400.c
patching file Makefile.kmod26
patching file src/ethDB/include/IxEthDB_p.h
patching file src/include/IxTypes.h
patching file src/npeMh/IxNpeMhSymbols.c
patching file src/include/IxQMgr.h
patching file src/ethMii/IxEthMii.c
patching file src/ethMii/IxEthMii.c
patching file src/ethMii/IxEthMii_p.h
patching file Makefile
Hunk #7 FAILED at 1326.
1 out of 7 hunks FAILED -- saving rejects to file Makefile.rej
patching file Kbuild.26
patching file buildUtils/environment.linux.sh
make: *** [ixp400_xscale_sw/Makefile] Error 1
gs@gs:~/dev/kernel$ cat ./ixp400_xscale_sw/Makefile.rej
***************
*** 1323,1342 ****
ifndef IX_INCLUDE_MICROCODE
$(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE)
- touch $(OBJ_DIR)/ixp400.c
- cp Makefile.kmod26 $(OBJ_DIR)/Makefile
- make -C $(OBJ_DIR)
$(LD) $(LDFLAGS) $^ -o $@
- make -C $(OBJ_DIR)
else
$(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE)
- touch $(OBJ_DIR)/ixp400.c
- cp Makefile.kmod26 $(OBJ_DIR)/Makefile
- make -C $(OBJ_DIR)
$(LD) $(LDFLAGS) $^ -o $@
- make -C $(OBJ_DIR)
endif
################################################################
--- 1326,1343 ----
ifndef IX_INCLUDE_MICROCODE
$(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE)
$(LD) $(LDFLAGS) $^ -o $@
else
$(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE)
$(LD) $(LDFLAGS) $^ -o $@
endif
+ $(OBJ_DIR)/ixp400_bin.o_shipped: $(OBJ_DIR)/ixp400.o
+ cp $(OBJ_DIR)/ixp400.o $(OBJ_DIR)/ixp400_bin.o_shipped
+
+ ixp400.ko : $(OBJ_DIR)/ixp400_bin.o_shipped
+ cp Kbuild.26 $(OBJ_DIR)/Kbuild
+ make ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) -C $(LINUX_SRC) M=$(IX_XSCALE_SW)/$(OBJ_DIR)
################################################################