From beca0a507ffce13f067ea6be3b99f9b4db6a9a92 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Thu, 24 Apr 2014 02:46:03 +0000
Subject: [PATCH] Reorganise common powerpc config files

powerpc/config is shared by powerpc, powerpcspe and ppc64, so move
it to kernelarch-powerpc/config where it will be automatically used
for all of them.

powerpc/config.powerpc64 is also used by ppc64, so move it to
kernelarch-powerpc/config-arch-64.

powerpcspe has only one flavour, so rename its config file to config.

svn path=/dists/trunk/linux/; revision=21265
---
 debian/config/{powerpc => kernelarch-powerpc}/config          | 0
 .../config.powerpc64 => kernelarch-powerpc/config-arch-64}    | 0
 debian/config/powerpc/defines                                 | 4 ++++
 debian/config/powerpcspe/{config.powerpcspe => config}        | 0
 debian/config/powerpcspe/defines                              | 1 -
 debian/config/ppc64/defines                                   | 4 ++--
 6 files changed, 6 insertions(+), 3 deletions(-)
 rename debian/config/{powerpc => kernelarch-powerpc}/config (100%)
 rename debian/config/{powerpc/config.powerpc64 => kernelarch-powerpc/config-arch-64} (100%)
 rename debian/config/powerpcspe/{config.powerpcspe => config} (100%)

diff --git a/debian/config/powerpc/config b/debian/config/kernelarch-powerpc/config
similarity index 100%
rename from debian/config/powerpc/config
rename to debian/config/kernelarch-powerpc/config
diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/kernelarch-powerpc/config-arch-64
similarity index 100%
rename from debian/config/powerpc/config.powerpc64
rename to debian/config/kernelarch-powerpc/config-arch-64
diff --git a/debian/config/powerpc/defines b/debian/config/powerpc/defines
index 082eeff25..a11a3366d 100644
--- a/debian/config/powerpc/defines
+++ b/debian/config/powerpc/defines
@@ -9,6 +9,7 @@ kernel-arch: powerpc
 image-file: vmlinux
 
 [image]
+configs:
 suggests: mkvmlinuz
 install-stem: vmlinux
 
@@ -23,3 +24,6 @@ configs: powerpc/config.powerpc powerpc/config.powerpc-smp
 
 [powerpc64_description]
 hardware: 64-bit PowerPC
+
+[powerpc64_image]
+configs: kernelarch-powerpc/config-arch-64
diff --git a/debian/config/powerpcspe/config.powerpcspe b/debian/config/powerpcspe/config
similarity index 100%
rename from debian/config/powerpcspe/config.powerpcspe
rename to debian/config/powerpcspe/config
diff --git a/debian/config/powerpcspe/defines b/debian/config/powerpcspe/defines
index cf5a09338..667efcfff 100644
--- a/debian/config/powerpcspe/defines
+++ b/debian/config/powerpcspe/defines
@@ -8,7 +8,6 @@ image-file: vmlinux
 
 [image]
 suggests: mkvmlinuz
-configs: powerpc/config powerpcspe/config.powerpcspe
 install-stem: vmlinux
 
 [description]
diff --git a/debian/config/ppc64/defines b/debian/config/ppc64/defines
index 0f729d890..85a9038a5 100644
--- a/debian/config/ppc64/defines
+++ b/debian/config/ppc64/defines
@@ -7,7 +7,7 @@ kernel-arch: powerpc
 image-file: vmlinux
 
 [image]
-configs: powerpc/config
+configs:
 suggests: mkvmlinuz
 install-stem: vmlinux
 
@@ -15,4 +15,4 @@ install-stem: vmlinux
 hardware: 64-bit PowerPC
 
 [powerpc64_image]
-configs: powerpc/config.powerpc64
+configs: kernelarch-powerpc/config-arch-64