Merge pull request #108 from funman/odroidxu3-3.10.y

backports: Fix out of tree build
hardkernel · Jun 3, 2015 · b32a937 · b32a937
2 parents 8e27b79 + a0eb449
commit b32a937
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/arch/arm/configs/odroidxu3_defconfig b/arch/arm/configs/odroidxu3_defconfig
@@ -4243,7 +4243,7 @@ CONFIG_AVERAGE=y
 CONFIG_OID_REGISTRY=m
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_BACKPORT_INTEGRATE=y
-CONFIG_BACKPORT_DIR="backports/"
+CONFIG_BACKPORT_DIR="backports"
 CONFIG_BACKPORT_VERSION="backports-20150222-0-g2745ccd"
 CONFIG_BACKPORT_KERNEL_VERSION="next-20150222-0-g53e418f1"
 CONFIG_BACKPORT_KERNEL_NAME="Linux"

diff --git a/backports/Kconfig b/backports/Kconfig
@@ -4,7 +4,7 @@ config BACKPORT_INTEGRATE
 
 config BACKPORT_DIR
  string
- default "backports/"
+ default "backports"
 
 config BACKPORT_VERSION
  string

diff --git a/backports/Makefile b/backports/Makefile
@@ -19,7 +19,12 @@ NOSTDINC_FLAGS := \
 
 export backport_srctree = $(M)
 else
-export BACKPORT_DIR = backports/
+ifneq ($(KBUILD_SRC),)
+ ifneq ($(wildcard $(KBUILD_SRC)/$(src)),)
+ TOP_KBUILD_SRC := $(KBUILD_SRC)/
+ endif
+endif
+export BACKPORT_DIR = $(TOP_KBUILD_SRC)backports
 export backport_srctree = $(BACKPORT_DIR)
 NOSTDINC_FLAGS := \
  -I$(BACKPORT_DIR)/backport-include/ \