summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-16 18:17:39 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-16 18:17:39 +0000
commit0a9af49e0b41dc66ce0bb0d583b0241a882f2700 (patch)
treebf52255998d07b980f0ef7aea862eaf456dbb3fc /target/linux
parentceef40146f64415e3e046f724029b3e13544ecaf (diff)
Ensure lzma is built *before* linux, allow system installation in /usr/local/bin
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Makefile.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index f4ffd5d8d..78dcab70f 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -59,6 +59,14 @@ ifndef LINUX26_KERNEL
LINUX26_KERNEL=$(BINARIES_DIR)/linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH)
endif
+ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
+ifeq ($(BR2_KERNEL_HEADERS_LZMA_INSTALL),y)
+DEPEND_ON_HOST_LZMA:=lzma-host-install
+else
+DEPEND_ON_HOST_LZMA:=lzma-host
+endif
+endif
+
# Version of Linux AFTER patches
LINUX26_DIR=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
@@ -150,7 +158,7 @@ linux26-menuconfig: $(LINUX26_DIR)/.patched host-sed
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-linux26: $(INITRAMFS_TARGET) $(LINUX26_KERNEL)
+linux26: $(DEPEND_ON_HOST_LZMA) $(INITRAMFS_TARGET) $(LINUX26_KERNEL)
$(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
touch $@