From c76adea026614096bc69eee44ffb81777083522f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 16 May 2013 04:49:51 +0000 Subject: [PATCH] [powerpcspe] Prevent building uImage with missing mkimage, thanks to Roland Stigge (Closes: #708094) svn path=/dists/trunk/linux/; revision=20121 --- debian/changelog | 2 + .../debian/powerpcspe-omit-uimage.patch | 44 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+) create mode 100644 debian/patches/debian/powerpcspe-omit-uimage.patch diff --git a/debian/changelog b/debian/changelog index 530b912a0..3a2a75a8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ linux (3.9.2-1~experimental.1) UNRELEASED; urgency=low (Closes: #707676) * README.Debian: Correct reference to Berkeley Database development package * aufs: Update to aufs3.9-20130506 + * [powerpcspe] Prevent building uImage with missing mkimage, thanks to + Roland Stigge (Closes: #708094) -- Ben Hutchings Mon, 06 May 2013 13:17:52 +0100 diff --git a/debian/patches/debian/powerpcspe-omit-uimage.patch b/debian/patches/debian/powerpcspe-omit-uimage.patch new file mode 100644 index 000000000..5a96c7363 --- /dev/null +++ b/debian/patches/debian/powerpcspe-omit-uimage.patch @@ -0,0 +1,44 @@ +Description: Prevent building uImage with missing mkimage + On some powerpc platforms, CONFIG_DEFAULT_UIMAGE is selected automatically, + which leads to uImage being built automatically with mkimage. This tool is not + available in linux's build-dependencies, and the file is not strictly + necessary, so we are omitting this step in the build process, Debian-specific. +Author: Roland Stigge +Bug-Debian: http://bugs.debian.org/708094 + +Index: linux-3.8.12/arch/powerpc/boot/Makefile +=================================================================== +--- linux-3.8.12.orig/arch/powerpc/boot/Makefile 2013-05-13 21:05:41.000000000 +0200 ++++ linux-3.8.12/arch/powerpc/boot/Makefile 2013-05-14 07:48:26.434286772 +0200 +@@ -204,7 +204,6 @@ + image-$(CONFIG_PPC_PMAC) += zImage.pmac + image-$(CONFIG_PPC_HOLLY) += dtbImage.holly + image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800 +-image-$(CONFIG_DEFAULT_UIMAGE) += uImage + image-$(CONFIG_EPAPR_BOOT) += zImage.epapr + + # +@@ -262,23 +261,6 @@ + image-$(CONFIG_MPC836x_MDS) += cuImage.mpc836x_mds + image-$(CONFIG_ASP834x) += dtbImage.asp834x-redboot + +-# Board ports in arch/powerpc/platform/85xx/Kconfig +-image-$(CONFIG_MPC8540_ADS) += cuImage.mpc8540ads +-image-$(CONFIG_MPC8560_ADS) += cuImage.mpc8560ads +-image-$(CONFIG_MPC85xx_CDS) += cuImage.mpc8541cds \ +- cuImage.mpc8548cds_32b \ +- cuImage.mpc8555cds +-image-$(CONFIG_MPC85xx_MDS) += cuImage.mpc8568mds +-image-$(CONFIG_MPC85xx_DS) += cuImage.mpc8544ds \ +- cuImage.mpc8572ds +-image-$(CONFIG_TQM8540) += cuImage.tqm8540 +-image-$(CONFIG_TQM8541) += cuImage.tqm8541 +-image-$(CONFIG_TQM8548) += cuImage.tqm8548 +-image-$(CONFIG_TQM8555) += cuImage.tqm8555 +-image-$(CONFIG_TQM8560) += cuImage.tqm8560 +-image-$(CONFIG_SBC8548) += cuImage.sbc8548 +-image-$(CONFIG_KSI8560) += cuImage.ksi8560 +- + # Board ports in arch/powerpc/platform/embedded6xx/Kconfig + image-$(CONFIG_STORCENTER) += cuImage.storcenter + image-$(CONFIG_MPC7448HPC2) += cuImage.mpc7448hpc2 diff --git a/debian/patches/series b/debian/patches/series index e7df6f19c..b36d26e97 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -77,3 +77,4 @@ features/all/alx/alx-update-for-3.8.patch debian/efi-autoload-efivars.patch debian/efivars-remove-check-for-50-full-on-write.patch debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch +debian/powerpcspe-omit-uimage.patch