r3680 - in people/waldi/kernel/source/linux-2.6/debian: arch/i386
arch/s390 arch/sparc bin
Bastian Blank
waldi at costa.debian.org
Wed Aug 3 18:12:38 UTC 2005
Author: waldi
Date: 2005-08-03 18:12:37 +0000 (Wed, 03 Aug 2005)
New Revision: 3680
Removed:
people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686
people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686-smp
people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7
people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7-smp
people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390
people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x
people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64
people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64-smp
Modified:
people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines
people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines
people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines
people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
Log:
Use only one config file per subarch.
* bin/gencontrol.py: Update.
* arch/i386/defines, arch/s390/defines, arch/sparc/defines: Move settings.
* arch/i386/defines.686, arch/i386/defines.686-smp, arch/i386/defines.k7
arch/i386/defines.k7-smp, arch/s390/defines.s390, arch/s390/defines.s390x,
arch/sparc/defines.sparc64, arch/sparc/defines.sparc64-smp: Delete.
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +1,15 @@
[DEFAULT]
suggests: lilo (>= 19.1) | grub, fdutils
+
+[686]
+class: PPro/Celeron/PII/PIII/P4
+
+[686-smp]
+class: multi-processor PPro/Celeron/PII/PIII/P4
+
+[k7]
+class: AMD Duron/Athlon/AthlonXP
+
+[k7-smp]
+class: multi-processor AMD Duron/Athlon/AthlonXP
+
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: PPro/Celeron/PII/PIII/P4
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686-smp 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.686-smp 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: multi-processor PPro/Celeron/PII/PIII/P4
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: AMD Duron/Athlon/AthlonXP
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7-smp 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/defines.k7-smp 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: multi-processor AMD Duron/Athlon/AthlonXP
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,3 +1,10 @@
[DEFAULT]
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
suggests: s390-tools
+
+[s390]
+class: IBM S/390
+
+[s390x]
+class: IBM zSeries
+
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: IBM S/390
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: IBM zSeries
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +1,9 @@
[DEFAULT]
suggests: silo, fdutils
+
+[sparc64]
+class: uniprocessor 64-bit UltraSPARC class
+
+[sparc64-smp]
+class: multi-processor 64-bit UltraSPARC class
+
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: uniprocessor 64-bit UltraSPARC class
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64-smp 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/sparc/defines.sparc64-smp 2005-08-03 18:12:37 UTC (rev 3680)
@@ -1,2 +0,0 @@
-[DEFAULT]
-class: multi-processor 64-bit UltraSPARC class
Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-03 06:15:43 UTC (rev 3679)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-03 18:12:37 UTC (rev 3680)
@@ -46,15 +46,6 @@
c.read("debian/arch/%s/%s/defines" % (arch, subarch))
return c
-def config_flavour(arch, subarch, flavour):
- c = config_subarch(arch, subarch)
- if subarch is not None:
- c.read("debian/arch/%s/%s/defines.%s" % (arch, subarch, flavour))
- else:
- c.read("debian/arch/%s/defines.%s" % (arch, flavour))
- return c
- return c
-
def list_dirs(dir):
ret = []
for i in os.listdir(dir):
@@ -303,8 +294,9 @@
i2 = arches[arch].keys()
i2.sort()
for subarch in i2:
+ subarch_config = config_subarch(arch, subarch)
subarch_vars = arch_vars.copy()
- subarch_vars.update(config_subarch(arch, subarch).defaults())
+ subarch_vars.update(subarch_config.defaults())
if subarch is not None:
subarch_vars['subarch'] = '%s-' % subarch
else:
@@ -314,7 +306,9 @@
for flavour in i3:
flavour_vars = subarch_vars.copy()
flavour_vars['flavour'] = flavour
- flavour_vars.update(config_flavour(arch, subarch, flavour).defaults())
+ try:
+ flavour_vars.update(dict(subarch_config.items(flavour)))
+ except ConfigParser.NoSectionError: pass
if not flavour_vars.has_key('class'):
flavour_vars['class'] = '%s-class' % flavour
if not flavour_vars.has_key('longclass'):
More information about the Kernel-svn-changes
mailing list