summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog8
-rw-r--r--config/config135
-rw-r--r--config/defines2
-rw-r--r--lib/python/debian_linux/debian.py2
-rw-r--r--patches/bugfix/all/fix-kerndeldoc.patch46
-rw-r--r--patches/series/137
-rw-r--r--templates/control.headers.arch.in4
-rw-r--r--templates/control.headers.featureset.in2
-rw-r--r--templates/control.headers.in4
-rw-r--r--templates/control.image.type-kernel-package.in4
-rw-r--r--templates/control.image.type-modulesextra.in6
-rw-r--r--templates/control.image.type-modulesinline.in4
-rw-r--r--templates/control.image.type-plain.in4
-rw-r--r--templates/control.image.type-standalone.in4
-rw-r--r--templates/control.libc-dev.in2
-rw-r--r--templates/control.main.in10
-rw-r--r--templates/control.source.in7
-rw-r--r--templates/control.support.in2
-rw-r--r--templates/control.tree.in2
-rw-r--r--templates/control.xen-linux-system.in2
20 files changed, 89 insertions, 198 deletions
diff --git a/changelog b/changelog
index 257b6fe..d62748a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.29-rt1-1) unstable; urgency=low
+
+ * disable all patches but the ones required for package building.
+ * disable CONFIG_STAGING
+ * set ABI = 1
+
+ -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Tue, 08 Sep 2009 17:46:04 +0200
+
linux-2.6 (2.6.29-6) UNRELEASED; urgency=low
[ Martin Michlmayr ]
diff --git a/config/config b/config/config
index d13bb41..26cdc65 100644
--- a/config/config
+++ b/config/config
@@ -1815,140 +1815,10 @@ CONFIG_SSB=m
##
## file: drivers/staging/Kconfig
##
-CONFIG_STAGING=y
+# CONFIG_STAGING is not set
# 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=m
-
-##
-## file: drivers/staging/comedi/Kconfig
-##
-# CONFIG_COMEDI 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/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/panel/Kconfig
-##
-# CONFIG_PANEL is not set
-
-##
-## file: drivers/staging/poch/Kconfig
-##
-# CONFIG_POCH is not set
-
-##
-## file: drivers/staging/rt2860/Kconfig
-##
-CONFIG_RT2860=m
-
-##
-## file: drivers/staging/rt2870/Kconfig
-##
-CONFIG_RT2870=m
-
-##
-## file: drivers/staging/rtl8187se/Kconfig
-##
-CONFIG_RTL8187SE=m
-
-##
-## file: drivers/staging/slicoss/Kconfig
-##
-# CONFIG_SLICOSS is not set
-
-##
-## file: drivers/staging/sxg/Kconfig
-##
-# CONFIG_SXG 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/uio/Kconfig
##
CONFIG_UIO=m
@@ -2707,9 +2577,10 @@ CONFIG_HZ_250=y
## 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 d5e60dc..adcf92a 100644
--- a/config/defines
+++ b/config/defines
@@ -1,5 +1,5 @@
[abi]
-abiname: 2
+abiname: 1
ignore-changes:
copy_fs_struct exit_fs
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/bugfix/all/fix-kerndeldoc.patch b/patches/bugfix/all/fix-kerndeldoc.patch
new file mode 100644
index 0000000..d79e40d
--- /dev/null
+++ b/patches/bugfix/all/fix-kerndeldoc.patch
@@ -0,0 +1,46 @@
+diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
+index bc962cd..974ed9f 100644
+--- a/Documentation/DocBook/kernel-api.tmpl
++++ b/Documentation/DocBook/kernel-api.tmpl
+@@ -258,7 +258,9 @@ X!Earch/x86/kernel/mca_32.c
+ !Eblock/blk-tag.c
+ !Iblock/blk-tag.c
+ !Eblock/blk-integrity.c
+-!Iblock/blktrace.c
++<!-- FIXME: block/blktrace.c was removed in .29-rt1
++X!Iblock/blktrace.c
++-->
+ !Iblock/genhd.c
+ !Eblock/genhd.c
+ </chapter>
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 3135a6a..9420673 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -3425,7 +3425,7 @@ static int move_one_task(struct rq *this_rq, int this_cpu, struct rq *busiest,
+ return 0;
+ }
+ /********** Helpers for find_busiest_group ************************/
+-/**
++/*
+ * sd_lb_stats - Structure to store the statistics of a sched_domain
+ * during load balancing.
+ */
+@@ -3457,7 +3457,7 @@ struct sd_lb_stats {
+ #endif
+ };
+
+-/**
++/*
+ * sg_lb_stats - stats of a sched_group required for load_balancing
+ */
+ struct sg_lb_stats {
+@@ -3594,7 +3594,7 @@ static inline void update_sd_power_savings_stats(struct sched_group *group,
+ }
+ }
+
+-/**
++/*
+ * check_power_save_busiest_group - Check if we have potential to perform
+ * some power-savings balance. If yes, set the busiest group to be
+ * the least loaded group in the sched_domain, so that it's CPUs can
diff --git a/patches/series/1 b/patches/series/1
index 1faf9bf..e26aa44 100644
--- a/patches/series/1
+++ b/patches/series/1
@@ -3,39 +3,4 @@
+ 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
-
-+ debian/dfsg/drivers-net-bnx2-request_firmware-1.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-tehuti-request_firmware.patch
-+ features/all/drivers-net-typhoon-request_firmware.patch
-+ features/all/drivers-scsi-qla1280-request_firmware.patch
-+ features/all/export-gfs2-locking-symbols.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
-# Kirkwood support, will be in 2.6.30
-+ features/arm/orion-gpio-input-output.patch
-+ features/arm/kw-mpp.patch
-+ features/arm/mv-sdio.patch
-+ features/arm/kw-register-sdio.patch
-+ features/arm/kw-register-internal-devices.patch
-+ features/arm/kw-sheevaplug.patch
-+ features/arm/kw-sheevaplug-usb-power.patch
-+ features/arm/kw-sheevaplug-led.patch
-+ features/arm/kw-hook-up-i2c.patch
-+ features/arm/kw-dont-init-rtc.patch
-+ features/arm/kw-consistency-mpp.patch
-+ features/arm/ts219.patch
++ bugfix/all/fix-kerndeldoc.patch
diff --git a/templates/control.headers.arch.in b/templates/control.headers.arch.in
index a9d5b81..3197830 100644
--- a/templates/control.headers.arch.in
+++ b/templates/control.headers.arch.in
@@ -1,5 +1,5 @@
Package: linux-headers-@upstreamversion@@abiname@-all
-Section: devel
+Section: non-free/devel
Priority: optional
Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${binary:Version})
Description: All header files for Linux @version@
@@ -8,7 +8,7 @@ Description: All header files for Linux @version@
kernel modules.
Package: linux-headers-@upstreamversion@@abiname@-all-@arch@
-Section: devel
+Section: non-free/devel
Priority: optional
Description: All header files for Linux @version@
This package depends against all architecture-specific kernel header files
diff --git a/templates/control.headers.featureset.in b/templates/control.headers.featureset.in
index af137b4..dbe0c06 100644
--- a/templates/control.headers.featureset.in
+++ b/templates/control.headers.featureset.in
@@ -1,5 +1,5 @@
Package: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@
-Section: devel
+Section: non-free/devel
Priority: optional
Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@
This package provides the architecture-specific common kernel header files
diff --git a/templates/control.headers.in b/templates/control.headers.in
index 50867e9..9d2eb40 100644
--- a/templates/control.headers.in
+++ b/templates/control.headers.in
@@ -1,8 +1,8 @@
Package: linux-headers-@upstreamversion@@abiname@@localversion@
-Section: devel
+Section: non-free/devel
Priority: optional
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 e2325e4..27f5846 100644
--- a/templates/control.image.type-kernel-package.in
+++ b/templates/control.image.type-kernel-package.in
@@ -1,7 +1,7 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: optional
-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 a171e5a..5e903ba 100644
--- a/templates/control.image.type-modulesextra.in
+++ b/templates/control.image.type-modulesextra.in
@@ -1,7 +1,7 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: optional
-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@
@@ -9,7 +9,7 @@ Description: Linux @upstreamversion@ image on @class@
Linux kernel @upstreamversion@ on @longclass@ machines.
Package: linux-modules-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: optional
Depends: module-init-tools
Description: Linux @upstreamversion@ modules on @class@
diff --git a/templates/control.image.type-modulesinline.in b/templates/control.image.type-modulesinline.in
index 5c8e03d..2dcf552 100644
--- a/templates/control.image.type-modulesinline.in
+++ b/templates/control.image.type-modulesinline.in
@@ -1,7 +1,7 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: optional
-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 03ae343..d91b172 100644
--- a/templates/control.image.type-plain.in
+++ b/templates/control.image.type-plain.in
@@ -1,7 +1,7 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: optional
-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}
Suggests: linux-doc-@version@
diff --git a/templates/control.image.type-standalone.in b/templates/control.image.type-standalone.in
index 20d74e4..c6e78ba 100644
--- a/templates/control.image.type-standalone.in
+++ b/templates/control.image.type-standalone.in
@@ -1,7 +1,7 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: optional
-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 2f9b0aa..b2be30e 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
Priority: optional
Provides: linux-kernel-headers
Replaces: linux-kernel-headers, libdrm-dev (<= 2.4.5-1)
diff --git a/templates/control.main.in b/templates/control.main.in
index d5488e9..6e7c6b7 100644
--- a/templates/control.main.in
+++ b/templates/control.main.in
@@ -1,8 +1,8 @@
Package: linux-source-@version@
Architecture: all
-Section: devel
+Section: non-free/devel
Priority: optional
-Provides: linux-source, linux-source-@major@
+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
@@ -20,7 +20,7 @@ Description: Linux kernel source for version @version@ with Debian patches
Package: linux-doc-@version@
Architecture: all
-Section: doc
+Section: non-free/doc
Priority: optional
Provides: linux-doc-@major@
Description: Linux kernel specific documentation for version @version@
@@ -33,7 +33,7 @@ Description: Linux kernel specific documentation for version @version@
Package: linux-manual-@version@
Architecture: all
-Section: doc
+Section: non-free/doc
Priority: optional
Provides: linux-manual, kernel-manual-@major@
Conflicts: linux-manual, kernel-manual-@major@
@@ -50,7 +50,7 @@ Description: Linux kernel API manual pages for version @version@
Package: linux-patch-debian-@version@
Architecture: all
-Section: devel
+Section: non-free/devel
Priority: optional
Depends: bzip2, linux-support-@upstreamversion@@abiname@
Suggests: linux-source-@version@
diff --git a/templates/control.source.in b/templates/control.source.in
index 1c53bc4..e46d813 100644
--- a/templates/control.source.in
+++ b/templates/control.source.in
@@ -1,8 +1,9 @@
-Section: devel
+Section: non-free/devel
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.0
Build-Depends: debhelper, module-init-tools, dpkg-dev (>= 1.10.23), sparc-utils [sparc], kernel-package (>= 10.063), python
Build-Depends-Indep: bzip2, findutils (>= 4.2.12), 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 188ffe2..9db9775 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
Priority: optional
Depends: ${python:Depends}
Description: Support files for Linux @upstreamversion@
diff --git a/templates/control.tree.in b/templates/control.tree.in
index cde1370..f5f3e58 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
Priority: optional
Description: Linux kernel source tree for building Debian kernel images
This metapackage is used as a build dependency of Debian
diff --git a/templates/control.xen-linux-system.in b/templates/control.xen-linux-system.in
index a57721c..b691c3c 100644
--- a/templates/control.xen-linux-system.in
+++ b/templates/control.xen-linux-system.in
@@ -1,5 +1,5 @@
Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
-Section: admin
+Section: non-free/admin
Priority: extra
Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
Description: XEN system with Linux @upstreamversion@ image on @class@