[kernel] r16791 - in dists/sid/linux-2.6/debian: . patches/bugfix/powerpc patches/series

[Ben Hutchings]

Author: benh
Date: Sun Jan  9 00:31:44 2011
New Revision: 16791

Log:
[powerpc] Restore device tree source files to linux-image packages (Closes: #609155)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/powerpc-boot-dts-Install-dts-from-the-right-directory.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Jan  8 01:44:36 2011	(r16790)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jan  9 00:31:44 2011	(r16791)
@@ -33,6 +33,8 @@
     - hvc_console: Fix race between hvc_close and hvc_remove (CVE-2010-2653)
       (previously applied as an isolated fix in 2.6.32-25)
     - fuse/cuse: Verify ioctl retries (CVE-2010-4650)
+  * [powerpc] Restore device tree source files to linux-image packages
+    (Closes: #609155)
 
   [ maximilian attems ]
   * [openvz] Reenable NF_CONNTRACK_IPV6. (closes: #580507)

Added: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/powerpc-boot-dts-Install-dts-from-the-right-directory.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/powerpc-boot-dts-Install-dts-from-the-right-directory.patch	Sun Jan  9 00:31:44 2011	(r16791)
@@ -0,0 +1,31 @@
+From ed545706fe3c6ad232ba5f3b01c1121451300ca9 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 9 Jan 2011 00:14:14 +0000
+Subject: [PATCH 1/2] powerpc/boot/dts: Install dts from the right directory
+
+The dts-installed variable is initialised using a wildcard path that
+will be expanded relative to the build directory.  Use the existing
+variable dtstree to generate an absolute wildcard path that will work
+when building in a separate directory.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/powerpc/boot/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
+index 96deec6..8917816 100644
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -368,7 +368,7 @@ INSTALL := install
+ extra-installed		:= $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y))
+ hostprogs-installed	:= $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs-y))
+ wrapper-installed	:= $(DESTDIR)$(WRAPPER_BINDIR)/wrapper
+-dts-installed		:= $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(obj)/dts/*.dts))
++dts-installed		:= $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(dtstree)/*.dts))
+ 
+ all-installed		:= $(extra-installed) $(hostprogs-installed) $(wrapper-installed) $(dts-installed)
+ 
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Sat Jan  8 01:44:36 2011	(r16790)
+++ dists/sid/linux-2.6/debian/patches/series/30	Sun Jan  9 00:31:44 2011	(r16791)
@@ -39,3 +39,4 @@
 + debian/revert-most-of-block-deprecate-queue_flag_cluster.patch
 + bugfix/all/af_unix-limit-unix_tot_inflight.patch
 + bugfix/all/scm-lower-SCM_MAX_FD.patch
++ bugfix/powerpc/powerpc-boot-dts-Install-dts-from-the-right-directory.patch