prepare 2.6.33~rc8-rt1-1debian-pristine-2.6.33-rc8-rt1

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

14 files changed, 31 insertions, 290 deletions

diff --git a/changelog b/changelog
index cfb1c4c..c97a758 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.33~rc8-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>  Mon, 22 Feb 2010 10:46:19 +0100
+
 linux-2.6 (2.6.33~rc8-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/config/config b/config/config
index a5a4b74..21b27e6 100644
--- a/config/config
+++ b/config/config
@@ -2170,220 +2170,6 @@ CONFIG_SSB=m
 # CONFIG_SSB_DEBUG is not set
 
 ##
-## file: drivers/staging/Kconfig
-##
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD 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/b3dfg/Kconfig
-##
-# CONFIG_B3DFG is not set
-
-##
-## file: drivers/staging/comedi/Kconfig
-##
-# CONFIG_COMEDI is not set
-
-##
-## file: drivers/staging/cx25821/Kconfig
-##
-# CONFIG_VIDEO_CX25821 is not set
-
-##
-## file: drivers/staging/dream/Kconfig
-##
-# CONFIG_INPUT_GPIO 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/et131x/Kconfig
-##
-# CONFIG_ET131X 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/hv/Kconfig
-##
-# CONFIG_HYPERV is not set
-
-##
-## file: drivers/staging/iio/Kconfig
-##
-# CONFIG_IIO is not set
-
-##
-## file: drivers/staging/line6/Kconfig
-##
-# CONFIG_LINE6_USB 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/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 is not set
-
-##
-## file: drivers/staging/quatech_usb2/Kconfig
-##
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-
-##
-## file: drivers/staging/rar/Kconfig
-##
-# CONFIG_RAR_REGISTER is not set
-
-##
-## file: drivers/staging/rt2860/Kconfig
-##
-# CONFIG_RT2860 is not set
-
-##
-## file: drivers/staging/rt2870/Kconfig
-##
-# CONFIG_RT2870 is not set
-
-##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-# CONFIG_RTL8187SE is not set
-
-##
-## file: drivers/staging/rtl8192e/Kconfig
-##
-# CONFIG_RTL8192E is not set
-
-##
-## 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/speakup/Kconfig
-##
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-
-##
-## 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/vme/Kconfig
-##
-# CONFIG_VME_BUS is not set
-
-##
-## file: drivers/staging/vt6655/Kconfig
-##
-# CONFIG_VT6655 is not set
-
-##
-## file: drivers/staging/vt6656/Kconfig
-##
-# CONFIG_VT6656 is not set
-
-##
-## file: drivers/staging/winbond/Kconfig
-##
-# CONFIG_W35UND is not set
-
-##
-## file: drivers/staging/wlan-ng/Kconfig
-##
-# CONFIG_PRISM2_USB is not set
-
-##
 ## file: drivers/uio/Kconfig
 ##
 CONFIG_UIO=m
@@ -3293,8 +3079,9 @@ CONFIG_PM_RUNTIME=y
 ##
 ## choice: Preemption Model
 # CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_RT=y
 ## end choice
 
 ##
diff --git a/config/defines b/config/defines
index 7381abb..6c2cf69 100644
--- a/config/defines
+++ b/config/defines
@@ -1,5 +1,5 @@
 [abi]
-abiname: 2
+abiname: 1
 
 [base]
 arches:
diff --git a/patches/series/base b/patches/series/base
index 1734d9d..020903c 100644
--- a/patches/series/base
+++ b/patches/series/base
@@ -2,55 +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-infiniband-hw-ipath-iba7220-use-request_firmware.patch
-+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
-
-+ features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
-+ features/all/rt28x0sta-use-request_firmware.patch
-+ features/all/lgs8gxx-lgs8g75-request_firmware.patch
-+ features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
-+ features/all/sound-pci-cs46xx-request_firmware.patch
-
-+ features/all/module-firmware/0025-tty-declare-MODULE_FIRMWARE-in-various-drivers.patch
-+ features/all/module-firmware/0026-staging-declare-MODULE_FIRMWARE-in-various-drivers.patch
-+ features/all/module-firmware/0027-sep-include-driver-name-in-firmware-filenames.patch
-+ features/all/module-firmware/0028-sep-declare-MODULE_FIRMWARE.patch
-+ features/all/module-firmware/0029-isight-firmware-declare-MODULE_FIRMWARE.patch
-
-# FIXME: 2.6.33 tree
-# patches from aufs2 repository, with s/EXPORT_SYMBOL/&_GPL/
-
-# content of src/ from speakup package; generated with:
-# diff -ur --unidirectional-new-file nonexistent src | filterdiff --strip=1 --addoldprefix=a/drivers/staging/speakup/ --addnewprefix=b/drivers/staging/speakup/
-+ features/all/speakup/speakup-add.patch
-+ features/all/speakup/speakup-kbuild.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/powerpc/lpar-console.patch
-#+ bugfix/all/wireless-regulatory-default-EU.patch
-+ features/sparc/video-sunxvr500-intergraph.patch
-+ bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch 
-+ debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
-+ features/arm/compression-add-lzma.patch
-+ features/arm/openrd-client.patch
-
-+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
-
-+ bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
-
-+ bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch
-
-+ bugfix/x86/kvm-fix-memory-access-during-x86-emulation.patch
-+ bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch
-+ bugfix/x86/kvm-Fix-popf-emulation.patch
-+ bugfix/x86/kvm-Check-CPL-level-during-privilege-instruction-emulation.patch
-
-+ debian/sysrq-mask.patch
-+ bugfix/all/efifb_fix_v2.patch
diff --git a/rules.real b/rules.real
index 29534e5..a04ab53 100644
--- a/rules.real
+++ b/rules.real
@@ -455,7 +455,7 @@ install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
 	dh_install '$<' /usr/src
 	+$(MAKE_SELF) install-base
 
-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 d35c4a5..1c16672 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 4981930..33aab24 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@ for @class@
diff --git a/templates/control.image.type-modulesinline.in b/templates/control.image.type-modulesinline.in
index dae73fa..8a6d69d 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@ for @class@
diff --git a/templates/control.image.type-plain.in b/templates/control.image.type-plain.in
index 1dda400..e79ed0e 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@ for @class@
  The Linux kernel @upstreamversion@ and modules for use on @longclass@.
diff --git a/templates/control.image.type-standalone.in b/templates/control.image.type-standalone.in
index 4036d32..261b31d 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@ for @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 0ca7ea4..2f52d8d 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,19 +58,17 @@ 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.
 
 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.source.in b/templates/control.source.in
index fa5bd57..0df5352 100644
--- a/templates/control.source.in
+++ b/templates/control.source.in
@@ -1,9 +1,10 @@
-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>, Ben Hutchings <ben@decadent.org.uk>
+Maintainer: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel]
 Build-Depends-Indep: bzip2, python-support, xmlto
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
 Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log
+Origin: pengutronix.de
+Bugs: mailto:kernel@pengutronix.de