mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 21:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #614 from flatcar-linux/sayan/fix-the-srctree-patch

Browse Source 
Update srctree path to correctly populate Makefile
This commit is contained in:
Marga Manterola 2020-09-25 21:08:18 +02:00 committed by GitHub
commit 40e58334af
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch vendored
View File

@ -15,15 +15,17 @@ diff --git a/Makefile b/Makefile
index 36eab48d1d4a..0514c0fa114d 100644 index 36eab48d1d4a..0514c0fa114d 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -240,7 +240,7 @@ else @@ -230,9 +230,7 @@ else
building_out_of_srctree := 1
endif endif
ifneq ($(KBUILD_ABS_SRCTREE),) -ifneq ($(KBUILD_ABS_SRCTREE),)
-srctree := $(abs_srctree) -srctree := $(abs_srctree)
-endif
+srctree := $(shell realpath --relative-to=$(KBUILD_OUTPUT) $(abs_srctree)) +srctree := $(shell realpath --relative-to=$(KBUILD_OUTPUT) $(abs_srctree))
endif
objtree := . objtree := .
-- VPATH := $(srctree)
--
2.26.2 2.26.2