[kernel] r12211 - in dists/sid/linux-2.6/debian: . bin config/hppa patches/bugfix/all patches/series

[Bastian Blank]

Author: waldi
Date: Tue Sep  9 17:32:14 2008
New Revision: 12211

Log:
Revert revisions 12204 to 12210.


Removed:
   dists/sid/linux-2.6/debian/patches/bugfix/all/rtc-class-regression-parisc.patch
Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/hppa/defines
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Tue Sep  9 17:32:14 2008
@@ -154,13 +154,12 @@
         packages_dummy = []
         packages_own = []
 
-        build_headers = config_entry_base.get('modules', True)
-
         if config_entry_image['type'] == 'plain-s390-tape':
             image = self.templates["control.image.type-standalone"]
-            build_headers = False
+            build_modules = False
         elif config_entry_image['type'] == 'plain-xen':
             image = self.templates["control.image.type-modulesextra"]
+            build_modules = True
             config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
             if config_entry_xen.get('dom0-support', True):
                 p = self.process_packages(self.templates['control.xen-linux-system'], vars)
@@ -171,6 +170,7 @@
                 p[0]['Depends'].append(l)
                 packages_dummy.extend(p)
         else:
+            build_modules = True
             image = self.templates["control.image.type-%s" % config_entry_image['type']]
             #image = self.templates["control.image.type-modulesinline"]
 
@@ -179,7 +179,7 @@
         packages_own.append(self.process_real_image(image[0], image_fields, vars))
         packages_own.extend(self.process_packages(image[1:], vars))
 
-        if build_headers:
+        if build_modules:
             makeflags['MODULES'] = True
             package_headers = self.process_package(headers[0], vars)
             package_headers['Depends'].extend(relations_compiler)

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Sep  9 17:32:14 2008
@@ -54,12 +54,9 @@
     - PCI: fix reference leak in pci_get_dev_by_id()
     - cramfs: fix named-pipe handling
   * Override ABI changes.
-  * [hppa] No stable ABI, disable external modules completely.
 
   [ maximilian attems ]
   * openvz: Add upstream fixes up to 24cebf40278cb071ff8b. (closes: #497528)
-  * [hppa]: Fix RTC_CLASS regression with PARISC.
-  * [hppa]: Ignore stupid ABI check.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Fri, 29 Aug 2008 16:02:27 +0300
 

Modified: dists/sid/linux-2.6/debian/config/hppa/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/hppa/defines	(original)
+++ dists/sid/linux-2.6/debian/config/hppa/defines	Tue Sep  9 17:32:14 2008
@@ -5,15 +5,11 @@
  parisc64
  parisc64-smp
 kernel-arch: parisc
-modules: false
 
 [image]
 suggests: palo
 type: kernel-package
 
-[abi]
-ignore-changes: *
-
 [parisc_base]
 class: 32-bit PA-RISC
 

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	(original)
+++ dists/sid/linux-2.6/debian/patches/series/5	Tue Sep  9 17:32:14 2008
@@ -4,4 +4,3 @@
 - bugfix/sctp-auth-key-length-check.patch
 - bugfix/sctp-auth-panics.patch
 + bugfix/all/stable/2.6.26.4.patch
-+ bugfix/all/rtc-class-regression-parisc.patch