From 53f64abfb91688c66fd09e3f6f7ec69b7700016c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Thu, 9 Apr 2015 16:09:28 +0200 Subject: [PATCH 1/2] Fix dtb build Complements change in 608ed9a646a9ca94624f0d5897a4b6531b5edcac --- arch/arm/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2caae284ae4c19..7f868f00283620 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -299,10 +299,7 @@ zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ %.dtb: scripts - $(Q)$(MAKE) $(build)=$(subst $(wildcard $(srctree)//),,$(subst $(join /,$(subst dtb,dts,$@)),,$(firstword $(wildcard $(srctree)/$(boot)/dts/amlogic/$(subst dtb,dts,$@) $(srctree)/$(CUSTOMER_DIR_NAME)/meson/dt/$(subst dtb,dts,$@))))) \ - MACHINE=$(MACHINE) \ - $(subst $(wildcard $(srctree)//),,$(subst .dts,.dtb,$(firstword $(wildcard $(srctree)/$(boot)/dts/amlogic/$(subst dtb,dts,$@) $(srctree)/$(CUSTOMER_DIR_NAME)/meson/dt/$(subst dtb,dts,$@))))) - rm $(firstword $(wildcard $(srctree)/$(boot)/dts/amlogic/$(subst dtb,dts,$@) $(srctree)/$(CUSTOMER_DIR_NAME)/meson/dt/$(subst dtb,dts,$@))) + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ dtbs: scripts $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs From 39deb424805a5e6d6ad167eddb6b0ef5c12fd2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Thu, 9 Apr 2015 16:09:54 +0200 Subject: [PATCH 2/2] Fix typo in BACKPORT_DIR resulting in an infinite make loop --- backports/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backports/Kconfig b/backports/Kconfig index b952261caade8c..19c0afb949ad1f 100644 --- 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