From 21d9029e278e2dc9128b5afb6ba7acbb21c645ea Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 18 May 2016 04:12:44 +0100
Subject: [PATCH] [x86] Rename config-arch-{32,64} to default per-arch
 filenames

Since we no longer build an amd64 flavour on i386, there's no reason
to keep these files under kernelarch-x86.
---
 .../{kernelarch-x86/config-arch-64 => amd64/config}   |  0
 debian/config/amd64/defines                           |  5 -----
 .../{kernelarch-x86/config-arch-32 => i386/config}    |  0
 debian/config/i386/defines                            | 11 -----------
 4 files changed, 16 deletions(-)
 rename debian/config/{kernelarch-x86/config-arch-64 => amd64/config} (100%)
 rename debian/config/{kernelarch-x86/config-arch-32 => i386/config} (100%)

diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/amd64/config
similarity index 100%
rename from debian/config/kernelarch-x86/config-arch-64
rename to debian/config/amd64/config
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 9a3ed7f30..f3c287657 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -11,7 +11,6 @@ vdso: true
 
 [image]
 bootloaders: grub-pc grub-efi extlinux
-configs:
 install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
@@ -21,7 +20,3 @@ headers%gcc-5: linux-compiler-gcc-5-x86
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
-
-[amd64_image]
-configs:
- kernelarch-x86/config-arch-64
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/i386/config
similarity index 100%
rename from debian/config/kernelarch-x86/config-arch-32
rename to debian/config/i386/config
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index b4c62fba2..414dbaebf 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -16,7 +16,6 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
 
 [image]
 bootloaders: grub-pc extlinux
-configs:
 install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
@@ -27,11 +26,6 @@ headers%gcc-5: linux-compiler-gcc-5-x86
 hardware: older PCs
 hardware-long: PCs with one or more processors not supporting PAE
 
-[686_image]
-configs:
- kernelarch-x86/config-arch-32
- i386/config.686
-
 [686-pae_build]
 debug-info: true
 
@@ -39,8 +33,3 @@ debug-info: true
 hardware: modern PCs
 hardware-long: PCs with one or more processors supporting PAE
 parts: pae
-
-[686-pae_image]
-configs:
- kernelarch-x86/config-arch-32
- i386/config.686-pae