diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-06-25 04:20:16 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-25 04:20:16 +0000 |
| commit | 65d06317f3624044da9abc872a854136aefd59bd (patch) | |
| tree | b400f08afbf728958114c31e93805fa7a6bd8432 /packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch | |
| parent | 238722e5b137d0ad7ad7b6cc13043744d1274d35 (diff) | |
ixp4xx-csr: Fixed the .bb so that the 2.1.1 patch is actually applied, but unfortunately it now doesn't build.
Diffstat (limited to 'packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch')
| -rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch b/packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch index 492b1eab03..9f1d253a93 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1.1/oe-makefile.patch @@ -1,22 +1,30 @@ changes to Makefile required only on OE ---- ixp400_xscale_sw/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ ixp400_xscale_sw/Makefile 1970-01-01 00:00:00.000000000 +0000 -@@ -1321,10 +1323,26 @@ ixp400.o : $(OBJ_DIR)/ixp400.o + Makefile | 11 ++++++++++- + Makefile.kmod26 | 11 +++++++++++ + ixp400.c | 1 + + 3 files changed, 22 insertions(+), 1 deletion(-) + +Index: ixp400_xscale_sw/Makefile +=================================================================== +--- ixp400_xscale_sw.orig/Makefile ++++ ixp400_xscale_sw/Makefile +@@ -1385,9 +1385,10 @@ + + ifeq ($(IX_LINUXVER),2.6) + ixp400 : $(OBJ_DIR)/ixp400.o ++ cp $(OSAL_MODULE) $(OBJ_DIR) + @echo 'EXTRA_LDFLAGS := --whole-archive' > $(OBJ_DIR)/Makefile + @echo ' ' >> $(OBJ_DIR)/Makefile +- @echo 'lib-m := $(COMPONENTS:%=ixp400_%.o) $(OBJ_DIR_EXIT)/$(OSAL_MODULE)'>> $(OBJ_DIR)/Makefile ++ @echo 'lib-m := $(COMPONENTS:%=ixp400_%.o) ixp_osal.o'>> $(OBJ_DIR)/Makefile + @echo ' ' >> $(OBJ_DIR)/Makefile + @echo 'obj-m := ixp400.o' >> $(OBJ_DIR)/Makefile + @echo ' ' >> $(OBJ_DIR)/Makefile +@@ -1403,7 +1404,15 @@ - ifndef IX_INCLUDE_MICROCODE $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE) -+ rm -f $(OBJ_DIR)/ixp400.c -+ touch $(OBJ_DIR)/ixp400.c -+ cp Makefile.kmod26 $(OBJ_DIR)/Makefile -+ make -C $(OBJ_DIR) -+ rm -f $(OBJ_DIR)/ixp400.c -+ cp ixp400.c $(OBJ_DIR)/ixp400.c - $(LD) $(LDFLAGS) $^ -o $@ -+ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o -+ make -C $(OBJ_DIR) - else - $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE) + ifneq ($(IX_LINUXVER),2.6) + rm -f $(OBJ_DIR)/ixp400.c + touch $(OBJ_DIR)/ixp400.c + cp Makefile.kmod26 $(OBJ_DIR)/Makefile @@ -29,12 +37,16 @@ changes to Makefile required only on OE endif ---- ixp400_xscale_sw/ixp400.c 1970-01-01 00:00:00.000000000 +0000 -+++ ixp400_xscale_sw/ixp400.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,1 @@ +Index: ixp400_xscale_sw/ixp400.c +=================================================================== +--- /dev/null ++++ ixp400_xscale_sw/ixp400.c +@@ -0,0 +1 @@ +#error this file must never be compiled ---- ixp400_xscale_sw/Makefile.kmod26 1970-01-01 00:00:00.000000000 +0000 -+++ ixp400_xscale_sw/Makefile.kmod26 1970-01-01 00:00:00.000000000 +0000 +Index: ixp400_xscale_sw/Makefile.kmod26 +=================================================================== +--- /dev/null ++++ ixp400_xscale_sw/Makefile.kmod26 @@ -0,0 +1,11 @@ +obj-m := ixp400.o + |