diff options
| -rw-r--r-- | openwrt/package/Makefile | 2 | ||||
| -rw-r--r-- | openwrt/package/linux/linux.mk | 9 | ||||
| -rw-r--r-- | openwrt/target/Makefile | 7 | ||||
| -rw-r--r-- | openwrt/target/utils/Makefile | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 70761f537f..16839ebff4 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -112,7 +112,7 @@ ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y) 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: diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk index 43417a4114..0e216527f6 100644 --- a/openwrt/package/linux/linux.mk +++ b/openwrt/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) - cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL) + cp -fa $< $@ 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 @@ -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 - rm -f $(LINUX_KERNEL) + rm -f $(LINUX_KERNEL) $(LINUX_IMAGE) -$(MAKE) -C $(LINUX_DIR) clean linux-dirclean: diff --git a/openwrt/target/Makefile b/openwrt/target/Makefile index bd33a1a7ca..248bcffcde 100644 --- a/openwrt/target/Makefile +++ b/openwrt/target/Makefile @@ -29,9 +29,6 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin endif endef -$(LINUX_IMAGE): $(LINUX_KERNEL) - cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false) - TARGET_DIRS:= TARGET_FS:= IMAGE_TARGETS:= @@ -74,8 +71,8 @@ $(BIN_DIR): $(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: diff --git a/openwrt/target/utils/Makefile b/openwrt/target/utils/Makefile index 2a91cbbd59..9762881287 100644 --- a/openwrt/target/utils/Makefile +++ b/openwrt/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)) -install: compile mkdir -p $(STAGING_DIR)/bin cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ +install: compile package: clean: rm -rf $(UTILS_BUILD_DIR) |