Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Rebase 4.19.109 patches onto 4.19.111 #395

Merged
merged 3 commits into from
Mar 19, 2020
Merged

Rebase 4.19.109 patches onto 4.19.111 #395

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ac00d9
kbuild: derive relative path for KBUILD_SRC from CURDIR
Nov 25, 2015
eafde63
tools/objtool/Makefile: Don't fail on fallthrough with new GCCs
dm0- Feb 9, 2018
7a2549b
net/netfilter: add nf_conntrack_ipv4 compat module for kube-proxy
bgilbert Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
kbuild: derive relative path for KBUILD_SRC from CURDIR 
This enables relocating source and build trees to different roots,
provided they stay reachable relative to one another.  Useful for
builds done within a sandbox where the eventual root is prefixed
by some undesirable path component.
  • Loading branch information
Vito Caputo authored and Jenkins OS committed Mar 18, 2020
commit 2ac00d9446a5a313c90e3c26c409f83fcdf1bcce
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

# Invoke a second make in the output directory, passing relevant variables
sub-make:
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) \
KBUILD_SRC=$(shell realpath --relative-to=$(KBUILD_OUTPUT) $(CURDIR)) \
-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))

# Leave processing to above invocation of make
Expand Down