fix sdk build

SVN-Revision: 699
owl
Felix Fietkau 2005-04-21 18:09:41 +00:00
parent afabdf2675
commit 9fe50db569
4 changed files with 10 additions and 10 deletions

View File

@ -112,7 +112,7 @@ ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y)
snort-compile: postgresql-compile snort-compile: postgresql-compile
endif 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 $(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install
%-prepare: %-prepare:

View File

@ -79,10 +79,13 @@ $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT) $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT)
$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC) $(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_DIR)/.modules_done: $(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_IMAGE)
rm -rf $(BUILD_DIR)/modules rm -rf $(BUILD_DIR)/modules
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) 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 $(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' # This has been renamed so we do _NOT_ by default run this on 'make clean'
linuxclean: clean linuxclean: clean
rm -f $(LINUX_KERNEL) rm -f $(LINUX_KERNEL) $(LINUX_IMAGE)
-$(MAKE) -C $(LINUX_DIR) clean -$(MAKE) -C $(LINUX_DIR) clean
linux-dirclean: linux-dirclean:

View File

@ -29,9 +29,6 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
endif endif
endef endef
$(LINUX_IMAGE): $(LINUX_KERNEL)
cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
TARGET_DIRS:= TARGET_DIRS:=
TARGET_FS:= TARGET_FS:=
IMAGE_TARGETS:= IMAGE_TARGETS:=
@ -74,8 +71,8 @@ $(BIN_DIR):
$(INSTALL_TARGET_DIRS): lzma-loader-compile $(INSTALL_TARGET_DIRS): lzma-loader-compile
$(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS))
compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader) compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader utils)
install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS) install: utils-install lzma-install $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean
image_clean: image_clean:

View File

@ -12,9 +12,9 @@ UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils
prepare: $(UTILS_BUILD_DIR) prepare: $(UTILS_BUILD_DIR)
compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS))
install: compile
mkdir -p $(STAGING_DIR)/bin mkdir -p $(STAGING_DIR)/bin
cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/
install: compile
package: package:
clean: clean:
rm -rf $(UTILS_BUILD_DIR) rm -rf $(UTILS_BUILD_DIR)