Commit Graph

26 Commits

Author SHA1 Message Date
Bastian Blank 61c4bbd140 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=7262
2006-08-29 09:53:31 +00:00
Bastian Blank a11aeb9adf debian/arch/amd64/defines, debian/arch/i386/defines,
debian/arch/powerpc/defines, debian/arch/s390/defines: Reenable vserver.

svn path=/dists/trunk/linux-2.6/; revision=6838
2006-06-20 12:44:49 +00:00
Frederik Schüler 7d0e6a0797 Remove amd64-generic flavour
svn path=/dists/trunk/linux-2.6/; revision=6821
2006-06-18 19:54:24 +00:00
Frederik Schüler 3e6fafbd27 Use gcc-4.1 for amd64 too.
svn path=/dists/trunk/linux-2.6/; revision=6803
2006-06-14 15:24:37 +00:00
Frederik Schüler ba8a8dcf45 Update trunk to 2.6.17-rc3.
Clean up and merge series files.
Swich from HZ_1000 to HZ_250

svn path=/dists/trunk/linux-2.6/; revision=6499
2006-04-30 14:15:23 +00:00
Bastian Blank 4027080008 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6490
2006-04-28 22:01:54 +00:00
Bastian Blank 5151ffc57c Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6272
2006-03-23 20:40:54 +00:00
Bastian Blank c45d57e65b debian/arch/amd64/defines: Enable xen-vserver subarch.
svn path=/dists/trunk/linux-2.6/; revision=6207
2006-03-17 23:06:31 +00:00
Bastian Blank bc24c34129 * debian/arch/amd64/defines,
debian/arch/i386/defines: Reenable xen.
* debian/patches/series/0experimental.1-extra
  - Use new xen patch.
  - Use wildcards.
* debian/patches/xen-tree-merge-21940.patch,
  debian/patches/xen-tree-merge-21966-update.patch: Remove.
* debian/patches/xen-tree-merge-21966.patch: Add.

svn path=/dists/trunk/linux-2.6/; revision=6197
2006-03-17 20:46:01 +00:00
Bastian Blank 70667db083 * debian/arch/amd64/defines, debian/arch/i386/defines,
debian/arch/powerpc/defines: Reenable vserver.
* debian/patches/series/0experimental.1-extra
  - Use new vserver patch.
  - Use wildcards.
* debian/patches/vserver-vs2.0.2-rc10.patch: Remove.
* debian/patches/vserver-vs2.0.2-rc12.patch: Add.

svn path=/dists/trunk/linux-2.6/; revision=6180
2006-03-13 13:23:26 +00:00
Bastian Blank b3604e9de8 Switch to 2.6.16-rc6.
* debian/arch/amd64/defines, debian/arch/i386/defines,
  debian/arch/powerpc/defines: Disable vserver and xen.
* debian/changelog: Update.
* debian/patches/series/0experimental.1
  - Remove patches marked as merged.
  - Disable patches which seems to be merged.
  - Move unmerged patches from 0experimental.2.
* debian/patches/series/0experimental.2,
  debian/patches/series/0experimental.2-extra: Remove.

svn path=/dists/trunk/linux-2.6/; revision=6179
2006-03-13 12:59:02 +00:00
Bastian Blank 75ae31cbda * debian/arch/amd64/defines, debian/arch/i386/defines:
Enable xen.
* debian/arch/i386/xen/config: Add.

svn path=/dists/trunk/linux-2.6/; revision=6037
2006-03-02 22:36:27 +00:00
Bastian Blank 333210a7a7 r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
  Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
  debian/templates/control.headers.in,
  debian/templates/control.headers.latest.in,
  debian/templates/control.headers.subarch.in,
  debian/templates/control.image.in,
  debian/templates/control.image.latest.in:
  Use upstreamversion and localversion substitutions.

r6006:  waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
  - Use SOURCEVERSION.
  - Fix another brocken ABINAME usage.

r6007:  waldi | 2006-03-02 11:41:01 +0100
* debian/arch/defines, debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/arm/defines, debian/arch/armeb/defines, debian/arch/hppa/defines,
  debian/arch/i386/defines, debian/arch/ia64/defines, debian/arch/m68k/defines,
  debian/arch/mips/defines, debian/arch/mipsel/defines,
  debian/arch/powerpc/defines, debian/arch/s390/defines,
  debian/arch/sparc/defines: Move image specific specs into image section.
* debian/bin/gencontrol.py: Use image section if neccesary.
* debian/lib/python/debian_linux/gencontrol.py: Support image section.

r6008:  waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.

r6009:  waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.

r6010:  waldi | 2006-03-02 12:42:47 +0100
* debian/arch/defines: Add initramfs-generator relations.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/arm/defines, debian/arch/armeb/defines, debian/arch/hppa/defines,
  debian/arch/i386/defines, debian/arch/ia64/defines, debian/arch/m68k/defines,
  debian/arch/mips/defines, debian/arch/mipsel/defines,
  debian/arch/powerpc/defines, debian/arch/powerpc/vserver/defines,
  debian/arch/s390/defines, debian/arch/sparc/defines:
  Specify initramfs settings.
* debian/bin/gencontrol.py: Generate dependencies for initramfs generators.
* debian/lib/python/debian_linux/config.py: Add more fields.
* debian/lib/python/debian_linux/gencontrol.py: Fix.
* debian/rules.real: Use INITRAMFS.

r6011:  waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.

r6012:  waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.

r6013:  waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.

r6014:  waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
  Remove another usage of the image config sections.

r6030:  waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.

svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
Bastian Blank 36f10251a9 * debian/arch/amd64/defines, debian/arch/i386/defines,
debian/arch/powerpc/defines: Reenable vserver.
* debian/patches/series/0experimental.1-extra: Update.
* debian/patches/vserver-vs2.0.2-rc10.patch: Add.
* debian/patches/vserver-vs2.0.2-rc9.patch: Remove.

svn path=/dists/trunk/linux-2.6/; revision=5994
2006-02-28 16:47:12 +00:00
Bastian Blank f6cf7c4990 * debian/arch/amd64/defines, debian/arch/i386/defines,
debian/arch/powerpc/defines: Temporarily disable vserver.
* debian/patches/series/0experimental.1: Remove merged patch.
* debian/patches/arm-nslu2-beeper.patch: Remove.

svn path=/dists/trunk/linux-2.6/; revision=5975
2006-02-27 12:59:19 +00:00
Bastian Blank 6c66903823 Add vserver images to amd64, i386 and powerpc.
r216@waldi:  waldi | 2006-01-06 23:14:47 +0000
* debian/arch/powerpc/defines: Add vserver subarch.
* debian/arch/powerpc/vserver: New directory.
* debian/arch/powerpc/vserver/config, debian/arch/powerpc/vserver/config.powerpc64,
  debian/arch/powerpc/vserver/defines: Add.

r221@waldi:  waldi | 2006-01-07 00:23:28 +0000
* debian/arch/i386/defines: Add vserver subarch.
* debian/arch/i386/vserver: New directory.
* debian/arch/i386/vserver/config, debian/arch/i386/vserver/config.686,
  debian/arch/i386/vserver/config.k7, debian/arch/i386/vserver/defines: Add.

r222@waldi:  waldi | 2006-01-07 00:31:20 +0000
* debian/arch/amd64/defines: Add vserver subarch.
* debian/arch/amd64/vserver: New directory.
* debian/arch/amd64/vserver/config, debian/arch/amd64/vserver/config.amd64-k8
  debian/arch/amd64/vserver/defines: Add.

r1486@waldi:  waldi | 2006-02-21 13:26:15 +0000
* debian/patches/series/0experimental.1-extra: Update.
* debian/patches/vserver-vs2.0.2-rc6.patch,
  debian/patches/vserver-vs2.1.1-rc7.patch: Add.

r1489@waldi:  waldi | 2006-02-21 13:28:36 +0000
debian/arch/powerpc/vserver/config: Fix for unstable vserver.

r1490@waldi:  waldi | 2006-02-21 13:29:13 +0000
debian/arch/powerpc/vserver/defines: Add powerpc image.

r1491@waldi:  waldi | 2006-02-21 13:29:42 +0000
* debian/arch/powerpc/vserver/config.powerpc: Add.
* debian/arch/powerpc/vserver/config.powerpc64: Replace link.

r1492@waldi:  waldi | 2006-02-21 14:13:29 +0000
* debian/arch/i386/vserver/config: Fix.
* debian/arch/i386/vserver/config.686, debian/arch/i386/vserver/config.k7:
  Replace link.

r1493@waldi:  waldi | 2006-02-21 14:16:53 +0000
* debian/arch/amd64/vserver/config: Fix.
* debian/arch/amd64/vserver/config.amd64-k8: Replace link.
* debian/arch/amd64/vserver/config.em64t-p4: Add.
* debian/arch/amd64/vserver/defines: Enable em64t-p4.

r1495@waldi:  waldi | 2006-02-21 14:42:01 +0000
* debian/patches/series/0experimental.1-extra: Update.
* debian/patches/vserver-powerpc-fix01.patch: Add.

svn path=/dists/trunk/linux-2.6/; revision=5956
2006-02-21 15:02:47 +00:00
maximilian attems 3ab59bc347 change the suggests as discussed
svn path=/dists/trunk/linux-2.6/; revision=5653
2006-01-31 20:26:23 +00:00
maximilian attems 315a3ce50a amd64, i386, hppa and sparc go for i-t
svn path=/dists/trunk/linux-2.6/; revision=5383
2006-01-09 22:24:36 +00:00
Frederik Schüler de49dda1c2 Fix linux-headers build fix
svn path=/dists/trunk/linux-2.6/; revision=4689
2005-10-30 14:40:05 +00:00
Frederik Schüler 2dd7e60802 add kernel-header-dirs: x86_64 generic to fix amd64 linux-headers.
svn path=/dists/trunk/linux-2.6/; revision=4688
2005-10-30 12:13:55 +00:00
Frederik Schüler 83aec63d36 Set proper kernel-arch
svn path=/dists/trunk/linux-2.6/; revision=4182
2005-09-13 14:57:03 +00:00
Andres Salomon 181dfce657 ugh. conflicts galore.. suck.
svn path=/dists/trunk/linux-2.6/; revision=4171
2005-09-12 03:48:11 +00:00
Frederik Schüler 1e22609a36 First shot of 2.6.13 options for amd64, touching other arches too.
We might need to discuss the one or other global option, especially if we 
want to enable TPM or not.

svn path=/dists/trunk/linux-2.6/; revision=4166
2005-09-10 18:21:40 +00:00
Frederik Schüler 58f7efa296 Add some reasonable class and longclass descriptions for the amd64 flavours.
svn path=/dists/trunk/linux-2.6/; revision=4161
2005-09-09 18:16:30 +00:00
Bastian Blank 87d00b6d95 * Add more strict dependency between the headers packages.
* Use own config to define arches, subarches and flavours.
* Aggregate ATM options.
* Add kernel config for s390 tape image.
* Fix subarch setting for sparc.

r3970: waldi | 2005-08-18 17:58:13 +0000
debian/templates/control.headers.in: Add more strict dependency.

r3971: waldi | 2005-08-18 18:02:08 +0000
Use own config to define arches, subarches and flavours.

* debian/arch/defines: Include architecture definitions.
* debian/arch/alpha/defines, debian/arch/amd64/defines, debian/arch/arm/defines,
  debian/arch/hppa/defines, debian/arch/i386/defines, debian/arch/ia64/defines,
  debian/arch/m68k/defines, debian/arch/powerpc/defines, debian/arch/s390/defines,
  debian/arch/sparc/defines: Include flavour definitions.
* debian/bin/gencontrol.py
  - Read all configs at once.
  - Use config definitions for arch, subarch and flavour detection.

r3972: waldi | 2005-08-18 18:50:08 +0000
debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/config,
debian/arch/i386/config, debian/arch/powerpc/config: Aggregate ATM options.

r3973: waldi | 2005-08-18 18:52:30 +0000
Add kernel config for s390 tape image.

* debian/arch/s390/config: Remove IPL options.
* debian/arch/s390/config.s390 debian/arch/s390/config.s390x: Add IPL options.
* debian/arch/s390/config.s390-tape: Add.

r3974: waldi | 2005-08-18 18:55:49 +0000
debian/bin/gencontrol.py: Don't output not available arches.

r3975: waldi | 2005-08-18 18:57:32 +0000
debian/arch/sparc/defines: Set kpkg-subarch to sparc64.

r3976: waldi | 2005-08-18 19:06:23 +0000
* debian/arch/powerpc/Makefile.inc, debian/arch/sparc/Makefile.inc: Remove old subarch settings.
* debian/bin/gencontrol.py: Support per subarch kpkg-subarch.
* debian/rules.real: Use subarch for header builds.

svn path=/trunk/kernel/source/linux-2.6/; revision=3981
2005-08-19 10:31:32 +00:00
Bastian Blank 3da706e69b * Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
  debian/arch/$arch/$subarch/defines and
  debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.

r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
  - Use new gencontrol.
  - Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
  debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.

r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.

r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/i386/defines, debian/arch/i386/defines.686,
  debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
  debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
  debian/arch/m68k/defines, debian/arch/powerpc/defines,
  debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
  debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
  debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
  debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
  Remove

r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/i386/defines, debian/arch/ia64/defines,
  debian/arch/m68k/defines, debian/arch/powerpc/defines,
  debian/arch/sparc/defines: Update.

r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
  Update.

r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
  debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp, 
  debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
  debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
  debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
  Delete.

r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
  debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
  Delete.

r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.

r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.

svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00