[kernel] r20121 - in dists/trunk/linux/debian: . patches patches/debian

[Ben Hutchings]

Author: benh
Date: Thu May 16 04:49:51 2013
New Revision: 20121

Log:
[powerpcspe] Prevent building uImage with missing mkimage, thanks to Roland Stigge (Closes: #708094)

Added:
   dists/trunk/linux/debian/patches/debian/powerpcspe-omit-uimage.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Thu May 16 02:53:55 2013	(r20120)
+++ dists/trunk/linux/debian/changelog	Thu May 16 04:49:51 2013	(r20121)
@@ -14,6 +14,8 @@
     (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 <ben at decadent.org.uk>  Mon, 06 May 2013 13:17:52 +0100
 

Added: dists/trunk/linux/debian/patches/debian/powerpcspe-omit-uimage.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/debian/powerpcspe-omit-uimage.patch	Thu May 16 04:49:51 2013	(r20121)
@@ -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 <stigge at antcom.de>
+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

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Thu May 16 02:53:55 2013	(r20120)
+++ dists/trunk/linux/debian/patches/series	Thu May 16 04:49:51 2013	(r20121)
@@ -77,3 +77,4 @@
 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