Commit Graph

80 Commits

Author SHA1 Message Date
Bastian Blank a27da8be62 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6356
2006-03-31 17:13:35 +00:00
Bastian Blank 740cca25a8 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6257
2006-03-21 22:48:04 +00:00
dann frazier 32aa51f733 * [ia64] use yaird on ia64 until #341181 is fixed
svn path=/dists/trunk/linux-2.6/; revision=6132
2006-03-12 17:00:35 +00:00
Bastian Blank 6f713e68e8 debian/arch: Partialy unify nfs settings.
svn path=/dists/trunk/linux-2.6/; revision=6124
2006-03-10 21:04:54 +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
Frederik Schüler 13541281e7 Globally enable NAPI on all nic drives supporting it
Globally activate VIDEO_CX88_VP3054

svn path=/dists/trunk/linux-2.6/; revision=5961
2006-02-22 11:42:58 +00:00
Bastian Blank df263e9375 Merge /dists/sid/linux-2.6.
r5897:  jurij-guest | 2006-02-15 04:02:29 +0000
Bump build-dep on kernel-package to 10.035, required
to fix 352000.

r5909:  fs | 2006-02-17 13:21:29 +0000
Activate CONFIG_DVB_AV7110_OSD on alpha amd64 and ia64.

r5936:  jurij-guest | 2006-02-20 07:21:37 +0000
Add Closes for #348332 to the latest changelog entry
as it is the same issue as #352000 and is going to
be fixed by the next upload.

r5939:  cts | 2006-02-20 22:56:18 +0000
[m68k] build in cirrusfb driver

svn path=/dists/trunk/linux-2.6/; revision=5960
2006-02-21 19:10:03 +00:00
Bastian Blank 18795c946f debian/arch: Unify general network options.
svn path=/dists/trunk/linux-2.6/; revision=5953
2006-02-21 12:12:48 +00:00
Bastian Blank 27c5c29f48 debian/arch: Unify netfilter settings.
svn path=/dists/trunk/linux-2.6/; revision=5949
2006-02-21 11:21:28 +00:00
Bastian Blank cb2265349a debian/arch: Remove removed netfilter settings.
svn path=/dists/trunk/linux-2.6/; revision=5948
2006-02-21 11:01:14 +00:00
Bastian Blank f1f49572d0 debian/arch: Unify xfs settings.
svn path=/dists/trunk/linux-2.6/; revision=5946
2006-02-21 10:44:19 +00:00
Bastian Blank 6b4456fa60 debian/arch: Unify ext2/ext3 settings.
svn path=/dists/trunk/linux-2.6/; revision=5945
2006-02-21 10:21:05 +00:00
Bastian Blank cd5a2c7bed debian/arch: Unify multi-device support options.
svn path=/dists/trunk/linux-2.6/; revision=5944
2006-02-21 10:12:38 +00:00
Bastian Blank eb8bf281a4 debian/arch
- Remove devfs settings.
- Unify devpts settings.

svn path=/dists/trunk/linux-2.6/; revision=5943
2006-02-21 10:01:42 +00:00
Frederik Schüler c792398b48 Activate CONFIG_DVB_AV7110_OSD on alpha amd64 and ia64.
svn path=/dists/trunk/linux-2.6/; revision=5910
2006-02-17 13:21:41 +00:00
Bastian Blank cc945a922b Merge /dists/sid/linux-2.6.
r5536:  luther | 2006-01-21 00:41:44 +0000
Added linux-headers-<major>-all virtual package, to make building of out-of-tree modules easier.

r5595:  maks-guest | 2006-01-25 20:02:49 +0000
take care of latest klibc status

r5596:  maks-guest | 2006-01-25 20:06:50 +0000
too quick ci, corrected ia64 dep drop

r5597:  maks-guest | 2006-01-25 20:11:07 +0000
me goes for a coffee, fixing the fix

r5610:  tbm | 2006-01-28 00:15:28 +0000
Build PPP as a module.

r5611:  tbm | 2006-01-28 01:25:36 +0000
[arm/nslu2] Enable wireless.

r5612:  tbm | 2006-01-28 01:33:39 +0000
[arm/nslu2] Enable most USB modules.

r5613:  tbm | 2006-01-28 01:53:25 +0000
[arm/nslu2] Enable ALSA and USB sound modules.

r5615:  fs | 2006-01-28 13:35:23 +0000
New option for arch/$arch/defines: if setting initrd=no, make-kpkg will be called without --initrd.

r5618:  tbm | 2006-01-28 19:38:52 +0000
[arm/nslu2] Set 4 MB as the size of the initrd in the kernel cmd line.

r5619:  tbm | 2006-01-28 23:04:45 +0000
Add support for big-endian ARM.

r5620:  luther | 2006-01-29 08:45:23 +0000
Fixed apus config so it is more in line with the rest of the configs.
This enables parallel port, so loads of stuff is pulled in.
We should maybe enable parallel port on a higher level, as PReP, IBM CHRP
or Pegasos do have a real parallel port. Not sure if the this will break
apple hardware right now though

r5622:  luther | 2006-01-29 11:25:28 +0000
Adapted apus config files. Disabling scsi drivers for now as they don't build cleanly.
Makes initramfs-tools the default on powerpc, now that i fixed the klibc build :).

r5648:  maks-guest | 2006-01-31 09:59:05 +0000
klibc on sparc is fixed

r5680:  waldi | 2006-02-01 09:50:32 +0000
* debian/changelog: Update.
* debian/arch/powerpc/defines: Fix depends settings, they are not additive.

r5684:  tbm | 2006-02-01 19:26:09 +0000
[arm/footbridge] Set CONFIG_BLK_DEV_RAM_SIZE to 8192.

r5714:  tbm | 2006-02-07 02:19:36 +0000
mention the CVE (CVE-2006-0454)

r5806:  cts | 2006-02-10 11:10:03 +0000
document changes

r5813:  cts | 2006-02-10 15:29:10 +0000
correct VME description

r5815:  nobse | 2006-02-10 20:50:47 +0000
Disabled CONFIG_ALPHA_LEGACY_START_ADDRESS for -alpha-generic and
-alpha-smp flavours, and introduced a new -alpha-legacy flavour for MILO
based machines, which has CONFIG_ALPHA_LEGACY_START_ADDRESS enabled.

r5829:  nobse | 2006-02-12 10:49:29 +0000
Removed commented out alpha part.

r5830:  nobse | 2006-02-12 10:56:38 +0000
Renamed kernel-image-2.6-486 to kernel-image-2.6-386, it's meant for
transition only, and kernel-image-2.6-386 is the package name in sarge.

svn path=/dists/trunk/linux-2.6/; revision=5878
2006-02-14 17:58:22 +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 e6073f87ab Make CONFIG_IPW2100 a per-architecture option and deactivate it on all architectures but i386.
svn path=/dists/trunk/linux-2.6/; revision=5276
2006-01-05 13:27:34 +00:00
dann frazier 9ddce5fa57 * [ia64] Update config for 2.6.15.
svn path=/dists/trunk/linux-2.6/; revision=5218
2006-01-04 04:47:43 +00:00
Jonas Smedegaard f1e8856262 Rollback phase 2 of kernel config option cleanup (needs more care).
svn path=/dists/trunk/linux-2.6/; revision=5126
2005-12-29 12:10:27 +00:00
Jonas Smedegaard 38fcad77dc Stripping even more. This should be all!
svn path=/dists/trunk/linux-2.6/; revision=5121
2005-12-29 02:42:02 +00:00
maximilian attems 770de81271 disable CONFIG_USB_BANDWIDTH
svn path=/dists/trunk/linux-2.6/; revision=5101
2005-12-27 19:56:17 +00:00
Frederik Schüler 8c279732b8 Activate CONFIG_CC_OPTIMIZE_FOR_SIZE on all architectures but sparc, which is known to be broken.
svn path=/dists/trunk/linux-2.6/; revision=5087
2005-12-25 13:31:33 +00:00
Frederik Schüler dc8c180ebe * Move to 2.6.15-rc7.
* Make CONFIG_VIDEO_SAA7134 a global option.
* New option CONFIG_CC_OPTIMIZE_FOR_SIZE set per-arch. arm and powerpc have it enabled, all others don't. Upstream Default is Y, but it's still EXPERIMENTAL. 


svn path=/dists/trunk/linux-2.6/; revision=5086
2005-12-25 13:18:11 +00:00
Frederik Schüler efab14375b - Add updated version of drivers-scsi-megaraid_splitup.patch.
- Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global option.


svn path=/dists/trunk/linux-2.6/; revision=5035
2005-12-19 07:38:42 +00:00
dann frazier df9349aaac * Update ia64 configs
svn path=/dists/trunk/linux-2.6/; revision=5001
2005-12-11 19:29:01 +00:00
Simon Horman 5ea66f21f4 * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
as alsa snd-usb-audio still isn't quite there.
    I expect this to be re-disabled at some stage,
    possibly soon if it proves to be a source of bugs.
    (closes: #340388)

svn path=/dists/trunk/linux-2.6/; revision=4931
2005-11-30 07:44:13 +00:00
Frederik Schüler f16850b763 Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
statically linked has better performance then modules due to TLB issue.


svn path=/dists/trunk/linux-2.6/; revision=4885
2005-11-24 15:37:55 +00:00
Simon Horman 26bddd41aa Enable MKISS globally (closes: #340215)
svn path=/dists/trunk/linux-2.6/; revision=4866
2005-11-22 01:48:43 +00:00
Frederik Schüler 4843eb07da - QLA2XXX options activated globally.
- CONFIG_SCTP_HMAC_MD5=y set globally - or better default to CONFIG_SCTP_HMAC_SHA1=y?
- Memory model options removed from global config: every arch must set their memory model by arch/flavour now (FLATMEM, or DISCONTIGMEM on NUMA).
- new option: DEFAULT_IOSCHED="anticipatory" - everyone OK with this or better use the deadline scheduler?
- CONFIG_SPLIT_PTLOCK_CPUS must be set per-arch


svn path=/dists/trunk/linux-2.6/; revision=4829
2005-11-15 13:23:41 +00:00
Simon Horman 221d96db71 Add missing kernel-arch and kernel-header-dirs to defines
so headers get included. (closes: #336521)
    N.B: I only filled in arches where other's hadn't done so alread.
         Please fix if its wrong.

svn path=/dists/trunk/linux-2.6/; revision=4695
2005-10-31 08:00:52 +00:00
dann frazier c1913494af linux-patch-debian-linux-patch-debian-X.Y.Z.
* [ia64] Disable the CONFIG_IA64_SGI_SN_XP module.  This forces
  CONFIG_GENERIC_ALLOCATOR and CONFIG_IA64_UNCACHED_ALLOCATOR to y, which
  appears to break on zx1 systems.

svn path=/dists/trunk/linux-2.6/; revision=4660
2005-10-26 20:27:03 +00:00
dann frazier 4e93c698e9 update ia64 config; all answers are obvious except CPU_FREQ, which aw says doesn't work yet
svn path=/dists/trunk/linux-2.6/; revision=4566
2005-10-20 15:54:04 +00:00
Simon Horman 1d52bfbf89 Apus might build now. QLA2XXX can be set to n. Latter needed for former
svn path=/dists/trunk/linux-2.6/; revision=4518
2005-10-18 11:12:02 +00:00
Simon Horman 6a82f14200 hppa might work now. turned appletouch off for everyone except powerpc
svn path=/dists/trunk/linux-2.6/; revision=4515
2005-10-18 10:41:12 +00:00
Simon Horman 7c2d4b3b83 Update configs for 2.6.14-rc4
svn path=/dists/trunk/linux-2.6/; revision=4514
2005-10-18 10:03:48 +00:00
Frederik Schüler d1736cc32c deactivate BLK_DEV_IDESCSI on all architectures.
svn path=/dists/trunk/linux-2.6/; revision=4424
2005-10-11 16:10:51 +00:00
Frederik Schüler c901891544 deactivate FB_RIVA on all architectures. (2.6.13)
svn path=/dists/trunk/linux-2.6/; revision=4385
2005-10-10 19:29:31 +00:00
dann frazier ae0bf0b158 * [ia64] Update arch/ia64/config for 2.6.13
svn path=/dists/trunk/linux-2.6/; revision=4311
2005-10-05 22:21:57 +00:00
dann frazier 01f449cc55 * [ia64] Workaround #325070 until upstream works out an acceptable solution.
This bug breaks module loading on non-SMP ia64 kernels.  The workaround
  is to temporarily use an SMP config for the non-SMP kernels.  (Note that
  John Wright is running benchmarks to determine the overhead of running
  an SMP kernel on UP systems to help decide if this should be a
  permanent change).

svn path=/dists/trunk/linux-2.6/; revision=4308
2005-10-05 21:32:17 +00:00
Bastian Blank 05dca86b1b debian/arch/alpha/Makefile.inc, debian/arch/amd64/Makefile.inc,
debian/arch/arm/Makefile.inc, debian/arch/hppa/Makefile.inc,
debian/arch/i386/Makefile.inc, debian/arch/ia64/Makefile.inc,
debian/arch/m68k/Makefile.inc, debian/arch/sparc/Makefile.inc:
- Remove makeflags.
- Remove initrd modules.

svn path=/dists/trunk/linux-2.6/; revision=4207
2005-09-14 21:12:04 +00:00
Bastian Blank 8e8f94fbbe Move security settings to core config file.
* debian/arch/alpha/config, debian/arch/amd64/config,
  debian/arch/arm/config, debian/arch/hppa/config,
  debian/arch/i386/config, debian/arch/ia64/config,
  debian/arch/m68k/config, debian/arch/powerpc/config,
  debian/arch/s390/config, debian/arch/sparc/config:
  Remove security settings.
* debian/arch/config: Add security settings.
* debian/changelog: Update.

svn path=/dists/trunk/linux-2.6/; revision=4206
2005-09-14 21:08:14 +00:00
Bastian Blank 90a7a09ede * Move audit and preempt settings to core config file.
* Fix powerpc configuration.

* debian/arch/alpha/config, debian/arch/amd64/config,
  debian/arch/arm/config, debian/arch/hppa/config,
  debian/arch/i386/config, debian/arch/ia64/config,
  debian/arch/m68k/config, debian/arch/s390/config,
  debian/arch/sparc/config, debian/arch/sparc/config.sparc64:
  Remove audit and preempt settings.
* debian/arch/config: Add audit and preempt settings.
* debian/arch/powerpc/config
  - Remove audit and preempt settings.
  - Add HZ settings.
* debian/arch/powerpc/config.powerpc, debian/arch/powerpc/config.powerpc-smp,
  debian/arch/powerpc/noconfig.apus: Fix several options.
* debian/arch/powerpc/config.powerpc64: Add correct memory model.
* debian/changelog: Update.

svn path=/dists/trunk/linux-2.6/; revision=4181
2005-09-13 14:37:54 +00:00
Andres Salomon f6dacba124 unify CONFIG_NLS stuff. it was rather impressive how every arch was doing
this differently..

svn path=/dists/trunk/linux-2.6/; revision=4175
2005-09-12 05:00:38 +00:00
Andres Salomon eecbe3b5fb unify a bunch of scsi drivers, including aic7xxx and aic79xx.
svn path=/dists/trunk/linux-2.6/; revision=4174
2005-09-12 04:49:57 +00:00
Andres Salomon ece7067314 Unify generic scsi settings. SCSI_LOGGING and SCSI_CONSTANTS is now on for
things like m68k and arm; I'm not even really sure how necessary these are
for things like i386. 

svn path=/dists/trunk/linux-2.6/; revision=4173
2005-09-12 04:08:49 +00:00
Andres Salomon 952b47ca39 unify SATA stuff
svn path=/dists/trunk/linux-2.6/; revision=4172
2005-09-12 03:51:58 +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
Simon Horman 784883e07f * Disable BSDv3 accounting on hppa and alpha, it was already
disabled on all other architectures. Also unify BSD accounting
    config into top level config, rather than per flavour configs.
    This shows that BSD accounting is available on all except
    sparc and the rpc and s3c2410 flavours of arm.
    I am not sure if that is intentional.

svn path=/dists/trunk/linux-2.6/; revision=4167
2005-09-12 02:13:51 +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