prepare 2.6.31~rc4-rt1-1debian-pristine-2.6.31-rc4-rt1

18 files changed, 33 insertions, 261 deletions

diff --git a/changelog b/changelog
index 7ac4acb..48b544a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.31~rc4-rt1-1) unstable; urgency=low
+
+  * disable all patches but the ones required for package building.
+  * disable CONFIG_STAGING
+
+ -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de>  Tue, 11 Aug 2009 15:42:34 +0200
+
 linux-2.6 (2.6.31~rc5-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/config/config b/config/config
index 455c9c2..538e692 100644
--- a/config/config
+++ b/config/config
@@ -2809,9 +2809,10 @@ CONFIG_PM_STD_PARTITION=""
 ## file: kernel/Kconfig.preempt
 ##
 ## choice: Preemption Model
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_RT=y
 ## end choice
 
 ##
diff --git a/config/defines b/config/defines
index b78f391..07c0e24 100644
--- a/config/defines
+++ b/config/defines
@@ -1,5 +1,5 @@
 [abi]
-abiname: trunk
+abiname: 1
 
 [base]
 arches:
diff --git a/config/kernelarch-x86/config b/config/kernelarch-x86/config
index c9ca7be..75b333e 100644
--- a/config/kernelarch-x86/config
+++ b/config/kernelarch-x86/config
@@ -213,213 +213,6 @@ CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
 
 ##
-## file: drivers/staging/Kconfig
-##
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-
-##
-## file: drivers/staging/agnx/Kconfig
-##
-# CONFIG_AGNX is not set
-
-##
-## file: drivers/staging/altpciechdma/Kconfig
-##
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-
-##
-## file: drivers/staging/android/Kconfig
-##
-# CONFIG_ANDROID is not set
-# CONFIG_ANDROID_BINDER_IPC is not set
-# CONFIG_ANDROID_LOGGER is not set
-# CONFIG_ANDROID_RAM_CONSOLE is not set
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-
-##
-## file: drivers/staging/asus_oled/Kconfig
-##
-# CONFIG_ASUS_OLED is not set
-
-##
-## file: drivers/staging/at76_usb/Kconfig
-##
-# CONFIG_USB_ATMEL is not set
-
-##
-## file: drivers/staging/b3dfg/Kconfig
-##
-# CONFIG_B3DFG is not set
-
-##
-## file: drivers/staging/comedi/Kconfig
-##
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-
-##
-## file: drivers/staging/cpc-usb/Kconfig
-##
-# CONFIG_USB_CPC is not set
-
-##
-## file: drivers/staging/dst/Kconfig
-##
-# CONFIG_DST is not set
-
-##
-## file: drivers/staging/echo/Kconfig
-##
-# CONFIG_ECHO is not set
-
-##
-## file: drivers/staging/epl/Kconfig
-##
-# CONFIG_EPL is not set
-
-##
-## file: drivers/staging/et131x/Kconfig
-##
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-
-##
-## file: drivers/staging/frontier/Kconfig
-##
-# CONFIG_TRANZPORT is not set
-
-##
-## file: drivers/staging/go7007/Kconfig
-##
-# CONFIG_VIDEO_GO7007 is not set
-
-##
-## file: drivers/staging/heci/Kconfig
-##
-# CONFIG_HECI is not set
-
-##
-## file: drivers/staging/line6/Kconfig
-##
-# CONFIG_LINE6_USB is not set
-
-##
-## file: drivers/staging/me4000/Kconfig
-##
-# CONFIG_ME4000 is not set
-
-##
-## file: drivers/staging/meilhaus/Kconfig
-##
-# CONFIG_MEILHAUS is not set
-
-##
-## file: drivers/staging/mimio/Kconfig
-##
-# CONFIG_INPUT_MIMIO is not set
-
-##
-## file: drivers/staging/otus/Kconfig
-##
-# CONFIG_OTUS is not set
-
-##
-## file: drivers/staging/p9auth/Kconfig
-##
-# CONFIG_PLAN9AUTH is not set
-
-##
-## file: drivers/staging/panel/Kconfig
-##
-# CONFIG_PANEL is not set
-
-##
-## file: drivers/staging/pata_rdc/Kconfig
-##
-# CONFIG_RDC_17F3101X is not set
-
-##
-## file: drivers/staging/phison/Kconfig
-##
-# CONFIG_IDE_PHISON is not set
-
-##
-## file: drivers/staging/poch/Kconfig
-##
-# CONFIG_POCH is not set
-
-##
-## file: drivers/staging/pohmelfs/Kconfig
-##
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-
-##
-## file: drivers/staging/rt2860/Kconfig
-##
-CONFIG_RT2860=m
-
-##
-## file: drivers/staging/rt2870/Kconfig
-##
-CONFIG_RT2870=m
-
-##
-## file: drivers/staging/rt3070/Kconfig
-##
-CONFIG_RT3070=m
-
-##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-CONFIG_RTL8187SE=m
-
-##
-## file: drivers/staging/serqt_usb2/Kconfig
-##
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-
-##
-## file: drivers/staging/slicoss/Kconfig
-##
-# CONFIG_SLICOSS is not set
-
-##
-## file: drivers/staging/stlc45xx/Kconfig
-##
-# CONFIG_STLC45XX is not set
-
-##
-## file: drivers/staging/sxg/Kconfig
-##
-# CONFIG_SXG is not set
-
-##
-## file: drivers/staging/udlfb/Kconfig
-##
-# CONFIG_FB_UDL is not set
-
-##
-## file: drivers/staging/usbip/Kconfig
-##
-# CONFIG_USB_IP_COMMON is not set
-
-##
-## file: drivers/staging/winbond/Kconfig
-##
-# CONFIG_W35UND is not set
-
-##
-## file: drivers/staging/wlan-ng/Kconfig
-##
-CONFIG_PRISM2_USB=m
-
-##
 ## file: drivers/video/Kconfig
 ##
 CONFIG_XEN_FBDEV_FRONTEND=y
diff --git a/lib/python/debian_linux/debian.py b/lib/python/debian_linux/debian.py
index e4f01e5..781ea47 100644
--- a/lib/python/debian_linux/debian.py
+++ b/lib/python/debian_linux/debian.py
@@ -102,7 +102,7 @@ class VersionLinux(Version):
 (?P<version>
     (?P<major>\d+\.\d+)
     \.
-    \d+
+    .+?
 )
 (?:
     ~
diff --git a/patches/series/base b/patches/series/base
index 4f33e03..020903c 100644
--- a/patches/series/base
+++ b/patches/series/base
@@ -2,31 +2,3 @@
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
 + debian/scripts-kconfig-reportoldconfig.patch
-
-+ debian/drivers-ata-ata_piix-postpone-pata.patch
-+ debian/drivers-ata-pata_sis-postpone-pata.patch
-
-+ features/all/drivers-gpu-drm-mga-request_firmware.patch
-+ features/all/drivers-gpu-drm-r128-request_firmware.patch
-+ features/all/drivers-gpu-drm-radeon-request_firmware.patch
-+ features/all/drivers-net-cxgb3-request_firmware.patch
-# rt2860sta and rt2870sta need ITU-T CRC on bit-reversed data
-+ features/all/lib-crcitut-bit-reversed.patch
-+ features/all/drivers-staging-rt28x0sta-request_firmware.patch
-+ features/all/export-unionfs-symbols.patch
-
-+ bugfix/sparc/drivers_net-broken.patch
-#+ bugfix/ia64/hardcode-arch-script-output.patch
-+ bugfix/mips/disable-advansys.patch
-+ bugfix/arm/disable-scsi_acard.patch
-+ bugfix/mips/disable-werror.patch
-+ bugfix/fix-hifn_795X-divdi3.patch
-+ bugfix/powerpc/mm-mol.patch
-+ bugfix/powerpc/lpar-console.patch
-#+ bugfix/all/wireless-regulatory-default-EU.patch
-#+ features/sparc/video-sunxvr500-intergraph.patch
-#+ bugfix/sparc/arch-zimage-target.patch
-### stuff that will hopefully be fixed in the next rc
-#+ bugfix/arm/export-flush_dcache_page.patch
-+ bugfix/all/add-missing-mtd-include.patch
-+ bugfix/mips/fix-smp.patch
diff --git a/rules.real b/rules.real
index af1766c..8875302 100644
--- a/rules.real
+++ b/rules.real
@@ -454,7 +454,7 @@ install-tree: DH_OPTIONS = -plinux-tree-$(VERSION)
 install-tree:
 	+$(MAKE_SELF) install-dummy DH_OPTIONS='$(DH_OPTIONS)'
 
-install-firmware: PACKAGE_NAME = firmware-linux-free
+install-firmware: PACKAGE_NAME = firmware-linux
 install-firmware: DIR = $(BUILD_DIR)/build-firmware
 install-firmware: SOURCE_DIR = $(BUILD_DIR)/source
 install-firmware: PACKAGE_DIR = debian/$(PACKAGE_NAME)
diff --git a/templates/control.headers.in b/templates/control.headers.in
index c0e8513..bd1769c 100644
--- a/templates/control.headers.in
+++ b/templates/control.headers.in
@@ -1,6 +1,6 @@
 Package: linux-headers-@upstreamversion@@abiname@@localversion@
 Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@
-Provides: linux-headers, linux-headers-@major@
+Provides: linux-headers, linux-headers-@major@, linux-headers-rt, linux-headers-@major@-rt
 Description: Header files for Linux @upstreamversion@@abiname@@localversion@
  This package provides the architecture-specific kernel header files
  for Linux kernel @upstreamversion@@abiname@@localversion@, generally
diff --git a/templates/control.image.type-kernel-package.in b/templates/control.image.type-kernel-package.in
index b3f27b0..0d50291 100644
--- a/templates/control.image.type-kernel-package.in
+++ b/templates/control.image.type-kernel-package.in
@@ -1,5 +1,5 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
+Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@, linux-image-@major@-rt
 Pre-Depends: debconf | debconf-2.0
 Depends: module-init-tools
 Suggests: linux-doc-@version@
diff --git a/templates/control.image.type-modulesextra.in b/templates/control.image.type-modulesextra.in
index bc6d1d8..adc01a5 100644
--- a/templates/control.image.type-modulesextra.in
+++ b/templates/control.image.type-modulesextra.in
@@ -1,5 +1,5 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image-@major@
+Provides: linux-image, linux-image-@major@, linux-image-@major@-rt
 Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
 Suggests: linux-doc-@version@
 Description: Linux @upstreamversion@ image on @class@
diff --git a/templates/control.image.type-modulesinline.in b/templates/control.image.type-modulesinline.in
index 2151ce0..379c44b 100644
--- a/templates/control.image.type-modulesinline.in
+++ b/templates/control.image.type-modulesinline.in
@@ -1,5 +1,5 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
+Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@, linux-image-@major@-rt
 Depends: module-init-tools
 Suggests: linux-doc-@version@
 Description: Linux @upstreamversion@ image on @class@
diff --git a/templates/control.image.type-plain.in b/templates/control.image.type-plain.in
index 92a96ba..eac171d 100644
--- a/templates/control.image.type-plain.in
+++ b/templates/control.image.type-plain.in
@@ -1,8 +1,8 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
+Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@, linux-image-@major@-rt
 Pre-Depends: debconf | debconf-2.0
 Depends: module-init-tools, ${shlibs:Depends}
-Recommends: firmware-linux-free (>= @source_upstream@)
+Recommends: firmware-linux (>= @source_upstream@)
 Suggests: linux-doc-@version@
 Description: Linux @upstreamversion@ image on @class@
  This package provides the binary image and pre-built loadable modules for
diff --git a/templates/control.image.type-standalone.in b/templates/control.image.type-standalone.in
index 8add82a..bd62948 100644
--- a/templates/control.image.type-standalone.in
+++ b/templates/control.image.type-standalone.in
@@ -1,5 +1,5 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image-@major@
+Provides: linux-image, linux-image-@major@, linux-image-@major@-rt
 Suggests: linux-doc-@version@
 Depends: ${shlibs:Depends}
 Description: Linux @upstreamversion@ image on @class@
diff --git a/templates/control.libc-dev.in b/templates/control.libc-dev.in
index 6e4a805..157b92b 100644
--- a/templates/control.libc-dev.in
+++ b/templates/control.libc-dev.in
@@ -1,5 +1,5 @@
 Package: linux-libc-dev
-Section: devel
+Section: non-free/devel
 Provides: linux-kernel-headers
 Replaces: linux-kernel-headers, libdrm-dev (<= 2.4.5-1)
 Conflicts: linux-kernel-headers
diff --git a/templates/control.main.in b/templates/control.main.in
index 59adabe..4a5130b 100644
--- a/templates/control.main.in
+++ b/templates/control.main.in
@@ -1,7 +1,7 @@
 Package: linux-source-@version@
 Architecture: all
-Section: kernel
-Provides: linux-source, linux-source-@major@
+Section: non-free/kernel
+Provides: linux-source, linux-source-@major@, linux-source-@major@-rt
 Depends: binutils, bzip2
 Recommends: libc6-dev | libc-dev, gcc, make
 Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
@@ -19,7 +19,7 @@ Description: Linux kernel source for version @version@ with Debian patches
 
 Package: linux-doc-@version@
 Architecture: all
-Section: doc
+Section: non-free/doc
 Provides: linux-doc-@major@
 Description: Linux kernel specific documentation for version @version@
  This package provides the various README files and HTML documentation for
@@ -31,7 +31,7 @@ Description: Linux kernel specific documentation for version @version@
 
 Package: linux-manual-@version@
 Architecture: all
-Section: doc
+Section: non-free/doc
 Provides: linux-manual, kernel-manual-@major@
 Conflicts: linux-manual, kernel-manual-@major@
 Replaces: linux-manual, kernel-manual-@major@
@@ -58,12 +58,10 @@ Description: Debian patches to version @version@ of the Linux kernel
  Linux @version@ kernel but only against the kernel tarball
  linux-@major@_@source_upstream@.orig.tar.gz from the Debian archive.
 
-Package: firmware-linux-free
+Package: firmware-linux
 Architecture: all
 Description: Binary firmware for various drivers in the Linux kernel
  This package contains firmware which was previously included in the
- Linux kernel and which is compliant with the Debian Free Software
- Guidelines.
+ Linux kernel.
  .
- Most firmware previously included in the Linux kernel is non-free
- and has been moved to the firmware-linux-nonfree package.
+ Most firmware included in the Linux kernel is non-free.
diff --git a/templates/control.source.in b/templates/control.source.in
index 3f47743..f2d851e 100644
--- a/templates/control.source.in
+++ b/templates/control.source.in
@@ -1,8 +1,9 @@
-Section: kernel
+Section: non-free/kernel
 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>
+Maintainer: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 Standards-Version: 3.8.2
 Build-Depends: debhelper (>> 7), module-init-tools, python
 Build-Depends-Indep: bzip2, python-central, xmlto
 XS-Python-Version: current
+Origin: pengutronix.de
+Bugs: mailto:kernel@pengutronix.de
diff --git a/templates/control.support.in b/templates/control.support.in
index b86f870..898386b 100644
--- a/templates/control.support.in
+++ b/templates/control.support.in
@@ -1,6 +1,6 @@
 Package: linux-support-@upstreamversion@@abiname@
 Architecture: all
-Section: devel
+Section: non-free/devel
 Depends: ${python:Depends}
 Description: Support files for Linux @upstreamversion@
  This package provides support files for the Linux kernel build.
diff --git a/templates/control.tree.in b/templates/control.tree.in
index 517c439..68f6a67 100644
--- a/templates/control.tree.in
+++ b/templates/control.tree.in
@@ -1,6 +1,6 @@
 Package: linux-tree-@version@
 Architecture: all
-Section: devel
+Section: non-free/devel
 Description: Linux kernel source tree for building Debian kernel images
  This metapackage is used as a build dependency of Debian
  linux-image packages to prevent a version discrepancy between