diff options
| author | Ben Hutchings <benh@debian.org> | 2012-06-11 05:06:55 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-06-11 05:06:55 +0000 |
| commit | 39d70141e72c3bbb0c4ee7a9b2133e2d31d318fe (patch) | |
| tree | 0777384dd799447ed7ffee18b1122a681c94ad55 | |
| parent | 08e199bbde3fed97ea15696a3d112b03f05e416e (diff) | |
| parent | 578818c7a6bed1c4ceb47cc020a2d27823154ddc (diff) | |
Merge changes from sid branch of linux/linux-2.6 up to r19072
svn path=/dists/trunk/linux/; revision=19127
85 files changed, 619 insertions, 730 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index 99a8b287b..910632994 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,17 +1,17 @@ -linux-2.6 for DEBIAN ------------------------- +Linux kernel for Debian +----------------------- Patches ------- Debian applies small changes to the kernel source. These are split up into separated patches addressing individual problems. Each of the patch files contains a description and mentions the author. The patches can be found -at http://svn.debian.org/wsvn/kernel/dists/trunk/linux-2.6/debian/patches/. +at http://svn.debian.org/wsvn/kernel/dists/trunk/linux/debian/patches/. Config Files ------------ The .config files used to build the various linux-image files are dynamically -generated during the linux-2.6 package build. See the source package for +generated during the linux package build. See the source package for details. Each linux-image-* package provides the complete .config file that was used to generate it. This file is installed in /boot. diff --git a/debian/README.source b/debian/README.source index ae71ded24..896a91e49 100644 --- a/debian/README.source +++ b/debian/README.source @@ -3,18 +3,18 @@ Updating the upstream source 1) You can use either: a) a git repository of the kernel source - b) a kernel tarball from kernel.org (e.g. linux-2.6.25.tar.bz2) - and, optionally, a patch (e.g. patch-2.6.26-rc3.bz2). + b) a kernel tarball from kernel.org (e.g. linux-3.4.tar.bz2) + and, optionally, a patch (e.g. patch-3.5-rc1.bz2). 2) Run ./debian/bin/genorig.py <repository> or ./debian/bin/genorig.py <tarball> [patch] - This will produce ../orig/linux-2.6_<version>.orig.tar.gz - (e.g. linux-2.6_2.6.26~rc3.orig.tar.gz). + This will produce ../orig/linux_<version>.orig.tar.gz + (e.g. linux_3.5~rc1.orig.tar.gz). (genorig.py requires the python and unifdef packages to be installed) -3) Unpack linux-2.6-<version>.orig.tar.gz, cd into the new directory, +3) Unpack linux_<version>.orig.tar.gz, cd into the new directory, and do a 'svn export' to get the debian/ subdirectory. Alternatively unpack using "make -f debian/rules orig". @@ -27,16 +27,13 @@ The Debian kernel packaging uses a custom patching system: Patches are stored below debian/patches, loosely sorted in bugfix/, features/ and debian/. Patches are in the standard kernel patch -format. +format (unified diff to be applied with patch -p1) and generally have +DEP-3 headers. The order and the selection of patches which are applied during build -time are specified in the series/ subdirectory. For each revision -there may be up to one file named REVISION specifying the patches -applied for the standard revision and one file named REVISION-extra -for addon flavours. If, e.g. the patches are specified for 2.6.26-12, -the patch order file is called debian/patches/series/12 for the -standard kernel images and debian/patches/series/12-extra for the -addon flavours. +time are specified in the series/ subdirectory. The series file 'base' +is used for all configurations and the series file 'base-extra' is +additionally used for optional featuresets. Let's look at the actual series file for 2.6.26-12: @@ -46,11 +43,9 @@ Let's look at the actual series file for 2.6.26-12: + bugfix/all/ata-pata_marvell-vs-ahci.patch + features/sparc/video-sunxvr500-intergraph.patch -The patches to be applied are specified relative to debian/patches. -"+" indicates that the patch should be added, "-" can be used to -drop a patch in later patch series (e.g. if the patch turned out to -be faulty). The series files may be arbitrarily documented with -comments starting with "#". +The patches to be applied are specified relative to debian/patches +and must be preceded by a "+". The series files may be arbitrarily +documented with comments starting with "#". Let's now have a look at the series file for the addon kernel flavours of 2.6.26-12: diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 64244bede..9426eb4e9 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -63,6 +63,20 @@ class Gencontrol(Base): def do_main_packages(self, packages, vars, makeflags, extra): packages.extend(self.process_packages(self.templates["control.main"], self.vars)) + def do_main_recurse(self, packages, makefile, vars, makeflags, extra): + # Add featureset source rules + for featureset in iter(self.config['base', ]['featuresets']): + makeflags_featureset = makeflags.copy() + makeflags_featureset['FEATURESET'] = featureset + cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s" + % makeflags_featureset] + makefile.add('source_%s_real' % featureset, cmds=cmds_source) + makefile.add('source_%s' % featureset, + ['source_%s_real' % featureset]) + makefile.add('source', ['source_%s' % featureset]) + + super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra) + arch_makeflags = ( ('kernel-arch', 'KERNEL_ARCH', False), ) @@ -91,13 +105,11 @@ class Gencontrol(Base): self.merge_packages(packages, packages_headers_arch, arch) cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags] - cmds_source = ["$(MAKE) -f debian/rules.real source-arch %s" % makeflags] makefile.add('binary-arch_%s_real' % arch, cmds=cmds_binary_arch) - makefile.add('source_%s_real' % arch, cmds=cmds_source) # Shortcut to aid architecture bootstrapping makefile.add('binary-libc-dev_%s' % arch, - ['source_%s_real' % arch], + ['source_none_real'], ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" % (arch, makeflags)]) @@ -141,9 +153,7 @@ class Gencontrol(Base): self.merge_packages(packages, (package_headers,), arch) cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-featureset %s" % makeflags] - cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s" % makeflags] makefile.add('binary-arch_%s_%s_real' % (arch, featureset), cmds=cmds_binary_arch) - makefile.add('source_%s_%s_real' % (arch, featureset), cmds=cmds_source) flavour_makeflags_base = ( ('compiler', 'COMPILER', False), @@ -333,20 +343,6 @@ class Gencontrol(Base): makefile.add('build_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build) makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup) - def do_extra(self, packages, makefile): - apply = self.templates['patch.apply'] - - vars = { - 'revisions': 'orig base ' + ' '.join([i.revision for i in self.versions[::-1]]), - 'upstream': self.version.upstream, - 'linux_upstream': self.version.linux_upstream, - 'abiname': self.abiname, - } - - apply = self.substitute(apply, vars) - - file('debian/bin/patch.apply', 'w').write(apply) - def merge_packages(self, packages, new, arch): for new_package in new: name = new_package['Package'] diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py index b09c19de0..0a6d6a4cc 100755 --- a/debian/bin/genorig.py +++ b/debian/bin/genorig.py @@ -34,8 +34,7 @@ class Main(object): self.orig = '%s-%s' % (source, version.upstream) self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream) - self.tag = 'v' + re.sub(r"^(\d+\.\d+)\.0", r"\1", - version.upstream.replace('~', '-')) + self.tag = 'v' + version.linux_upstream_full def __call__(self): import tempfile @@ -100,9 +99,9 @@ class Main(object): raise RuntimeError("Can't patch source") def debian_patch(self): - name = "orig-" + self.version_dfsg + name = "orig" self.log("Patching source with debian patch (series %s)\n" % name) - fp = file("debian/patches/series/" + name) + fp = file("debian/patches/series-" + name) series = PatchSeries(name, "debian/patches", fp) series(dir=os.path.join(self.dir, self.orig)) diff --git a/debian/bin/patch.apply b/debian/bin/patch.apply new file mode 100644 index 000000000..8fa9e3702 --- /dev/null +++ b/debian/bin/patch.apply @@ -0,0 +1,50 @@ +#!/usr/bin/env python + +import os, os.path, re, sys +from warnings import warn +from debian_linux.patches import PatchSeries + +def main(): + options, args = parse_options() + + if len(args) > 1: + print "Too much arguments" + return + + home = options.home + name = options.featureset or "all" + fp = file(os.path.join(home, "series-%s" % name)) + PatchSeries(name, home, fp)() + +def parse_options(): + from optparse import OptionParser + parser = OptionParser( + usage = "%prog [OPTION]... [TARGET]", + ) + parser.add_option( + '-f', '--featureset', + dest = 'featureset', + help = "featureset", + ) + parser.add_option( + '-H', '--overwrite-home', + dest = 'home', + help = "overwrite home [no default]", + ) + + options, args = parser.parse_args() + + return options, args + +if __name__ == '__main__': + def showwarning(message, category, filename, lineno, + file=sys.stderr, line=''): + file.write("Warning: %s\n" % message) + import warnings + warnings.showwarning = showwarning + try: + main() + except RuntimeError, e: + sys.stderr.write("Error: %s\n" % e) + raise SystemExit, 1 + diff --git a/debian/changelog b/debian/changelog index eb10c320d..73dce8191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,26 @@ linux-2.6 (3.3~rc6-1~experimental.1) experimental; urgency=low -- Ben Hutchings <ben@decadent.org.uk> Sun, 04 Mar 2012 20:27:42 +0000 +linux (3.2.19-2) UNRELEASED; urgency=low + + * The "Not Quite So Many Different Version Numbers" release + + [ Ben Hutchings ] + * Rename source package to 'linux' (Closes: #636010) + * linux-image: Change package name for bugs to 'src:linux' (Closes: #644198) + * DFSG: video: Remove nvidiafb and rivafb, which include apparently + obfuscated code (Closes: #383481). The nouveau driver supports all + the same hardware, aside from RIVA 128 (NV3). + * udeb: Add udf-modules containing UDF filesystem module (Closes: #613972) + * [mipsel/loongson2f] linux-image: Recommend libc6-loongson2f + (Closes: #629410) + * Build-Depend on kmod or module-init-tools, not just the latter + * README.source: Update description of patch system to match current usage + * linux-patch-debian: Remove; it is no longer necessary for GPL compliance + and does not work with our current patch management + + -- Ben Hutchings <ben@decadent.org.uk> Sat, 02 Jun 2012 20:31:53 +0100 + linux-2.6 (3.2.19-1) unstable; urgency=low * New upstream stable update: diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 9ab681467..ad869b2df 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -964,11 +964,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_IMSTT is not set CONFIG_FB_TGA=m CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 01104c88b..aba3754e5 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -409,8 +409,6 @@ CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set @@ -439,7 +437,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m ## file: drivers/video/console/Kconfig ## CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y diff --git a/debian/config/armhf/config.omap b/debian/config/armhf/config.omap index f55881b20..f49d03dc5 100644 --- a/debian/config/armhf/config.omap +++ b/debian/config/armhf/config.omap @@ -275,7 +275,6 @@ CONFIG_FB=y ## file: drivers/video/console/Kconfig ## CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y ## ## file: drivers/video/omap/Kconfig diff --git a/debian/config/config b/debian/config/config index 8d473b2a2..62399ded1 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3189,7 +3189,6 @@ CONFIG_FIRMWARE_EDID=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_ARC=m # CONFIG_FB_UVESA is not set -# CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_INTEL_DEBUG is not set # CONFIG_FB_INTEL_I2C is not set CONFIG_FB_S3=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 994b4add7..72ef81462 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -593,8 +593,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_IMSTT is not set CONFIG_FB_STI=y # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set diff --git a/debian/config/ia64/config b/debian/config/ia64/config index dca49dde7..2cb0be642 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -719,11 +719,6 @@ CONFIG_FB_CYBER2000=m CONFIG_FB_ASILIANT=y # CONFIG_FB_IMSTT is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 061d008de..f0518bf19 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1459,11 +1459,6 @@ CONFIG_FB_EFI=y CONFIG_FB_N411=m CONFIG_FB_HGA=m CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_BACKLIGHT=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m # CONFIG_FB_INTEL is not set diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index ad09dc99d..5949d1935 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -465,7 +465,6 @@ CONFIG_SERIAL_8250_EXAR_ST16C554=m ## ## file: drivers/video/Kconfig ## -CONFIG_FB_NVIDIA_I2C=y CONFIG_FB_I810=m # CONFIG_FB_I810_GTF is not set CONFIG_FB_MATROX_G=y diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 0cd011b1c..69d3ce8ac 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -97,7 +97,6 @@ CONFIG_ISI=m ## ## file: drivers/video/Kconfig ## -# CONFIG_FB_NVIDIA_I2C is not set CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_MAVEN=m # CONFIG_FB_ATY_GENERIC_LCD is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index d9ea86dae..939cc6a88 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -998,11 +998,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -# CONFIG_FB_RIVA is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 82d3d4c28..449788f49 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1002,11 +1002,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -# CONFIG_FB_RIVA is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 7f0b00e7d..4ff39a62b 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -556,8 +556,6 @@ CONFIG_FB=y CONFIG_FB_GBE=y CONFIG_FB_GBE_MEM=4 # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index d61b2068e..d147c08ea 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -696,11 +696,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -CONFIG_FB_RIVA=m -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 5f04135dd..fd8b09cfc 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -702,11 +702,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -CONFIG_FB_RIVA=m -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines index 1b40b3c5b..c96622ee0 100644 --- a/debian/config/mipsel/defines +++ b/debian/config/mipsel/defines @@ -49,3 +49,6 @@ configs: mips/config.5kc-malta [loongson-2f_description] hardware: Loongson 2F hardware-long: Lemote Loongson 2F systems + +[loongson-2f_image] +recommends: libc6-loongson2f diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 600178e41..86f495841 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -820,11 +820,6 @@ CONFIG_FB_CT65550=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_VGA16 is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=y -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=y CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 index 5cf63de40..5b29c839b 100644 --- a/debian/config/powerpc/config.powerpc64 +++ b/debian/config/powerpc/config.powerpc64 @@ -185,7 +185,6 @@ CONFIG_HVCS=m # CONFIG_FB_PLATINUM is not set # CONFIG_FB_VALKYRIE is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_NVIDIA is not set # CONFIG_FB_ATY128 is not set CONFIG_FB_PS3=y CONFIG_FB_PS3_DEFAULT_SIZE_M=9 diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 99549f6a3..9a8d84ab6 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -504,8 +504,6 @@ CONFIG_FB_XVR500=y CONFIG_FB_XVR2500=y CONFIG_FB_XVR1000=y # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set CONFIG_FB_RADEON=y # CONFIG_FB_RADEON_I2C is not set diff --git a/debian/installer/amd64/modules/amd64/udf-modules b/debian/installer/amd64/modules/amd64/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/amd64/modules/amd64/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/armel/modules/armel-iop32x/udf-modules b/debian/installer/armel/modules/armel-iop32x/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/armel/modules/armel-iop32x/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/armel/modules/armel-kirkwood/udf-modules b/debian/installer/armel/modules/armel-kirkwood/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/armel/modules/armel-kirkwood/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/armel/modules/armel-orion5x/udf-modules b/debian/installer/armel/modules/armel-orion5x/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/armel/modules/armel-orion5x/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/armel/modules/armel-versatile/udf-modules b/debian/installer/armel/modules/armel-versatile/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/armel/modules/armel-versatile/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/armhf/modules/armhf-mx5/udf-modules b/debian/installer/armhf/modules/armhf-mx5/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/armhf/modules/armhf-mx5/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/i386/modules/i386/udf-modules b/debian/installer/i386/modules/i386/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/i386/modules/i386/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/ia64/modules/ia64/udf-modules b/debian/installer/ia64/modules/ia64/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/ia64/modules/ia64/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/m68k/modules/m68k-mac/udf-modules b/debian/installer/m68k/modules/m68k-mac/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/m68k/modules/m68k-mac/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/m68k/modules/m68k/udf-modules b/debian/installer/m68k/modules/m68k/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/m68k/modules/m68k/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/mips/modules/mips-4kc-malta/udf-modules b/debian/installer/mips/modules/mips-4kc-malta/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/mips/modules/mips-4kc-malta/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/mips/modules/mips-sb1-bcm91250a/udf-modules b/debian/installer/mips/modules/mips-sb1-bcm91250a/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/mips/modules/mips-sb1-bcm91250a/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/mips/modules/mips/udf-modules b/debian/installer/mips/modules/mips/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/mips/modules/mips/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/mipsel/modules/mipsel-4kc-malta/udf-modules b/debian/installer/mipsel/modules/mipsel-4kc-malta/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-4kc-malta/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/mipsel/modules/mipsel-loongson-2f/udf-modules b/debian/installer/mipsel/modules/mipsel-loongson-2f/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-loongson-2f/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/udf-modules b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/modules/udf-modules b/debian/installer/modules/udf-modules new file mode 100644 index 000000000..97c604ff2 --- /dev/null +++ b/debian/installer/modules/udf-modules @@ -0,0 +1 @@ +udf diff --git a/debian/installer/package-list b/debian/installer/package-list index a99061dee..4191875fc 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -484,3 +484,9 @@ Depends: kernel-image, input-modules, scsi-core-modules Priority: extra Description: Hyper-V modules This package contains Hyper-V paravirtualised drivers for the kernel. + +Package: udf-modules +Depends: kernel-image, crc-modules +Priority: extra +Description: UDF modules + This package contains the UDF filesystem module. diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/powerpc/modules/powerpc-powerpc64/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/powerpc/modules/powerpc/udf-modules b/debian/installer/powerpc/modules/powerpc/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/powerpc/modules/powerpc/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/sh4/modules/sh4-sh7751r/udf-modules b/debian/installer/sh4/modules/sh4-sh7751r/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/sh4/modules/sh4-sh7751r/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules b/debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/sh4/modules/sh4-sh7785lcr/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/sparc/modules/sparc/udf-modules b/debian/installer/sparc/modules/sparc/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/sparc/modules/sparc/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/installer/sparc64/modules/sparc64/udf-modules b/debian/installer/sparc64/modules/sparc64/udf-modules new file mode 100644 index 000000000..b90d7ee9b --- /dev/null +++ b/debian/installer/sparc64/modules/sparc64/udf-modules @@ -0,0 +1 @@ +#include <udf-modules> diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 561dddb41..7daaa03e0 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -110,7 +110,7 @@ class VersionLinux(Version): (?P<version> \d+\.\d+ ) -(?: +(?P<update> \.\d+ )? (?: @@ -150,9 +150,11 @@ $ self.linux_modifier = d['modifier'] self.linux_version = d['version'] if d['modifier'] is not None: + assert not d['update'] self.linux_upstream = u'-'.join((d['version'], d['modifier'])) else: self.linux_upstream = d['version'] + self.linux_upstream_full = d['version'] + (d['update'] or u'') self.linux_dfsg = d['dfsg'] self.linux_revision_experimental = match.group('revision_experimental') and True self.linux_revision_other = match.group('revision_other') and True diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 7c49f3a88..389af7027 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -77,7 +77,7 @@ class MakeFlags(dict): class Gencontrol(object): - makefile_targets = ('binary-arch', 'build', 'setup', 'source') + makefile_targets = ('binary-arch', 'build', 'setup') def __init__(self, config, templates, version=Version): self.config, self.templates = config, templates diff --git a/debian/lib/python/debian_linux/patches.py b/debian/lib/python/debian_linux/patches.py index e23fcce32..2f0737b53 100644 --- a/debian/lib/python/debian_linux/patches.py +++ b/debian/lib/python/debian_linux/patches.py @@ -188,32 +188,3 @@ class PatchSeries(list): def __repr__(self): return '<%s object for %s>' % (self.__class__.__name__, self.name) - - -class PatchSeriesList(list): - def __call__(self, cond=bool, reverse=False): - if not reverse: - l = self - else: - l = self[::-1] - for i in l: - if reverse: - print "--> Try to unapply %s." % i.name - else: - print "--> Try to apply %s." % i.name - i(cond=cond, reverse=reverse) - if reverse: - print "--> %s fully unapplied." % i.name - else: - print "--> %s fully applied." % i.name - - @classmethod - def read(cls, home, files): - ret = cls() - for i in files: - try: - fp = file(os.path.join(home, 'series', i)) - ret.append(PatchSeries(i, home, fp)) - except IOError: - pass - return ret diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index 93b43ca4e..d1b681167 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -1,7 +1,7 @@ rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt # Some of this is DFSG-free, but it has been moved to firmware-free so -# we don't need it in linux-2.6 as well. +# we don't need it in linux as well. rm firmware rm arch/powerpc/sysdev/micropatch.c @@ -25,5 +25,9 @@ unifdef drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c -UREMOVE_DFSG rm drivers/staging/wlags49_h2/ap_*.c rm drivers/staging/wlags49_h2/sta_*.c +# These include apparently obfuscated code +rm drivers/video/nvidia/ +rm drivers/video/riva/ + rm sound/pci/cs46xx/cs46xx_image.h rm sound/pci/cs46xx/imgs diff --git a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch new file mode 100644 index 000000000..e9abe4768 --- /dev/null +++ b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch @@ -0,0 +1,137 @@ +From: Ben Hutchings <ben@decadent.org.uk> +Date: Sat, 2 Jun 2012 19:53:38 +0100 +Subject: video: Remove nvidiafb and rivafb +Bug-Debian: http://bugs.debian.org/383481 + +These drivers contain register programming code provided by the +hardware vendor that appears to have been deliberately obfuscated. +This is arguably not the preferred form for modification. + +These drivers are also largely redundant with nouveau. The RIVA 128 +(NV3) is not supported by nouveau but is about 15 years old and +probably discontinued 10 years ago. + +--- + drivers/video/Kconfig | 95 ------------------------------------------------ + drivers/video/Makefile | 2 - + 2 files changed, 97 deletions(-) + +diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig +index d83e967..fe92039 100644 +--- a/drivers/video/Kconfig ++++ b/drivers/video/Kconfig +@@ -1028,101 +1028,6 @@ config FB_ATMEL_STN + + If unsure, say N. + +-config FB_NVIDIA +- tristate "nVidia Framebuffer Support" +- depends on FB && PCI +- select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT +- select FB_MODE_HELPERS +- select FB_CFB_FILLRECT +- select FB_CFB_COPYAREA +- select FB_CFB_IMAGEBLIT +- select BITREVERSE +- select VGASTATE +- help +- This driver supports graphics boards with the nVidia chips, TNT +- and newer. For very old chipsets, such as the RIVA128, then use +- the rivafb. +- Say Y if you have such a graphics board. +- +- To compile this driver as a module, choose M here: the +- module will be called nvidiafb. +- +-config FB_NVIDIA_I2C +- bool "Enable DDC Support" +- depends on FB_NVIDIA +- select FB_DDC +- help +- This enables I2C support for nVidia Chipsets. This is used +- only for getting EDID information from the attached display +- allowing for robust video mode handling and switching. +- +- Because fbdev-2.6 requires that drivers must be able to +- independently validate video mode parameters, you should say Y +- here. +- +-config FB_NVIDIA_DEBUG +- bool "Lots of debug output" +- depends on FB_NVIDIA +- default n +- help +- Say Y here if you want the nVidia driver to output all sorts +- of debugging information to provide to the maintainer when +- something goes wrong. +- +-config FB_NVIDIA_BACKLIGHT +- bool "Support for backlight control" +- depends on FB_NVIDIA +- default y +- help +- Say Y here if you want to control the backlight of your display. +- +-config FB_RIVA +- tristate "nVidia Riva support" +- depends on FB && PCI +- select FB_BACKLIGHT if FB_RIVA_BACKLIGHT +- select FB_MODE_HELPERS +- select FB_CFB_FILLRECT +- select FB_CFB_COPYAREA +- select FB_CFB_IMAGEBLIT +- select BITREVERSE +- select VGASTATE +- help +- This driver supports graphics boards with the nVidia Riva/Geforce +- chips. +- Say Y if you have such a graphics board. +- +- To compile this driver as a module, choose M here: the +- module will be called rivafb. +- +-config FB_RIVA_I2C +- bool "Enable DDC Support" +- depends on FB_RIVA +- select FB_DDC +- help +- This enables I2C support for nVidia Chipsets. This is used +- only for getting EDID information from the attached display +- allowing for robust video mode handling and switching. +- +- Because fbdev-2.6 requires that drivers must be able to +- independently validate video mode parameters, you should say Y +- here. +- +-config FB_RIVA_DEBUG +- bool "Lots of debug output" +- depends on FB_RIVA +- default n +- help +- Say Y here if you want the Riva driver to output all sorts +- of debugging information to provide to the maintainer when +- something goes wrong. +- +-config FB_RIVA_BACKLIGHT +- bool "Support for backlight control" +- depends on FB_RIVA +- default y +- help +- Say Y here if you want to control the backlight of your display. +- + config FB_I810 + tristate "Intel 810/815 support (EXPERIMENTAL)" + depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL +diff --git a/drivers/video/Makefile b/drivers/video/Makefile +index 9b9d8ff..4361446 100644 +--- a/drivers/video/Makefile ++++ b/drivers/video/Makefile +@@ -38,8 +38,6 @@ obj-$(CONFIG_FB_PM2) += pm2fb.o + obj-$(CONFIG_FB_PM3) += pm3fb.o + + obj-$(CONFIG_FB_MATROX) += matrox/ +-obj-$(CONFIG_FB_RIVA) += riva/ +-obj-$(CONFIG_FB_NVIDIA) += nvidia/ + obj-$(CONFIG_FB_ATY) += aty/ macmodes.o + obj-$(CONFIG_FB_ATY128) += aty/ macmodes.o + obj-$(CONFIG_FB_RADEON) += aty/ diff --git a/debian/patches/series/base b/debian/patches/series-all index 29a5b0689..29a5b0689 100644 --- a/debian/patches/series/base +++ b/debian/patches/series-all diff --git a/debian/patches/series-none b/debian/patches/series-none new file mode 100644 index 000000000..fe9c2dc01 --- /dev/null +++ b/debian/patches/series-none @@ -0,0 +1 @@ +# dummy file diff --git a/debian/patches/series/orig-0 b/debian/patches/series-orig index 566955641..dec2c3e59 100644 --- a/debian/patches/series/orig-0 +++ b/debian/patches/series-orig @@ -4,6 +4,7 @@ + debian/dfsg/drivers-net-appletalk-cops.patch + debian/dfsg/drivers-staging-wlags49_h2-disable.patch + debian/dfsg/drivers-staging-wlags49_h25-disable.patch ++ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch + debian/dfsg/r8192e-remove-firmware-again.patch + debian/dfsg/firmware-cleanup.patch + debian/dfsg/sound-pci.patch diff --git a/debian/patches/series-rt b/debian/patches/series-rt new file mode 100644 index 000000000..5d16b62b2 --- /dev/null +++ b/debian/patches/series-rt @@ -0,0 +1,253 @@ ++ features/all/rt/re-possible-slab-deadlock-while-doing-ifenslave-1.patch ++ features/all/rt/x86-kprobes-remove-bogus-preempt-enable.patch ++ features/all/rt/tick-skew.patch ++ features/all/rt/x86-hpet-disable-msi-on-lenovo-w510.patch ++ features/all/rt/block-shorten-interrupt-disabled-regions.patch ++ features/all/rt/sched-distangle-worker-accounting-from-rq-3elock.patch ++ features/all/rt/mips-enable-interrupts-in-signal.patch ++ features/all/rt/arm-enable-interrupts-in-signal-code.patch ++ features/all/rt/seqlock-remove-unused-functions.patch ++ features/all/rt/seqlock-use-seqcount.patch ++ features/all/rt/timekeeping-split-xtime-lock.patch ++ features/all/rt/intel_idle-convert-i7300_idle_lock-to-raw-spinlock.patch ++ features/all/rt/tracing-account-for-preempt-off-in-preempt_schedule.patch ++ features/all/rt/signal-revert-ptrace-preempt-magic.patch ++ features/all/rt/arm-mark-pmu-interupt-no-thread.patch ++ features/all/rt/arm-allow-irq-threading.patch ++ features/all/rt/arm-convert-boot-lock-to-raw.patch ++ features/all/rt/arm-omap-make-wakeupgen_lock-raw.patch ++ features/all/rt/signals-do-not-wake-self.patch ++ features/all/rt/posix-timers-no-broadcast.patch ++ features/all/rt/signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch ++ features/all/rt/oleg-signal-rt-fix.patch ++ features/all/rt/generic-cmpxchg-use-raw-local-irq.patch ++ features/all/rt/drivers-random-reduce-preempt-disabled-region.patch ++ features/all/rt/arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch ++ features/all/rt/clocksource-tclib-allow-higher-clockrates.patch ++ features/all/rt/drivers-net-tulip-add-missing-pci-disable.patch ++ features/all/rt/drivers-net-8139-disable-irq-nosync.patch ++ features/all/rt/drivers-net-ehea-mark-rx-irq-no-thread.patch ++ features/all/rt/drivers-net-at91-make-mdio-protection-rt-safe.patch ++ features/all/rt/mm-prepare-pf-disable-discoupling.patch ++ features/all/rt/arch-use-pagefault-disabled.patch ++ features/all/rt/peter_zijlstra-frob-pagefault_disable.patch ++ features/all/rt/peterz-raw_pagefault_disable.patch ++ features/all/rt/filemap-fix-up.patch ++ features/all/rt/mm-remove-preempt-count-from-pf.patch ++ features/all/rt/x86-highmem-warn.patch ++ features/all/rt/suspend-prevernt-might-sleep-splats.patch ++ features/all/rt/of-fixup-recursive-locking.patch ++ features/all/rt/of-convert-devtree-lock.patch ++ features/all/rt/list-add-list-last-entry.patch ++ features/all/rt/mm-page-alloc-use-list-last-entry.patch ++ features/all/rt/mm-slab-move-debug-out.patch ++ features/all/rt/pid-h-include-atomic-h.patch ++ features/all/rt/sysctl-include-atomic-h.patch ++ features/all/rt/net-flip-lock-dep-thingy.patch ++ features/all/rt/softirq-thread-do-softirq.patch ++ features/all/rt/softirq-split-out-code.patch ++ features/all/rt/x86-io-apic-migra-no-unmask.patch ++ features/all/rt/fix-rt-int3-x86_32-3.2-rt.patch ++ features/all/rt/locking-various-init-fixes.patch ++ features/all/rt/pci-access-use-__wake_up_all_locked.patch ++ features/all/rt/latency-hist.patch ++ features/all/rt/hwlatdetect.patch ++ features/all/rt/localversion.patch ++ features/all/rt/early-printk-consolidate.patch ++ features/all/rt/printk-kill.patch ++ features/all/rt/printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch ++ features/all/rt/rt-preempt-base-config.patch ++ features/all/rt/bug-rt-dependend-variants.patch ++ features/all/rt/local-irq-rt-depending-variants.patch ++ features/all/rt/preempt-nort-rt-variants.patch ++ features/all/rt/ata-disable-interrupts-if-non-rt.patch ++ features/all/rt/ide-use-nort-local-irq-variants.patch ++ features/all/rt/infiniband-mellanox-ib-use-nort-irq.patch ++ features/all/rt/inpt-gameport-use-local-irq-nort.patch ++ features/all/rt/acpi-use-local-irq-nort.patch ++ features/all/rt/user-use-local-irq-nort.patch ++ features/all/rt/resource-counters-use-localirq-nort.patch ++ features/all/rt/usb-hcd-use-local-irq-nort.patch ++ features/all/rt/tty-use-local-irq-nort.patch ++ features/all/rt/mm-scatterlist-dont-disable-irqs-on-RT.patch ++ features/all/rt/signal-fix-up-rcu-wreckage.patch ++ features/all/rt/net-wireless-warn-nort.patch ++ features/all/rt/mm-cgroup-page-bit-spinlock.patch ++ features/all/rt/fs-replace-bh_uptodate_lock-for-rt.patch ++ features/all/rt/fs-jbd-replace-bh_state-lock.patch ++ features/all/rt/genirq-nodebug-shirq.patch ++ features/all/rt/genirq-disable-random-call-on-preempt-rt.patch ++ features/all/rt/genirq-disable-irqpoll-on-rt.patch ++ features/all/rt/genirq-force-threading.patch ++ features/all/rt/drivers-net-fix-livelock-issues.patch ++ features/all/rt/drivers-net-vortex-fix-locking-issues.patch ++ features/all/rt/drivers-net-gianfar-make-rt-aware.patch ++ features/all/rt/usb-fix-mouse-problem-copying-large-data.patch ++ features/all/rt/local-var.patch ++ features/all/rt/rt-local-irq-lock.patch ++ features/all/rt/cpu-rt-variants.patch ++ features/all/rt/mm-slab-wrap-functions.patch ++ features/all/rt/rt-slab-fix-__do_drain-to-use-the-right-array-cache.patch ++ features/all/rt/mm-slab-more-lock-breaks.patch ++ features/all/rt/mm-page_alloc-rt-friendly-per-cpu-pages.patch ++ features/all/rt/mm-page_alloc-reduce-lock-sections-further.patch ++ features/all/rt/mm-page-alloc-fix.patch ++ features/all/rt/mm-convert-swap-to-percpu-locked.patch ++ features/all/rt/mm-make-vmstat-rt-aware.patch ++ features/all/rt/mm-shrink-the-page-frame-to-rt-size.patch ++ features/all/rt/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch ++ features/all/rt/mm-allow-slab-rt.patch ++ features/all/rt/radix-tree-rt-aware.patch ++ features/all/rt/panic-disable-random-on-rt.patch ++ features/all/rt/ipc-make-rt-aware.patch ++ features/all/rt/ipc-mqueue-add-a-critical-section-to-avoid-a-deadlock.patch ++ features/all/rt/relay-fix-timer-madness.patch ++ features/all/rt/net-ipv4-route-use-locks-on-up-rt.patch ++ features/all/rt/workqueue-avoid-the-lock-in-cpu-dying.patch ++ features/all/rt/timers-prepare-for-full-preemption.patch ++ features/all/rt/timers-preempt-rt-support.patch ++ features/all/rt/timers-fix-timer-hotplug-on-rt.patch ++ features/all/rt/timers-mov-printk_tick-to-soft-interrupt.patch ++ features/all/rt/timer-delay-waking-softirqs-from-the-jiffy-tick.patch ++ features/all/rt/timers-avoid-the-base-null-otptimization-on-rt.patch ++ features/all/rt/rfc-printk-don-27t-call-printk_tick-in-printk_needs_cpu.patch ++ features/all/rt/hrtimers-prepare-full-preemption.patch ++ features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch ++ features/all/rt/peter_zijlstra-frob-hrtimer.patch ++ features/all/rt/hrtimer-add-missing-debug_activate-aid-was-re-announce-3-0-6-rt17.patch ++ features/all/rt/hrtimer-fix-reprogram-madness.patch ++ features/all/rt/timer-fd-avoid-live-lock.patch ++ features/all/rt/posix-timers-thread-posix-cpu-timers-on-rt.patch ++ features/all/rt/posix-timers-shorten-cpu-timers-thread.patch ++ features/all/rt/posix-timers-avoid-wakeups-when-no-timers-are-active.patch ++ features/all/rt/sched-delay-put-task.patch ++ features/all/rt/sched-limit-nr-migrate.patch ++ features/all/rt/sched-mmdrop-delayed.patch ++ features/all/rt/sched-rt-mutex-wakeup.patch ++ features/all/rt/sched-might-sleep-do-not-account-rcu-depth.patch ++ features/all/rt/sched-cond-resched.patch ++ features/all/rt/cond-resched-softirq-rt.patch ++ features/all/rt/cond-resched-lock-rt-tweak.patch ++ features/all/rt/sched-disable-ttwu-queue.patch ++ features/all/rt/sched-disable-rt-group-sched-on-rt.patch ++ features/all/rt/sched-ttwu-ensure-success-return-is-correct.patch ++ features/all/rt/stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch ++ features/all/rt/stomp-machine-mark-stomper-thread.patch ++ features/all/rt/stomp-machine-raw-lock.patch ++ features/all/rt/hotplug-light-get-online-cpus.patch ++ features/all/rt/hotplug-sync_unplug-no-27-5cn-27-in-task-name.patch ++ features/all/rt/re-migrate_disable-race-with-cpu-hotplug-3f.patch ++ features/all/rt/sched-migrate-disable.patch ++ features/all/rt/hotplug-use-migrate-disable.patch ++ features/all/rt/hotplug-call-cpu_unplug_begin-a-little-early.patch ++ features/all/rt/ftrace-migrate-disable-tracing.patch ++ features/all/rt/rt-tracing-show-padding-as-unsigned-short.patch ++ features/all/rt/migrate-disable-rt-variant.patch ++ features/all/rt/peter_zijlstra-frob-migrate_disable.patch ++ features/all/rt/peter_zijlstra-frob-migrate_disable-2.patch ++ features/all/rt/sched-rt-fix-migrate_enable-thinko.patch ++ features/all/rt/sched-teach-migrate_disable-about-atomic-contexts.patch ++ features/all/rt/rt-sched-postpone-actual-migration-disalbe-to-schedule.patch ++ features/all/rt/rt-sched-do-not-compare-cpu-masks-in-scheduler.patch ++ features/all/rt/rt-sched-have-migrate_disable-ignore-bounded-threads.patch ++ features/all/rt/sched-clear-pf-thread-bound-on-fallback-rq.patch ++ features/all/rt/ftrace-crap.patch ++ features/all/rt/rt-ring-buffer-convert-reader_lock-from-raw_spin_lock-into-spin_lock.patch ++ features/all/rt/net-netif_rx_ni-migrate-disable.patch ++ features/all/rt/softirq-sanitize-softirq-pending.patch ++ features/all/rt/lockdep-no-softirq-accounting-on-rt.patch ++ features/all/rt/mutex-no-spin-on-rt.patch ++ features/all/rt/softirq-local-lock.patch ++ features/all/rt/softirq-export-in-serving-softirq.patch ++ features/all/rt/harirq-h-define-softirq_count-as-oul-to-kill-build-warning.patch ++ features/all/rt/softirq-fix-unplug-deadlock.patch ++ features/all/rt/softirq-disable-softirq-stacks-for-rt.patch ++ features/all/rt/softirq-make-fifo.patch ++ features/all/rt/tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch ++ features/all/rt/irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch ++ features/all/rt/local-vars-migrate-disable.patch ++ features/all/rt/md-raid5-percpu-handling-rt-aware.patch ++ features/all/rt/rtmutex-lock-killable.patch ++ features/all/rt/rtmutex-futex-prepare-rt.patch ++ features/all/rt/futex-requeue-pi-fix.patch ++ features/all/rt/rt-mutex-add-sleeping-spinlocks-support.patch ++ features/all/rt/spinlock-types-separate-raw.patch ++ features/all/rt/rtmutex-avoid-include-hell.patch ++ features/all/rt/rt-add-rt-spinlock-to-headers.patch ++ features/all/rt/rt-add-rt-to-mutex-headers.patch ++ features/all/rt/rwsem-add-rt-variant.patch ++ features/all/rt/rt-add-rt-locks.patch ++ features/all/rt/tasklist-lock-fix-section-conflict.patch ++ features/all/rt/timer-handle-idle-trylock-in-get-next-timer-irq.patch ++ features/all/rt/rcu-force-preempt-rcu-for-rt.patch ++ features/all/rt/peter_zijlstra-frob-rcu.patch ++ features/all/rt/rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch ++ features/all/rt/rcu-fix-macro-substitution.patch ++ features/all/rt/rcu-tiny-merge-bh.patch ++ features/all/rt/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch ++ features/all/rt/rcu-fix-build-break.patch ++ features/all/rt/rt-rcutree-warn-fix.patch ++ features/all/rt/lglocks-rt.patch ++ features/all/rt/drivers-serial-cleanup-locking-for-rt.patch ++ features/all/rt/drivers-serial-call-flush_to_ldisc-when-the-irq-is-t.patch ++ features/all/rt/drivers-tty-fix-omap-lock-crap.patch ++ features/all/rt/rt-serial-warn-fix.patch ++ features/all/rt/fs-namespace-preemption-fix.patch ++ features/all/rt/mm-protect-activate-switch-mm.patch ++ features/all/rt/mm-protect-activate_mm-by-preempt_-disable-7cenable-_rt.patch ++ features/all/rt/fs-block-rt-support.patch ++ features/all/rt/fs-ntfs-disable-interrupt-non-rt.patch ++ features/all/rt/x86-mce-timer-hrtimer.patch ++ features/all/rt/x86-stackprot-no-random-on-rt.patch ++ features/all/rt/x86-use-gen-rwsem-spinlocks-rt.patch ++ features/all/rt/x86-disable-debug-stack.patch ++ features/all/rt/workqueue-use-get-cpu-light.patch ++ features/all/rt/epoll-use-get-cpu-light.patch ++ features/all/rt/mm-vmalloc-use-get-cpu-light.patch ++ features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch ++ features/all/rt/workqueue-sanity.patch ++ features/all/rt/workqueue-fix-PF_THREAD_BOUND.patch ++ features/all/rt/workqueue-hotplug-fix.patch ++ features/all/rt/workqueue-more-hotplug-fallout.patch ++ features/all/rt/debugobjects-rt.patch ++ features/all/rt/jump-label-rt.patch ++ features/all/rt/skbufhead-raw-lock.patch ++ features/all/rt/perf-move-irq-work-to-softirq-in-rt.patch ++ features/all/rt/console-make-rt-friendly.patch ++ features/all/rt/fix-printk-flush-of-messages-1.patch ++ features/all/rt/power-use-generic-rwsem-on-rt.patch ++ features/all/rt/power-disable-highmem-on-rt.patch ++ features/all/rt/arm-disable-highmem-on-rt.patch ++ features/all/rt/arm-at91-tclib-default-to-tclib-timer-for-rt.patch ++ features/all/rt/mips-disable-highmem-on-rt.patch ++ features/all/rt/net-tx-action-avoid-livelock-on-rt.patch ++ features/all/rt/ping-sysrq.patch ++ features/all/rt/kgb-serial-hackaround.patch ++ features/all/rt/sysfs-realtime-entry.patch ++ features/all/rt/peter_zijlstra-re-_3_0-rt4.patch ++ features/all/rt/ipc-sem-rework-semaphore-wakeups.patch ++ features/all/rt/x86-kvm-require-const-tsc-for-rt.patch ++ features/all/rt/scsi-fcoe-rt-aware.patch ++ features/all/rt/x86-crypto-reduce-preempt-disabled-regions.patch ++ features/all/rt/dm-make-rt-aware.patch ++ features/all/rt/cpumask-disable-offstack-on-rt.patch ++ features/all/rt/seqlock-prevent-rt-starvation.patch ++ features/all/rt/rfc-timer-fix-hotplug-for-rt.patch ++ features/all/rt/rfc-futex-rt-fix-possible-lockup-when-taking-pi_lock-in-proxy-handler.patch ++ features/all/rt/rfc-ring-buffer-rt-check-for-irqs-disabled-before-grabbing-reader-lock.patch ++ features/all/rt/rfc-sched-rt-fix-wait_task_interactive-to-test-rt_spin_lock-state.patch ++ features/all/rt/rfc-lglock-rt-use-non-rt-for_each_cpu-in-rt-code.patch ++ features/all/rt/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch ++ features/all/rt/softirq-preempt-fix-3-re.txt ++ features/all/rt/scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch ++ features/all/rt/upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch ++ features/all/rt/rt-introduce-cpu-chill.patch ++ features/all/rt/fs-dcache-use-cpu-chill-in-trylock-loops.patch ++ features/all/rt/net-use-cpu-chill.patch ++ features/all/rt/ntp-make-ntp-lock-raw-sigh.patch ++ features/all/rt/mips-remove-smp-reserve-lock.patch ++ features/all/rt/lockdep-selftest-convert-spinlock-to-raw-spinlock.patch ++ features/all/rt/lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch ++ features/all/rt/genirq-add-default-mask-cmdline-option.patch ++ features/all/rt/kconfig-disable-a-few-options-rt.patch ++ features/all/rt/kconfig-preempt-rt-full.patch diff --git a/debian/patches/series/base-extra b/debian/patches/series/base-extra deleted file mode 100644 index a516d7130..000000000 --- a/debian/patches/series/base-extra +++ /dev/null @@ -1,253 +0,0 @@ -+ features/all/rt/re-possible-slab-deadlock-while-doing-ifenslave-1.patch featureset=rt -+ features/all/rt/x86-kprobes-remove-bogus-preempt-enable.patch featureset=rt -+ features/all/rt/tick-skew.patch featureset=rt -+ features/all/rt/x86-hpet-disable-msi-on-lenovo-w510.patch featureset=rt -+ features/all/rt/block-shorten-interrupt-disabled-regions.patch featureset=rt -+ features/all/rt/sched-distangle-worker-accounting-from-rq-3elock.patch featureset=rt -+ features/all/rt/mips-enable-interrupts-in-signal.patch featureset=rt -+ features/all/rt/arm-enable-interrupts-in-signal-code.patch featureset=rt -+ features/all/rt/seqlock-remove-unused-functions.patch featureset=rt -+ features/all/rt/seqlock-use-seqcount.patch featureset=rt -+ features/all/rt/timekeeping-split-xtime-lock.patch featureset=rt -+ features/all/rt/intel_idle-convert-i7300_idle_lock-to-raw-spinlock.patch featureset=rt -+ features/all/rt/tracing-account-for-preempt-off-in-preempt_schedule.patch featureset=rt -+ features/all/rt/signal-revert-ptrace-preempt-magic.patch featureset=rt -+ features/all/rt/arm-mark-pmu-interupt-no-thread.patch featureset=rt -+ features/all/rt/arm-allow-irq-threading.patch featureset=rt -+ features/all/rt/arm-convert-boot-lock-to-raw.patch featureset=rt -+ features/all/rt/arm-omap-make-wakeupgen_lock-raw.patch featureset=rt -+ features/all/rt/signals-do-not-wake-self.patch featureset=rt -+ features/all/rt/posix-timers-no-broadcast.patch featureset=rt -+ features/all/rt/signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch featureset=rt -+ features/all/rt/oleg-signal-rt-fix.patch featureset=rt -+ features/all/rt/generic-cmpxchg-use-raw-local-irq.patch featureset=rt -+ features/all/rt/drivers-random-reduce-preempt-disabled-region.patch featureset=rt -+ features/all/rt/arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch featureset=rt -+ features/all/rt/clocksource-tclib-allow-higher-clockrates.patch featureset=rt -+ features/all/rt/drivers-net-tulip-add-missing-pci-disable.patch featureset=rt -+ features/all/rt/drivers-net-8139-disable-irq-nosync.patch featureset=rt -+ features/all/rt/drivers-net-ehea-mark-rx-irq-no-thread.patch featureset=rt -+ features/all/rt/drivers-net-at91-make-mdio-protection-rt-safe.patch featureset=rt -+ features/all/rt/mm-prepare-pf-disable-discoupling.patch featureset=rt -+ features/all/rt/arch-use-pagefault-disabled.patch featureset=rt -+ features/all/rt/peter_zijlstra-frob-pagefault_disable.patch featureset=rt -+ features/all/rt/peterz-raw_pagefault_disable.patch featureset=rt -+ features/all/rt/filemap-fix-up.patch featureset=rt -+ features/all/rt/mm-remove-preempt-count-from-pf.patch featureset=rt -+ features/all/rt/x86-highmem-warn.patch featureset=rt -+ features/all/rt/suspend-prevernt-might-sleep-splats.patch featureset=rt -+ features/all/rt/of-fixup-recursive-locking.patch featureset=rt -+ features/all/rt/of-convert-devtree-lock.patch featureset=rt -+ features/all/rt/list-add-list-last-entry.patch featureset=rt -+ features/all/rt/mm-page-alloc-use-list-last-entry.patch featureset=rt -+ features/all/rt/mm-slab-move-debug-out.patch featureset=rt -+ features/all/rt/pid-h-include-atomic-h.patch featureset=rt -+ features/all/rt/sysctl-include-atomic-h.patch featureset=rt -+ features/all/rt/net-flip-lock-dep-thingy.patch featureset=rt -+ features/all/rt/softirq-thread-do-softirq.patch featureset=rt -+ features/all/rt/softirq-split-out-code.patch featureset=rt -+ features/all/rt/x86-io-apic-migra-no-unmask.patch featureset=rt -+ features/all/rt/fix-rt-int3-x86_32-3.2-rt.patch featureset=rt -+ features/all/rt/locking-various-init-fixes.patch featureset=rt -+ features/all/rt/pci-access-use-__wake_up_all_locked.patch featureset=rt -+ features/all/rt/latency-hist.patch featureset=rt -+ features/all/rt/hwlatdetect.patch featureset=rt -+ features/all/rt/localversion.patch featureset=rt -+ features/all/rt/early-printk-consolidate.patch featureset=rt -+ features/all/rt/printk-kill.patch featureset=rt -+ features/all/rt/printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch featureset=rt -+ features/all/rt/rt-preempt-base-config.patch featureset=rt -+ features/all/rt/bug-rt-dependend-variants.patch featureset=rt -+ features/all/rt/local-irq-rt-depending-variants.patch featureset=rt -+ features/all/rt/preempt-nort-rt-variants.patch featureset=rt -+ features/all/rt/ata-disable-interrupts-if-non-rt.patch featureset=rt -+ features/all/rt/ide-use-nort-local-irq-variants.patch featureset=rt -+ features/all/rt/infiniband-mellanox-ib-use-nort-irq.patch featureset=rt -+ features/all/rt/inpt-gameport-use-local-irq-nort.patch featureset=rt -+ features/all/rt/acpi-use-local-irq-nort.patch featureset=rt -+ features/all/rt/user-use-local-irq-nort.patch featureset=rt -+ features/all/rt/resource-counters-use-localirq-nort.patch featureset=rt -+ features/all/rt/usb-hcd-use-local-irq-nort.patch featureset=rt -+ features/all/rt/tty-use-local-irq-nort.patch featureset=rt -+ features/all/rt/mm-scatterlist-dont-disable-irqs-on-RT.patch featureset=rt -+ features/all/rt/signal-fix-up-rcu-wreckage.patch featureset=rt -+ features/all/rt/net-wireless-warn-nort.patch featureset=rt -+ features/all/rt/mm-cgroup-page-bit-spinlock.patch featureset=rt -+ features/all/rt/fs-replace-bh_uptodate_lock-for-rt.patch featureset=rt -+ features/all/rt/fs-jbd-replace-bh_state-lock.patch featureset=rt -+ features/all/rt/genirq-nodebug-shirq.patch featureset=rt -+ features/all/rt/genirq-disable-random-call-on-preempt-rt.patch featureset=rt -+ features/all/rt/genirq-disable-irqpoll-on-rt.patch featureset=rt -+ features/all/rt/genirq-force-threading.patch featureset=rt -+ features/all/rt/drivers-net-fix-livelock-issues.patch featureset=rt -+ features/all/rt/drivers-net-vortex-fix-locking-issues.patch featureset=rt -+ features/all/rt/drivers-net-gianfar-make-rt-aware.patch featureset=rt -+ features/all/rt/usb-fix-mouse-problem-copying-large-data.patch featureset=rt -+ features/all/rt/local-var.patch featureset=rt -+ features/all/rt/rt-local-irq-lock.patch featureset=rt -+ features/all/rt/cpu-rt-variants.patch featureset=rt -+ features/all/rt/mm-slab-wrap-functions.patch featureset=rt -+ features/all/rt/rt-slab-fix-__do_drain-to-use-the-right-array-cache.patch featureset=rt -+ features/all/rt/mm-slab-more-lock-breaks.patch featureset=rt -+ features/all/rt/mm-page_alloc-rt-friendly-per-cpu-pages.patch featureset=rt -+ features/all/rt/mm-page_alloc-reduce-lock-sections-further.patch featureset=rt -+ features/all/rt/mm-page-alloc-fix.patch featureset=rt -+ features/all/rt/mm-convert-swap-to-percpu-locked.patch featureset=rt -+ features/all/rt/mm-make-vmstat-rt-aware.patch featureset=rt -+ features/all/rt/mm-shrink-the-page-frame-to-rt-size.patch featureset=rt -+ features/all/rt/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch featureset=rt -+ features/all/rt/mm-allow-slab-rt.patch featureset=rt -+ features/all/rt/radix-tree-rt-aware.patch featureset=rt -+ features/all/rt/panic-disable-random-on-rt.patch featureset=rt -+ features/all/rt/ipc-make-rt-aware.patch featureset=rt -+ features/all/rt/ipc-mqueue-add-a-critical-section-to-avoid-a-deadlock.patch featureset=rt -+ features/all/rt/relay-fix-timer-madness.patch featureset=rt -+ features/all/rt/net-ipv4-route-use-locks-on-up-rt.patch featureset=rt -+ features/all/rt/workqueue-avoid-the-lock-in-cpu-dying.patch featureset=rt -+ features/all/rt/timers-prepare-for-full-preemption.patch featureset=rt -+ features/all/rt/timers-preempt-rt-support.patch featureset=rt -+ features/all/rt/timers-fix-timer-hotplug-on-rt.patch featureset=rt -+ features/all/rt/timers-mov-printk_tick-to-soft-interrupt.patch featureset=rt -+ features/all/rt/timer-delay-waking-softirqs-from-the-jiffy-tick.patch featureset=rt -+ features/all/rt/timers-avoid-the-base-null-otptimization-on-rt.patch featureset=rt -+ features/all/rt/rfc-printk-don-27t-call-printk_tick-in-printk_needs_cpu.patch featureset=rt -+ features/all/rt/hrtimers-prepare-full-preemption.patch featureset=rt -+ features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch featureset=rt -+ features/all/rt/peter_zijlstra-frob-hrtimer.patch featureset=rt -+ features/all/rt/hrtimer-add-missing-debug_activate-aid-was-re-announce-3-0-6-rt17.patch featureset=rt -+ features/all/rt/hrtimer-fix-reprogram-madness.patch featureset=rt -+ features/all/rt/timer-fd-avoid-live-lock.patch featureset=rt -+ features/all/rt/posix-timers-thread-posix-cpu-timers-on-rt.patch featureset=rt -+ features/all/rt/posix-timers-shorten-cpu-timers-thread.patch featureset=rt -+ features/all/rt/posix-timers-avoid-wakeups-when-no-timers-are-active.patch featureset=rt -+ features/all/rt/sched-delay-put-task.patch featureset=rt -+ features/all/rt/sched-limit-nr-migrate.patch featureset=rt -+ features/all/rt/sched-mmdrop-delayed.patch featureset=rt -+ features/all/rt/sched-rt-mutex-wakeup.patch featureset=rt -+ features/all/rt/sched-might-sleep-do-not-account-rcu-depth.patch featureset=rt -+ features/all/rt/sched-cond-resched.patch featureset=rt -+ features/all/rt/cond-resched-softirq-rt.patch featureset=rt -+ features/all/rt/cond-resched-lock-rt-tweak.patch featureset=rt -+ features/all/rt/sched-disable-ttwu-queue.patch featureset=rt -+ features/all/rt/sched-disable-rt-group-sched-on-rt.patch featureset=rt -+ features/all/rt/sched-ttwu-ensure-success-return-is-correct.patch featureset=rt -+ features/all/rt/stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch featureset=rt -+ features/all/rt/stomp-machine-mark-stomper-thread.patch featureset=rt -+ features/all/rt/stomp-machine-raw-lock.patch featureset=rt -+ features/all/rt/hotplug-light-get-online-cpus.patch featureset=rt -+ features/all/rt/hotplug-sync_unplug-no-27-5cn-27-in-task-name.patch featureset=rt -+ features/all/rt/re-migrate_disable-race-with-cpu-hotplug-3f.patch featureset=rt -+ features/all/rt/sched-migrate-disable.patch featureset=rt -+ features/all/rt/hotplug-use-migrate-disable.patch featureset=rt -+ features/all/rt/hotplug-call-cpu_unplug_begin-a-little-early.patch featureset=rt -+ features/all/rt/ftrace-migrate-disable-tracing.patch featureset=rt -+ features/all/rt/rt-tracing-show-padding-as-unsigned-short.patch featureset=rt -+ features/all/rt/migrate-disable-rt-variant.patch featureset=rt -+ features/all/rt/peter_zijlstra-frob-migrate_disable.patch featureset=rt -+ features/all/rt/peter_zijlstra-frob-migrate_disable-2.patch featureset=rt -+ features/all/rt/sched-rt-fix-migrate_enable-thinko.patch featureset=rt -+ features/all/rt/sched-teach-migrate_disable-about-atomic-contexts.patch featureset=rt -+ features/all/rt/rt-sched-postpone-actual-migration-disalbe-to-schedule.patch featureset=rt -+ features/all/rt/rt-sched-do-not-compare-cpu-masks-in-scheduler.patch featureset=rt -+ features/all/rt/rt-sched-have-migrate_disable-ignore-bounded-threads.patch featureset=rt -+ features/all/rt/sched-clear-pf-thread-bound-on-fallback-rq.patch featureset=rt -+ features/all/rt/ftrace-crap.patch featureset=rt -+ features/all/rt/rt-ring-buffer-convert-reader_lock-from-raw_spin_lock-into-spin_lock.patch featureset=rt -+ features/all/rt/net-netif_rx_ni-migrate-disable.patch featureset=rt -+ features/all/rt/softirq-sanitize-softirq-pending.patch featureset=rt -+ features/all/rt/lockdep-no-softirq-accounting-on-rt.patch featureset=rt -+ features/all/rt/mutex-no-spin-on-rt.patch featureset=rt -+ features/all/rt/softirq-local-lock.patch featureset=rt -+ features/all/rt/softirq-export-in-serving-softirq.patch featureset=rt -+ features/all/rt/harirq-h-define-softirq_count-as-oul-to-kill-build-warning.patch featureset=rt -+ features/all/rt/softirq-fix-unplug-deadlock.patch featureset=rt -+ features/all/rt/softirq-disable-softirq-stacks-for-rt.patch featureset=rt -+ features/all/rt/softirq-make-fifo.patch featureset=rt -+ features/all/rt/tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch featureset=rt -+ features/all/rt/irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch featureset=rt -+ features/all/rt/local-vars-migrate-disable.patch featureset=rt -+ features/all/rt/md-raid5-percpu-handling-rt-aware.patch featureset=rt -+ features/all/rt/rtmutex-lock-killable.patch featureset=rt -+ features/all/rt/rtmutex-futex-prepare-rt.patch featureset=rt -+ features/all/rt/futex-requeue-pi-fix.patch featureset=rt -+ features/all/rt/rt-mutex-add-sleeping-spinlocks-support.patch featureset=rt -+ features/all/rt/spinlock-types-separate-raw.patch featureset=rt -+ features/all/rt/rtmutex-avoid-include-hell.patch featureset=rt -+ features/all/rt/rt-add-rt-spinlock-to-headers.patch featureset=rt -+ features/all/rt/rt-add-rt-to-mutex-headers.patch featureset=rt -+ features/all/rt/rwsem-add-rt-variant.patch featureset=rt -+ features/all/rt/rt-add-rt-locks.patch featureset=rt -+ features/all/rt/tasklist-lock-fix-section-conflict.patch featureset=rt -+ features/all/rt/timer-handle-idle-trylock-in-get-next-timer-irq.patch featureset=rt -+ features/all/rt/rcu-force-preempt-rcu-for-rt.patch featureset=rt -+ features/all/rt/peter_zijlstra-frob-rcu.patch featureset=rt -+ features/all/rt/rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch featureset=rt -+ features/all/rt/rcu-fix-macro-substitution.patch featureset=rt -+ features/all/rt/rcu-tiny-merge-bh.patch featureset=rt -+ features/all/rt/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch featureset=rt -+ features/all/rt/rcu-fix-build-break.patch featureset=rt -+ features/all/rt/rt-rcutree-warn-fix.patch featureset=rt -+ features/all/rt/lglocks-rt.patch featureset=rt -+ features/all/rt/drivers-serial-cleanup-locking-for-rt.patch featureset=rt -+ features/all/rt/drivers-serial-call-flush_to_ldisc-when-the-irq-is-t.patch featureset=rt -+ features/all/rt/drivers-tty-fix-omap-lock-crap.patch featureset=rt -+ features/all/rt/rt-serial-warn-fix.patch featureset=rt -+ features/all/rt/fs-namespace-preemption-fix.patch featureset=rt -+ features/all/rt/mm-protect-activate-switch-mm.patch featureset=rt -+ features/all/rt/mm-protect-activate_mm-by-preempt_-disable-7cenable-_rt.patch featureset=rt -+ features/all/rt/fs-block-rt-support.patch featureset=rt -+ features/all/rt/fs-ntfs-disable-interrupt-non-rt.patch featureset=rt -+ features/all/rt/x86-mce-timer-hrtimer.patch featureset=rt -+ features/all/rt/x86-stackprot-no-random-on-rt.patch featureset=rt -+ features/all/rt/x86-use-gen-rwsem-spinlocks-rt.patch featureset=rt -+ features/all/rt/x86-disable-debug-stack.patch featureset=rt -+ features/all/rt/workqueue-use-get-cpu-light.patch featureset=rt -+ features/all/rt/epoll-use-get-cpu-light.patch featureset=rt -+ features/all/rt/mm-vmalloc-use-get-cpu-light.patch featureset=rt -+ features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch featureset=rt -+ features/all/rt/workqueue-sanity.patch featureset=rt -+ features/all/rt/workqueue-fix-PF_THREAD_BOUND.patch featureset=rt -+ features/all/rt/workqueue-hotplug-fix.patch featureset=rt -+ features/all/rt/workqueue-more-hotplug-fallout.patch featureset=rt -+ features/all/rt/debugobjects-rt.patch featureset=rt -+ features/all/rt/jump-label-rt.patch featureset=rt -+ features/all/rt/skbufhead-raw-lock.patch featureset=rt -+ features/all/rt/perf-move-irq-work-to-softirq-in-rt.patch featureset=rt -+ features/all/rt/console-make-rt-friendly.patch featureset=rt -+ features/all/rt/fix-printk-flush-of-messages-1.patch featureset=rt -+ features/all/rt/power-use-generic-rwsem-on-rt.patch featureset=rt -+ features/all/rt/power-disable-highmem-on-rt.patch featureset=rt -+ features/all/rt/arm-disable-highmem-on-rt.patch featureset=rt -+ features/all/rt/arm-at91-tclib-default-to-tclib-timer-for-rt.patch featureset=rt -+ features/all/rt/mips-disable-highmem-on-rt.patch featureset=rt -+ features/all/rt/net-tx-action-avoid-livelock-on-rt.patch featureset=rt -+ features/all/rt/ping-sysrq.patch featureset=rt -+ features/all/rt/kgb-serial-hackaround.patch featureset=rt -+ features/all/rt/sysfs-realtime-entry.patch featureset=rt -+ features/all/rt/peter_zijlstra-re-_3_0-rt4.patch featureset=rt -+ features/all/rt/ipc-sem-rework-semaphore-wakeups.patch featureset=rt -+ features/all/rt/x86-kvm-require-const-tsc-for-rt.patch featureset=rt -+ features/all/rt/scsi-fcoe-rt-aware.patch featureset=rt -+ features/all/rt/x86-crypto-reduce-preempt-disabled-regions.patch featureset=rt -+ features/all/rt/dm-make-rt-aware.patch featureset=rt -+ features/all/rt/cpumask-disable-offstack-on-rt.patch featureset=rt -+ features/all/rt/seqlock-prevent-rt-starvation.patch featureset=rt -+ features/all/rt/rfc-timer-fix-hotplug-for-rt.patch featureset=rt -+ features/all/rt/rfc-futex-rt-fix-possible-lockup-when-taking-pi_lock-in-proxy-handler.patch featureset=rt -+ features/all/rt/rfc-ring-buffer-rt-check-for-irqs-disabled-before-grabbing-reader-lock.patch featureset=rt -+ features/all/rt/rfc-sched-rt-fix-wait_task_interactive-to-test-rt_spin_lock-state.patch featureset=rt -+ features/all/rt/rfc-lglock-rt-use-non-rt-for_each_cpu-in-rt-code.patch featureset=rt -+ features/all/rt/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch featureset=rt -+ features/all/rt/softirq-preempt-fix-3-re.txt featureset=rt -+ features/all/rt/scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch featureset=rt -+ features/all/rt/upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch featureset=rt -+ features/all/rt/rt-introduce-cpu-chill.patch featureset=rt -+ features/all/rt/fs-dcache-use-cpu-chill-in-trylock-loops.patch featureset=rt -+ features/all/rt/net-use-cpu-chill.patch featureset=rt -+ features/all/rt/ntp-make-ntp-lock-raw-sigh.patch featureset=rt -+ features/all/rt/mips-remove-smp-reserve-lock.patch featureset=rt -+ features/all/rt/lockdep-selftest-convert-spinlock-to-raw-spinlock.patch featureset=rt -+ features/all/rt/lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch featureset=rt -+ features/all/rt/genirq-add-default-mask-cmdline-option.patch featureset=rt -+ features/all/rt/kconfig-disable-a-few-options-rt.patch featureset=rt -+ features/all/rt/kconfig-preempt-rt-full.patch featureset=rt diff --git a/debian/po/ca.po b/debian/po/ca.po index 38469ec3f..dd82e273b 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -1,12 +1,12 @@ -# Catalan translation of linux-2.6 debconf templates. +# Catalan translation of linux debconf templates. # Copyright © 2010 Software in the Public Interest, Inc. -# This file is distributed under the same license as linux-2.6's packaging. +# This file is distributed under the same license as linux's packaging. # Jordi Mallach <jordi@debian.org>, 2010. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-24\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-10-25 00:24+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" diff --git a/debian/po/cs.po b/debian/po/cs.po index 98bc7c9a3..69c3e4ab3 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -1,12 +1,12 @@ -# Czech PO debconf template translation of linux-2.6. +# Czech PO debconf template translation of linux. # Copyright (C) 2010 Michal Simunek <michal.simunek@gmail.com> -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Michal Simunek <michal.simunek@gmail.com>, 2010. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-18\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-07-25 10:32+0200\n" "PO-Revision-Date: 2010-07-26 18:02+0200\n" "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n" diff --git a/debian/po/da.po b/debian/po/da.po index 142f59d78..c1a08309b 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,11 +1,11 @@ -# Danish translation linux-2.6. -# Copyright (C) 2011 linux-2.6 & Joe Hansen. -# This file is distributed under the same license as the linux-2.6 package. +# Danish translation linux. +# Copyright (C) 2011 Joe Hansen. +# This file is distributed under the same license as the linux package. # Joe Hansen <joedalton2@yahoo.dk>, 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" +"Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-09 10:31+0200\n" "PO-Revision-Date: 2011-07-03 05:26+0100\n" diff --git a/debian/po/de.po b/debian/po/de.po index 5d689cdf2..de89b5483 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,12 +1,12 @@ -# Translation of linux-2.6 templates to german. +# Translation of linux templates to german. # Copyright (C) 2010 Holger Wansing. -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Holger Wansing <linux@wansing-online.de>, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.0.0-3\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2011-09-13 20:41+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" diff --git a/debian/po/es.po b/debian/po/es.po index b61ec98d8..c16a7268b 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,5 +1,5 @@ -# linux-2.6 po-debconf translation to Spanish -# This file is distributed under the same license as the linux-2.6 package. +# linux po-debconf translation to Spanish +# This file is distributed under the same license as the linux package. # # Changes: # - Initial translation @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32+5\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2011-07-16 17:59+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" diff --git a/debian/po/et.po b/debian/po/et.po index 8a4997558..4aa29f513 100644 --- a/debian/po/et.po +++ b/debian/po/et.po @@ -1,14 +1,14 @@ -# linux-2.6-debconf estonian translation -# linux-2.6-debconf eesti keele tõlge +# linux debconf estonian translation +# linux debconf eesti keele tõlge # Copyright (C) 2010 Debian GNU/Linux -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the linux package. # # mihkel <mihkel turakas com>, 2010. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6 2.6.32-11\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux 2.6.32-11\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-24 14:20+0300\n" "Last-Translator: mihkel <turakas gmail com>\n" diff --git a/debian/po/fr.po b/debian/po/fr.po index fef77fdef..f85d72667 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,6 +1,6 @@ -# Translation of linux-2.6 debconf templates to French +# Translation of linux debconf templates to French # Copyright (C) 2010, 2011 Debian French l10n team <debian-l10n-french@lists.debian.org> -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # David Prévot <david@tilapin.org>, 2010, 2011. msgid "" diff --git a/debian/po/it.po b/debian/po/it.po index 44978e5f9..0d0668c36 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,4 +1,4 @@ -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Collaboratively translated during an online sprint, thanks to all contributors! # Luca Bruno <lucab@debian.org>, 2010. # diff --git a/debian/po/ja.po b/debian/po/ja.po index 274ad7582..683eed3ab 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -1,12 +1,12 @@ # Copyright (C) 2010 Kenshi Muto <kmuto@debian.org> # Copyright (C) 2010 Nobuhiro Iwamatsu <iwamatsu@debian.org> -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Kenshi Muto <kmuto@debian.org>, 2010. # Nobuhiro Iwamatsu <iwamatsu@debian.org>, 2010. msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" +"Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-21 10:37+0200\n" "PO-Revision-Date: 2010-10-31 06:32+0900\n" diff --git a/debian/po/nl.po b/debian/po/nl.po index 2853f6ae6..439ccb294 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,12 +1,12 @@ -# Dutch translation of linux-2.6 po-debconf templates. -# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the linux-2.6 package. +# Dutch translation of linux po-debconf templates. +# Copyright (C) 2011 Willem Kuyn +# This file is distributed under the same license as the linux package. # Willem Kuyn <willemkuyn@gmail.com>, 2011. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2012-02-04 12:27+0100\n" "Last-Translator: willem kuyn <willemkuyn@gmail.com>\n" diff --git a/debian/po/pl.po b/debian/po/pl.po index 442bd4538..7f909ef66 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -1,12 +1,12 @@ -# Translation of linux-2.6 debconf templates to Polish. -# Copyright (C) 2011 -# This file is distributed under the same license as the linux-2.6 package. +# Translation of linux debconf templates to Polish. +# Copyright (C) 2011 Michał Kułach +# This file is distributed under the same license as the linux package. # # Michał Kułach <michal.kulach@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2012-02-05 18:38+0100\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" diff --git a/debian/po/pt.po b/debian/po/pt.po index b96992aae..a0df5f345 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,11 +1,11 @@ -# Translation of linux-2.6 debconf messages to Portuguese -# Copyright (C) 2010 the linux-2.6's copyright holder -# This file is distributed under the same license as the linux-2.6 package. +# Translation of linux debconf messages to Portuguese +# Copyright (C) 2010 Américo Monteiro +# This file is distributed under the same license as the linux package. # # Américo Monteiro <a_monteiro@netcabo.pt>, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: linux-2.6 2.6.39.1\n" +"Project-Id-Version: linux 2.6.39.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-05-21 10:31+0200\n" "PO-Revision-Date: 2011-05-22 23:53+0100\n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 59f6bbe9e..207999b3a 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,12 +1,12 @@ -# linux-2.6 Brazilian Portuguese debconf template translation. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the linux-2.6 package. +# linux Brazilian Portuguese debconf template translation. +# Copyright (C) 2010 Flamarion Jorge +# This file is distributed under the same license as the linux package. # Flamarion Jorge <jorge.flamarion@gmail.com>, 2010. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-09-19 10:42+0200\n" "PO-Revision-Date: 2010-10-02 12:29-0300\n" "Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n" diff --git a/debian/po/ru.po b/debian/po/ru.po index 3689975ca..892d0b171 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,12 +1,12 @@ -# translation of ru.po to Russian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the linux-2.6 package. +# translation of linux debconf templates to Russian +# Copyright (C) 2010, 2011 Yuri Kozlov +# This file is distributed under the same license as the linux package. # # Yuri Kozlov <yuray@komyakino.ru>, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.1.6-1\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2011-12-30 18:35+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" diff --git a/debian/po/sk.po b/debian/po/sk.po index a3327e012..70f87989a 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -1,13 +1,13 @@ -# Slovak translations for linux-2.6 package -# Slovenské preklady pre balík linux-2.6. -# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the linux-2.6 package. +# Slovak translations for linux package +# Slovenské preklady pre balík linux. +# Copyright (C) 2011 Slavko +# This file is distributed under the same license as the linux package. # Slavko <linux@slavino.sk>, 2011. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-29\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-06-09 10:31+0200\n" "PO-Revision-Date: 2011-07-10 09:19+0200\n" "Last-Translator: Slavko <linux@slavino.sk>\n" diff --git a/debian/po/sv.po b/debian/po/sv.po index 95a40547b..663c8e27b 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,12 +1,12 @@ -# Translation of linux-2.6 debconf template to Swedish +# Translation of linux debconf template to Swedish # Copyright (C) 2010 Martin Bagge <brother@bsnet.se> -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # Martin Bagge <brother@bsnet.se>, 2010 msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-05-21 10:31+0200\n" "PO-Revision-Date: 2011-06-02 14:52+0100\n" "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 4836b3d30..f30984077 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" diff --git a/debian/po/tr.po b/debian/po/tr.po index a5446c9ff..a049c68e1 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -1,12 +1,12 @@ -# Turkish translation of linux-2.6 debconf template. -# Copyright (C) 2012 -# This file is distributed under the same license as the linux-2.6 package. +# Turkish translation of linux debconf template. +# Copyright (C) 2012 Mert Dirik +# This file is distributed under the same license as the linux package. # Mert Dirik <mertdirik@gmail.com>, 2012. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.2.4-1\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2012-02-12 22:36+0200\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" diff --git a/debian/po/vi.po b/debian/po/vi.po index 350eb6d14..a1b920db8 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-26\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-10-21 10:37+0200\n" "PO-Revision-Date: 2010-10-27 15:21+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" diff --git a/debian/rules b/debian/rules index c73a62972..b7996c5ef 100755 --- a/debian/rules +++ b/debian/rules @@ -23,12 +23,8 @@ endif source: debian/control $(STAMPS_DIR)/source-base $(STAMPS_DIR)/source-base: dh_testdir - $(MAKE) -f debian/rules.gen source_$(DEB_HOST_ARCH) - @$(stamp) - -source-all: debian/control - dh_testdir $(MAKE) -f debian/rules.gen source + @$(stamp) setup: debian/control $(STAMPS_DIR)/setup-base $(STAMPS_DIR)/setup-base: $(STAMPS_DIR)/source-base @@ -58,12 +54,12 @@ else endif maintainerclean: - rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen debian/bin/patch.* + rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*)) clean: debian/control dh_testdir - rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/linux-patch-debian-* debian/xen-linux-system-* debian/*-modules-*-di* + rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/xen-linux-system-* debian/*-modules-*-di* dh_clean binary-indep: $(STAMPS_DIR)/source-base diff --git a/debian/rules.real b/debian/rules.real index 6f05269ed..18ffdcd75 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -48,7 +48,6 @@ endif binary-indep: install-doc binary-indep: install-manual -binary-indep: install-patch binary-indep: install-source binary-indep: install-support @@ -56,8 +55,7 @@ build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE) setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR) -source-arch: $(STAMPS_DIR)/source -source-featureset: $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET) +source-featureset: $(STAMPS_DIR)/source_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG) python debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS) @@ -84,18 +82,18 @@ $(STAMPS_DIR)/source: $(patch_cmd) @$(stamp) -$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source -$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET) -$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source +$(STAMPS_DIR)/source_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source +$(STAMPS_DIR)/source_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(FEATURESET) +$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source rm -rf '$(DIR)' cp -al '$(SOURCE_DIR)' '$(DIR)' - $(patch_cmd) -a $(ARCH) -f $(FEATURESET) + $(patch_cmd) -f $(FEATURESET) @$(stamp) $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR) -$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET) +$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source_$(FEATURESET) $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) -$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR) +$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/source_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR) rm -rf '$(DIR)' mkdir '$(DIR)' cp '$(CONFIG)' '$(DIR)/.config' @@ -196,9 +194,9 @@ install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME = linux-headers-$(ABINAME)-c install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION) install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME) install-headers_$(ARCH)_$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME) -install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR = $(BUILD_DIR)/source_$(ARCH)_$(FEATURESET) +install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR = $(BUILD_DIR)/source_$(FEATURESET) install-headers_$(ARCH)_$(FEATURESET): DIR = debian/$(PACKAGE_NAME)/$(BASE_DIR) -install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET) +install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(FEATURESET) dh_testdir dh_testroot dh_prep @@ -227,7 +225,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR_COMMON = /usr/src/$(PACKAGE_NAME_COMMON) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) -install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source_$(ARCH)_$(FEATURESET) +install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source_$(FEATURESET) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE) @@ -471,21 +469,6 @@ install-udeb_$(ARCH): dh_gencontrol dh_builddeb -install-patch: PACKAGE = linux-patch-debian-$(VERSION) -install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAMVERSION) -install-patch: pfull := debian/$(PACKAGE)$(pbase) -install-patch: DH_OPTIONS = -p$(PACKAGE) -install-patch: - dh_testdir - dh_testroot - dh_prep - dh_installdirs '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch' - dh_install -X.svn debian/patches/* '$(pbase)/debian' - install debian/bin/patch.apply '$(pfull)/apply/debian' - install debian/templates/patch.unpatch '$(pfull)/unpatch/debian' - find '$(pfull)/debian' ! -path '*/series/*' -type f -execdir bzip2 '{}' ';' -execdir chmod 644 '{}.bz2' ';' - +$(MAKE_SELF) install-base - install-source: DH_OPTIONS = -plinux-source-$(VERSION) install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 dh_testdir diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index c3bed04bf..aa5328200 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -41,19 +41,6 @@ Description: Linux kernel API manual pages for version @version@ may be installed at a time. The linux-doc package containing the documentation in other formats is free from such restriction. -Package: linux-patch-debian-@version@ -Architecture: all -Depends: bzip2, linux-support-@abiname@, python, ${misc:Depends} -Suggests: linux-source-@version@ -Description: Debian patches to version @version@ of the Linux kernel - This package includes the patches used to produce the prepackaged - linux-source-@version@ package, as well as architecture-specific - patches. - . - Note that these patches do NOT apply against a pristine - Linux @version@ kernel but only against the kernel tarball - @source_package@_@source_upstream@.orig.tar.gz from the Debian archive. - Package: linux-support-@abiname@ Architecture: all Section: devel diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index f6524ab19..d854fcbef 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org> Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk> Standards-Version: 3.9.2 -Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83) +Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83) Build-Depends-Indep: bzip2, xmlto -Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-2.6/ -Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-2.6/ +Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/ +Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/ diff --git a/debian/templates/image.plain.bug/control b/debian/templates/image.plain.bug/control index 2b3b239d9..5468d73ab 100644 --- a/debian/templates/image.plain.bug/control +++ b/debian/templates/image.plain.bug/control @@ -1,2 +1,2 @@ -Submit-As: linux-2.6 +Submit-As: src:linux Package-Status: firmware-atheros firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-intelwimax firmware-ipw2x00 firmware-ivtv firmware-iwlwifi firmware-libertas firmware-linux firmware-linux-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-ralink firmware-realtek xen-hypervisor diff --git a/debian/templates/patch.apply.in b/debian/templates/patch.apply.in deleted file mode 100644 index 10e0b78a8..000000000 --- a/debian/templates/patch.apply.in +++ /dev/null @@ -1,228 +0,0 @@ -#!/usr/bin/env python - -import os, os.path, re, sys -from warnings import warn - -sys.path.append("/usr/share/linux-support-@abiname@/lib/python") - -from debian_linux.patches import PatchSeries, PatchSeriesList - -_default_home = "/usr/src/kernel-patches/all/@linux_upstream@/debian" -revisions = "@revisions@".split() -upstream = "@upstream@" - -class MatchExtra(object): - def __init__(self, arch, featureset): - self.arch, self.featureset = arch, featureset - - self.matched_arch = self.matched_featureset = False - - def __call__(self, obj): - if not self: - return False - - data = obj.data - - match_arch = [] - match_featureset = [] - for i in data: - if i.startswith("arch="): - match_arch.append(i[5:]) - elif i.startswith("featureset="): - match_featureset.append(i[11:]) - else: - raise RuntimeError('Ignored unknown modifier: %s' % i) - - ret_arch = ret_featureset = False - - if match_arch: - if self.arch is not None: - if self.arch in match_arch: - self.matched_arch = True - ret_arch = True - - else: - ret_arch = True - - if match_featureset: - if self.featureset is not None: - if self.featureset in match_featureset: - self.matched_featureset = True - ret_featureset = True - - else: - ret_featureset = True - - return ret_arch and ret_featureset - - def __nonzero__(self): - return self.arch is not None or self.featureset is not None - - def info(self): - ret = [] - if self.matched_arch: - ret.append("arch=%s" % self.arch) - if self.matched_featureset: - ret.append("featureset=%s" % self.featureset) - return ret - -_marker = object() - -class version_file(object): - _file = 'version.Debian' - extra = None - in_progress = False - - def __init__(self, upstream = None): - if os.path.exists(self._file): - s = file(self._file).readline().strip() - self._read(s) - elif upstream: - warn('No %s file, assuming Debian Linux %s' % (self._file, upstream)) - self.upstream = upstream - self.revision = 'orig' - else: - raise RuntimeError, "Not possible to determine version" - - def __str__(self): - if self.in_progress: - return "unstable" - ret = [self.upstream, self.revision] - if self.extra is not None: - ret.extend(self.extra.info()) - return ' '.join(ret) - - def _read(self, s): - if s == 'unstable': - raise RuntimeError("Tree is in an unstable condition. Can't continue!") - list = s.split() - self.upstream, self.revision = list[0:2] - - arch = featureset = None - for i in list[2:]: - if i.startswith("arch="): - arch = i[5:] - elif i.startswith("featureset="): - featureset = i[11:] - else: - raise RuntimeError("Can't parse extra information") - self.extra = MatchExtra(arch, featureset) - - def _write(self): - if os.path.lexists(self._file): - os.unlink(self._file) - file(self._file, 'w').write('%s\n' % self) - - def begin(self): - self.in_progress = True - self._write() - - def commit(self, revision, extra = _marker): - self.in_progress = False - self.revision = revision - if extra is not _marker: - self.extra = extra - self._write() - -def main(): - options, args = parse_options() - - if len(args) > 1: - print "Too much arguments" - return - - home = options.home - - vfile = version_file(upstream) - current_revision = vfile.revision - current_extra = vfile.extra - - if len(args) == 1: - target_revision = args[0] - else: - target_revision = revisions[-1] - target_extra = MatchExtra(options.arch, options.featureset) - - if vfile.upstream != upstream: - raise RuntimeError("Upstream version differs between tree (%s) and package (%s)" % (vfile.upstream, upstream)) - if current_revision not in revisions: - raise RuntimeError, "Current revision is not in our list of revisions" - if target_revision not in revisions: - raise RuntimeError, "Target revision is not in our list of revisions" - - if current_revision == target_revision and current_extra == target_extra: - print "Nothing to do" - return - - current_index = revisions.index(current_revision) - target_index = revisions.index(target_revision) - - if current_extra: - if current_revision != revisions[-1]: - raise RuntimeError, "Can't patch from %s with options %s" % (current, ' '.join(current_extra)) - consider = ['%s-extra' % i for i in revisions[1:current_index + 1]] - s = PatchSeriesList.read(home, consider) - vfile.begin() - s(cond = current_extra, reverse = True) - vfile.commit(current_revision, None) - - if current_index < target_index: - consider = revisions[current_index + 1:target_index + 1] - s = PatchSeriesList.read(home, consider) - vfile.begin() - s() - vfile.commit(target_revision) - elif current_index > target_index: - consider = revisions[target_index + 1:current_index + 1] - s = PatchSeriesList.read(home, consider) - vfile.begin() - s(reverse = True) - vfile.commit(target_revision) - - if target_extra: - consider = ['%s-extra' % i for i in revisions[1:target_index + 1]] - s = PatchSeriesList.read(home, consider) - vfile.begin() - s(cond = target_extra) - vfile.commit(target_revision, target_extra) - -def parse_options(): - from optparse import OptionParser - parser = OptionParser( - usage = "%prog [OPTION]... [TARGET]", - ) - parser.add_option( - '-a', '--arch', - dest = 'arch', - help = "arch", - ) - parser.add_option( - '-f', '--featureset', - dest = 'featureset', - help = "featureset", - ) - parser.add_option( - '-H', '--overwrite-home', - default = _default_home, dest = 'home', - help = "overwrite home [default: %default]", - ) - - options, args = parser.parse_args() - - if options.arch is None and options.featureset is not None: - raise RuntimeError('You specified a featureset without an arch, this is not really working') - - return options, args - -if __name__ == '__main__': - def showwarning(message, category, filename, lineno, - file=sys.stderr, line=''): - file.write("Warning: %s\n" % message) - import warnings - warnings.showwarning = showwarning - try: - main() - except RuntimeError, e: - sys.stderr.write("Error: %s\n" % e) - raise SystemExit, 1 - diff --git a/debian/templates/patch.unpatch b/debian/templates/patch.unpatch deleted file mode 100644 index 51401d9fd..000000000 --- a/debian/templates/patch.unpatch +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e - -exec "$(dirname $0)/../apply/debian" orig |