fix sdk build

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@699 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/Makefile b/package/Makefile
index 70761f5..16839eb 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -112,7 +112,7 @@ ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y)
 snort-compile: postgresql-compile
 endif
 
 snort-compile: postgresql-compile
 endif
 

-sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE)
+sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE) openwrt-install

 $(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install
 
 %-prepare:
 $(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install
 
 %-prepare:

diff --git a/package/linux/linux.mk b/package/linux/linux.mk
index 43417a4..0e21652 100644 (file)
--- a/package/linux/linux.mk
+++ b/package/linux/linux.mk
@@ -79,10 +79,13 @@ $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)

-       cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
+       cp -fa $< $@ 

        touch -c $(LINUX_KERNEL)
        touch -c $(LINUX_KERNEL)

+       
+$(LINUX_IMAGE): $(LINUX_KERNEL)
+       cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)

 
 

-$(LINUX_DIR)/.modules_done: $(LINUX_KERNEL)
+$(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)

        rm -rf $(BUILD_DIR)/modules
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
        $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(BUILD_DIR)/modules modules_install
        rm -rf $(BUILD_DIR)/modules
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
        $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(BUILD_DIR)/modules modules_install


@@ -102,7 +105,7 @@ linux-source: $(DL_DIR)/$(LINUX_SOURCE)
 
 # This has been renamed so we do _NOT_ by default run this on 'make clean'
 linuxclean: clean
 
 # This has been renamed so we do _NOT_ by default run this on 'make clean'
 linuxclean: clean

-       rm -f $(LINUX_KERNEL)
+       rm -f $(LINUX_KERNEL) $(LINUX_IMAGE)

        -$(MAKE) -C $(LINUX_DIR) clean
 
 linux-dirclean:
        -$(MAKE) -C $(LINUX_DIR) clean
 
 linux-dirclean:

diff --git a/target/Makefile b/target/Makefile
index bd33a1a..248bcff 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -29,9 +29,6 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
 endif
 endef
 
 endif
 endef
 

-$(LINUX_IMAGE): $(LINUX_KERNEL)
-       cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
-

 TARGET_DIRS:=
 TARGET_FS:=
 IMAGE_TARGETS:=
 TARGET_DIRS:=
 TARGET_FS:=
 IMAGE_TARGETS:=


@@ -74,8 +71,8 @@ $(BIN_DIR):
 
 $(INSTALL_TARGET_DIRS): lzma-loader-compile
 $(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS))
 
 $(INSTALL_TARGET_DIRS): lzma-loader-compile
 $(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS))

-compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader)
-install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
+compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader utils)
+install: utils-install lzma-install $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)

 clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean
 
 image_clean:
 clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean
 
 image_clean:

diff --git a/target/utils/Makefile b/target/utils/Makefile
index 2a91cbb..9762881 100644 (file)
--- a/target/utils/Makefile
+++ b/target/utils/Makefile
@@ -12,9 +12,9 @@ UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils
 
 prepare: $(UTILS_BUILD_DIR)
 compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS))
 
 prepare: $(UTILS_BUILD_DIR)
 compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS))

-install: compile

        mkdir -p $(STAGING_DIR)/bin
        cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/
        mkdir -p $(STAGING_DIR)/bin
        cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/

+install: compile

 package:
 clean:
        rm -rf $(UTILS_BUILD_DIR)
 package:
 clean:
        rm -rf $(UTILS_BUILD_DIR)