summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-21 18:09:41 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-21 18:09:41 +0000
commitb5fec425be0bc9e3e9d62178c4a569162534a0bd (patch)
tree0494c8119ae8813ac49b5dc71cb6c332b6be2cc8 /package
parent6b3623eac2eddbbccdaec44d96bd86b1f156bb28 (diff)
fix sdk build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@699 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile2
-rw-r--r--package/linux/linux.mk9
2 files changed, 7 insertions, 4 deletions
diff --git a/package/Makefile b/package/Makefile
index 70761f537..16839ebff 100644
--- a/package/Makefile
+++ b/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/package/linux/linux.mk b/package/linux/linux.mk
index 43417a411..0e216527f 100644
--- 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)
- 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: