From 2465c4c2e3e454d6b2fd85698619bfeb8ea3410a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 24 Apr 2014 03:24:37 +0000 Subject: [PATCH] Reorganise sparc config files sparc/config is shared with sparc64, so move it to kernelarch-sparc/config where it will be automatically used for both of them. sparc/config.sparc64 and sparc/config.sparc64-smp are also shared, so move them to kernelarch-sparc/config-up and kernelarch-sparc/config-smp respectively. svn path=/dists/trunk/linux/; revision=21267 --- debian/config/{sparc => kernelarch-sparc}/config | 0 .../config.sparc64-smp => kernelarch-sparc/config-smp} | 0 .../{sparc/config.sparc64 => kernelarch-sparc/config-up} | 0 debian/config/sparc/defines | 6 ++++++ debian/config/sparc64/defines | 6 +++--- 5 files changed, 9 insertions(+), 3 deletions(-) rename debian/config/{sparc => kernelarch-sparc}/config (100%) rename debian/config/{sparc/config.sparc64-smp => kernelarch-sparc/config-smp} (100%) rename debian/config/{sparc/config.sparc64 => kernelarch-sparc/config-up} (100%) diff --git a/debian/config/sparc/config b/debian/config/kernelarch-sparc/config similarity index 100% rename from debian/config/sparc/config rename to debian/config/kernelarch-sparc/config diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/kernelarch-sparc/config-smp similarity index 100% rename from debian/config/sparc/config.sparc64-smp rename to debian/config/kernelarch-sparc/config-smp diff --git a/debian/config/sparc/config.sparc64 b/debian/config/kernelarch-sparc/config-up similarity index 100% rename from debian/config/sparc/config.sparc64 rename to debian/config/kernelarch-sparc/config-up diff --git a/debian/config/sparc/defines b/debian/config/sparc/defines index 117a45e56..ee452b34c 100644 --- a/debian/config/sparc/defines +++ b/debian/config/sparc/defines @@ -8,6 +8,7 @@ kernel-arch: sparc image-file: arch/sparc/boot/zImage [image] +configs: suggests: silo, fdutils install-stem: vmlinuz @@ -20,6 +21,11 @@ image-postproc: sparc32-image-postproc [sparc64_description] hardware: uniprocessor 64-bit UltraSPARC +[sparc64_image] +configs: kernelarch-sparc/config-up + [sparc64-smp_description] hardware: multiprocessor 64-bit UltraSPARC +[sparc64-smp_image] +configs: kernelarch-sparc/config-smp diff --git a/debian/config/sparc64/defines b/debian/config/sparc64/defines index d6ea29521..607a267e3 100644 --- a/debian/config/sparc64/defines +++ b/debian/config/sparc64/defines @@ -8,7 +8,7 @@ kernel-arch: sparc image-file: arch/sparc/boot/zImage [image] -configs: sparc/config +configs: suggests: silo, fdutils install-stem: vmlinuz @@ -16,10 +16,10 @@ install-stem: vmlinuz hardware: uniprocessor 64-bit UltraSPARC [sparc64_image] -configs: sparc/config.sparc64 +configs: kernelarch-sparc/config-up [sparc64-smp_description] hardware: multiprocessor 64-bit UltraSPARC [sparc64-smp_image] -configs: sparc/config.sparc64-smp +configs: kernelarch-sparc/config-smp