diff --git a/debian/changelog b/debian/changelog index c1a2f7e19..79729d717 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.3~rc3-1~exp2) UNRELEASED; urgency=medium + + * [armhf] dts: Fix Makefile target for sun4i-a10-itead-iteaduino-plus + (fixes FTBFS) + + -- Ben Hutchings Tue, 06 Oct 2015 00:01:29 +0100 + linux (4.3~rc3-1~exp1) experimental; urgency=medium * New upstream release candidate diff --git a/debian/patches/bugfix/arm/arm-dts-fix-makefile-target-for-sun4i-a10-itead-itea.patch b/debian/patches/bugfix/arm/arm-dts-fix-makefile-target-for-sun4i-a10-itead-itea.patch new file mode 100644 index 000000000..6ce40351b --- /dev/null +++ b/debian/patches/bugfix/arm/arm-dts-fix-makefile-target-for-sun4i-a10-itead-itea.patch @@ -0,0 +1,35 @@ +From: Josh Boyer +Date: Fri, 4 Sep 2015 08:49:34 -0400 +Subject: ARM: dts: Fix Makefile target for sun4i-a10-itead-iteaduino-plus +Origin: https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git//commit?id=f594297830b29c8204c421fafe66001178ac0f9a + +Commit 79ae3e66f8d (ARM: dts: sun4i: Add Iteaduino Plus A10) added a new +make target for the sun4i-a10-itead-iteaduino-plus dts file, but mistakenly +used .dts instead of the correct .dtb suffix. This resulted in a build error +like: + + scripts/Makefile.dtbinst:42: target 'sun4i-a10-itead-iteaduino-plus.dts' doesn't match the target pattern + +when doing a make dtbs_install. + +Fix it to use the proper file name. + +Signed-off-by: Josh Boyer +Signed-off-by: Maxime Ripard +--- + arch/arm/boot/dts/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 233159d..bb8fa02 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -578,7 +578,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ + sun4i-a10-hackberry.dtb \ + sun4i-a10-hyundai-a7hd.dtb \ + sun4i-a10-inet97fv2.dtb \ +- sun4i-a10-itead-iteaduino-plus.dts \ ++ sun4i-a10-itead-iteaduino-plus.dtb \ + sun4i-a10-jesurun-q5.dtb \ + sun4i-a10-marsboard.dtb \ + sun4i-a10-mini-xplus.dtb \ diff --git a/debian/patches/series b/debian/patches/series index b02bbe401..9a043fefe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -82,3 +82,4 @@ features/all/grsecurity/grsecurity-kconfig.patch features/all/grsecurity/grkernsec_perf_harden.patch bugfix/all/media-uvcvideo-disable-hardware-timestamps-by-defaul.patch +bugfix/arm/arm-dts-fix-makefile-target-for-sun4i-a10-itead-itea.patch