From 05d36f23b0e3bfbb06f93b11d60ce93371fe3ff2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 16 Jul 2018 01:41:49 +0100 Subject: [PATCH] Update to 4.18-rc5 --- debian/changelog | 4 +++- ...include-addtree-remove-quotes-before-matching-path.patch | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 799cb04d6..15993428e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -linux (4.18~rc4-1~exp2) UNRELEASED; urgency=medium +linux (4.18~rc5-1~exp1) UNRELEASED; urgency=medium + + * New upstream release candidate [ John Paul Adrian Glaubitz ] * [m68k] net: Enable CONFIG_XSURF100 as module. diff --git a/debian/patches/bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch b/debian/patches/bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch index df7a86051..a6ebb2343 100644 --- a/debian/patches/bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch +++ b/debian/patches/bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch @@ -29,12 +29,12 @@ Signed-off-by: Ben Hutchings --- --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include -@@ -207,7 +207,7 @@ hdr-inst := -f $(srctree)/scripts/Makefi +@@ -215,7 +215,7 @@ hdr-inst := -f $(srctree)/scripts/Makefi # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \ --$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1))) -+$(if $(filter-out -I/% -I./% -I../%,$(subst $(quote),,$(subst $(squote),,$(1)))),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1))) +-$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1)) ++$(if $(filter-out -I/% -I./% -I../%,$(subst $(quote),,$(subst $(squote),,$(1)))),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1)) # Find all -I options and call addtree flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))