aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-10-13 23:07:04 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-10-13 23:07:04 +0000
commit8af5081babba3c3bb8f8f8f031581f4ce86ac14c (patch)
tree301eef0b61293d6f53100bacd7073dff89c6d64a /target
parent815c3dfd1ed5a25d100be305f2364d8358f8ee63 (diff)
downloadbuildroot-8af5081babba3c3bb8f8f8f031581f4ce86ac14c.tar.gz
buildroot-8af5081babba3c3bb8f8f8f031581f4ce86ac14c.tar.bz2
Use correct kernel name for advanced linux build
Diffstat (limited to 'target')
-rw-r--r--target/linux/Makefile.in.advanced15
1 files changed, 9 insertions, 6 deletions
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 29eace1445..08059921e1 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -147,7 +147,7 @@ endif
# -----------------------------------------------------------------------------
# File name for the Linux kernel binary
-LINUX_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
+LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
ifndef LINUX26_KERNEL
LINUX26_KERNEL:=$(BINARIES_DIR)/$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
@@ -212,9 +212,10 @@ ifeq ($(BR2_LINUX_COPYTO_TFTPBOOT),y)
LINUX26_TARGETS+=/tftpboot/$(LINUX26_KERNEL_NAME)
endif
-ifneq ($(BR2_LINUX_COPYTO),)
+ifneq ($(strip $(subst ",,$(BR2_LINUX_COPYTO))),)
LINUX_COPYTO:=$(strip $(subst ",,$(BR2_LINUX_COPYTO)))
#"))
+#"))
LINUX26_TARGETS+=$(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME)
endif
@@ -359,7 +360,7 @@ $(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config: $(LINUX26_DIR)/.config
mkdir -p $(TARGET_DIR)/boot
cp -dpf $(LINUX26_DIR)/.config $(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config
-$(TARGET_DIR)/boot/uclibc.config: .$(UCLIBC_DIR)/.config
+$(TARGET_DIR)/boot/uclibc.config: $(UCLIBC_DIR)/.config
mkdir -p $(TARGET_DIR)/boot
cp -dpf $(UCLIBC_DIR)/.config $(TARGET_DIR)/boot/uclibc.config
@@ -367,13 +368,13 @@ $(TARGET_DIR)/boot/busybox.config: $(BUSYBOX_DIR)/.config
mkdir -p $(TARGET_DIR)/boot
cp -dpf .config $(TARGET_DIR)/boot/busybox.config
-/tftpboot/$(LINUX_KERNEL_NAME): $(LINUX26_KERNEL)
+/tftpboot/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
mkdir -p /tftpboot
- cp -dpf $(LINUX26_KERNEL) /tftpboot/$(LINUX_KERNEL_NAME)
+ cp -dpf $(LINUX26_KERNEL) /tftpboot/$(LINUX26_KERNEL_NAME)
$(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
mkdir -p $(LINUX_COPYTO)
- cp -dpf $(LINUX26_KERNEL) $(LINUX_COPYTO)/$(LINUX_KERNEL_NAME)
+ cp -dpf $(LINUX26_KERNEL) $(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME)
linux26: $(LINUX26_TARGETS)
@@ -408,6 +409,7 @@ linux-status:
@echo LINUX26_SOURCE=$(LINUX26_SOURCE)
@echo LINUX26_DIR=$(LINUX26_DIR)
@echo TARGETS=$(TARGETS)
+ @echo LINUX26_TARGETS=$(LINUX26_TARGETS)
@echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR)
@echo LINUX26_BINLOC=$(LINUX26_BINLOC)
@echo LINUX26_FORMAT=$(LINUX26_FORMAT)
@@ -426,6 +428,7 @@ linux-status:
@echo BR2_LINUX_COPYTO_ROOTFS=$(BR2_LINUX_COPYTO_ROOTFS)
@echo BR2_LINUX_COPYTO_TFTPBOOT=$(BR2_LINUX_COPYTO_TFTPBOOT=)
@echo BR2_LINUX_COPYTO=$(BR2_LINUX_COPYTO)
+ @echo LINUX_COPYTO=$(LINUX_COPYTO)
@echo BR2_KERNEL_MINORLEVEL=$(BR2_KERNEL_MINORLEVEL)
@echo LINUX26_LATEST_RC_PATCH=$(LINUX26_LATEST_RC_PATCH)
@echo BR2_KERNEL_RC_LEVEL=$(BR2_KERNEL_RC_LEVEL)