Skip to content

Commit b32a937

Browse files
committed
Merge pull request #108 from funman/odroidxu3-3.10.y
backports: Fix out of tree build
2 parents 8e27b79 + a0eb449 commit b32a937

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Diff for: arch/arm/configs/odroidxu3_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4243,7 +4243,7 @@ CONFIG_AVERAGE=y
42434243
CONFIG_OID_REGISTRY=m
42444244
# CONFIG_VIRTUALIZATION is not set
42454245
CONFIG_BACKPORT_INTEGRATE=y
4246-
CONFIG_BACKPORT_DIR="backports/"
4246+
CONFIG_BACKPORT_DIR="backports"
42474247
CONFIG_BACKPORT_VERSION="backports-20150222-0-g2745ccd"
42484248
CONFIG_BACKPORT_KERNEL_VERSION="next-20150222-0-g53e418f1"
42494249
CONFIG_BACKPORT_KERNEL_NAME="Linux"

Diff for: backports/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config BACKPORT_INTEGRATE
44

55
config BACKPORT_DIR
66
string
7-
default "backports/"
7+
default "backports"
88

99
config BACKPORT_VERSION
1010
string

Diff for: backports/Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ NOSTDINC_FLAGS := \
1919

2020
export backport_srctree = $(M)
2121
else
22-
export BACKPORT_DIR = backports/
22+
ifneq ($(KBUILD_SRC),)
23+
ifneq ($(wildcard $(KBUILD_SRC)/$(src)),)
24+
TOP_KBUILD_SRC := $(KBUILD_SRC)/
25+
endif
26+
endif
27+
export BACKPORT_DIR = $(TOP_KBUILD_SRC)backports
2328
export backport_srctree = $(BACKPORT_DIR)
2429
NOSTDINC_FLAGS := \
2530
-I$(BACKPORT_DIR)/backport-include/ \

0 commit comments

Comments
 (0)