diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2008-03-18 13:26:13 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2008-03-18 13:26:13 +0000 |
| commit | 43bc815a5a8575ee790b95e4ac678a3d39e9801e (patch) | |
| tree | 9763abf8f235e8d05bad86dfd83fd73c51460ca2 | |
| parent | 03c71010d14d3e7f7f7940ac4c01f0fc8fe9f01b (diff) | |
Use correct kernel-patch for x86
| -rw-r--r-- | target/linux/Makefile.in.advanced | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index 2a67e2bfc..9bc2dba83 100644 --- a/target/linux/Makefile.in.advanced +++ b/target/linux/Makefile.in.advanced @@ -74,7 +74,7 @@ LINUX26_PATCH_SITE:=$(strip $(subst ",,$(BR2_KERNEL_SITE))) # ------------------------------------ # kernel patches provided by buildroot ifeq ($(strip $(LINUX26_PATCH_DIR)),) -LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches-$(LINUX26_VERSION)/ +LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches/ endif # ----------------------------------------------------------------------------- @@ -163,6 +163,10 @@ ifeq ($(LINUX26_FORMAT),custom) LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT) endif +ifeq ($(BOARD_NAME),) +BOARD_NAME=$(ARCH) +endif + ifndef LINUX26_KERNEL LINUX26_KERNEL:=$(BINARIES_DIR)/$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT) endif @@ -274,7 +278,10 @@ ifeq ($(BR2_PACKAGE_OPENSWAN),y) linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} endif ifneq ($(LINUX26_PATCH_DIR),) - toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) linux-$(LINUX26_VERSION)-\*.patch ; + if [ -d $(LINUX26_PATCH_DIR) ] ; then \ + toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) \ + linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} ; \ + fi endif touch $@ @@ -420,6 +427,7 @@ linux-status: @echo LINUX26_VERSION=$(LINUX26_VERSION) @echo LINUX26_SOURCE=$(LINUX26_SOURCE) @echo LINUX26_DIR=$(LINUX26_DIR) + @echo LINUX26_PATCH_DIR=$(LINUX26_PATCH_DIR) @echo TARGETS=$(TARGETS) @echo LINUX26_TARGETS=$(LINUX26_TARGETS) @echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR) |