aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2014-04-24 02:46:03 +0000
committerBen Hutchings <benh@debian.org>2014-04-24 02:46:03 +0000
commitbeca0a507ffce13f067ea6be3b99f9b4db6a9a92 (patch)
tree907a68ac2415e8a6ff37b954d40ef0a6b8eb3066
parent8bb368ac237aa82cd2230a490342b046139f7343 (diff)
downloadkernel_replicant_linux-beca0a507ffce13f067ea6be3b99f9b4db6a9a92.tar.gz
kernel_replicant_linux-beca0a507ffce13f067ea6be3b99f9b4db6a9a92.tar.bz2
kernel_replicant_linux-beca0a507ffce13f067ea6be3b99f9b4db6a9a92.zip
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
-rw-r--r--debian/config/kernelarch-powerpc/config (renamed from debian/config/powerpc/config)0
-rw-r--r--debian/config/kernelarch-powerpc/config-arch-64 (renamed from debian/config/powerpc/config.powerpc64)0
-rw-r--r--debian/config/powerpc/defines4
-rw-r--r--debian/config/powerpcspe/config (renamed from debian/config/powerpcspe/config.powerpcspe)0
-rw-r--r--debian/config/powerpcspe/defines1
-rw-r--r--debian/config/ppc64/defines4
6 files changed, 6 insertions, 3 deletions
diff --git a/debian/config/powerpc/config b/debian/config/kernelarch-powerpc/config
index 89b83f1853bb..89b83f1853bb 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/kernelarch-powerpc/config-arch-64
index 269ddb03c820..269ddb03c820 100644
--- a/debian/config/powerpc/config.powerpc64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
diff --git a/debian/config/powerpc/defines b/debian/config/powerpc/defines
index 082eeff25539..a11a3366d450 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
index 35aa5d46c3e8..35aa5d46c3e8 100644
--- a/debian/config/powerpcspe/config.powerpcspe
+++ b/debian/config/powerpcspe/config
diff --git a/debian/config/powerpcspe/defines b/debian/config/powerpcspe/defines
index cf5a09338bd4..667efcffff77 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 0f729d890d7a..85a9038a572d 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