[kernel] r6381 - in people/waldi/linux-2.6-exp/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: Sun Apr  9 20:58:36 2006
New Revision: 6381

Modified:
   people/waldi/linux-2.6-exp/debian/bin/gencontrol.py
   people/waldi/linux-2.6-exp/debian/rules
   people/waldi/linux-2.6-exp/debian/rules.defs
   people/waldi/linux-2.6-exp/debian/rules.real
   people/waldi/linux-2.6-exp/debian/templates/control.source.in
Log:
* debian/bin/gencontrol.py: Update.
* debian/rules: Hardcode some informations about linux-2.6.
* debian/rules.defs: Export path to support files.
* debian/rules.real: Use linux-tree magic to get the correct source.
* debian/templates/control.source.in: Update build dependencies.


Modified: people/waldi/linux-2.6-exp/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6-exp/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6-exp/debian/bin/gencontrol.py	Sun Apr  9 20:58:36 2006
@@ -1,10 +1,16 @@
 #!/usr/bin/env python2.4
 import os, os.path, re, sys, textwrap, ConfigParser
-sys.path.append("/usr/src/linux-headers-2.6.16/lib/python")
 import debian_linux.gencontrol
 from debian_linux.debian import *
 
 class gencontrol(debian_linux.gencontrol.gencontrol):
+    def __init__(self, dir, parent_abiname, parent_revision):
+        super(gencontrol, self).__init__(dir)
+        self.changelog = read_changelog()
+        self.version, self.abiname, self.changelog_vars = self.process_changelog({})
+        self.changelog_vars['parent_abiname'] = parent_abiname
+        self.changelog_vars['parent_revision'] = parent_revision
+
     def do_main_setup(self, vars, makeflags):
         vars.update(self.config['image',])
 
@@ -153,4 +159,5 @@
         return entry
 
 if __name__ == '__main__':
-    gencontrol("/usr/src/linux-headers-2.6.16/arch/")()
+    import sys
+    gencontrol(*sys.argv[1:])()

Modified: people/waldi/linux-2.6-exp/debian/rules
==============================================================================
--- people/waldi/linux-2.6-exp/debian/rules	(original)
+++ people/waldi/linux-2.6-exp/debian/rules	Sun Apr  9 20:58:36 2006
@@ -9,6 +9,9 @@
 VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
 MAJOR    := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
 
+export PARENT_ABINAME = -1
+export PARENT_REVISION = -5
+
 include debian/rules.defs
 
 source: debian/control $(STAMPS_DIR)/source-base
@@ -71,7 +74,7 @@
 
 debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES)
 	chmod +x $<
-	$<
+	$< $(SUPPORT_DIR)/arch $(PARENT_ABINAME) $(PARENT_REVISION)
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure

Modified: people/waldi/linux-2.6-exp/debian/rules.defs
==============================================================================
--- people/waldi/linux-2.6-exp/debian/rules.defs	(original)
+++ people/waldi/linux-2.6-exp/debian/rules.defs	Sun Apr  9 20:58:36 2006
@@ -2,3 +2,5 @@
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates
 
+SUPPORT_DIR = /usr/src/linux-support-$(VERSION)$(PARENT_ABINAME)
+export PYTHONPATH = $(SUPPORT_DIR)/lib/python

Modified: people/waldi/linux-2.6-exp/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6-exp/debian/rules.real	(original)
+++ people/waldi/linux-2.6-exp/debian/rules.real	Sun Apr  9 20:58:36 2006
@@ -109,9 +109,10 @@
 $(STAMPS_DIR)/source: debian/bin/apply.py
 	rm -rf '$(DIR)'
 	mkdir -p '$(DIR)'
-	tar -xjf /usr/src/linux-source-2.6.16.tar.bz2
-	mv linux-source-2.6.16/* '$(DIR)'
-	rm -rf linux-source-2.6.16
+	tar -xjf /usr/src/linux-source-$(UPSTREAMVERSION).tar.bz2
+	cd linux-source-$(UPSTREAMVERSION); /usr/src/kernel-patches/all/$(UPSTREAMVERSION)/apply/debian $(UPSTREAMVERSION)$(PARENT_REVISION)
+	mv linux-source-$(UPSTREAMVERSION)/* '$(DIR)'
+	rm -rf linux-source-$(UPSTREAMVERSION)
 	touch '$@'
 
 $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/source

Modified: people/waldi/linux-2.6-exp/debian/templates/control.source.in
==============================================================================
--- people/waldi/linux-2.6-exp/debian/templates/control.source.in	(original)
+++ people/waldi/linux-2.6-exp/debian/templates/control.source.in	Sun Apr  9 20:58:36 2006
@@ -3,4 +3,4 @@
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.035), ocaml-interp, python, python2.4-minimal, linux-source-2.6.16
+Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.035), ocaml-interp, python, python2.4-minimal, linux-tree- at upstreamversion@@parent_revision@, linux-support- at upstreamversion@@parent_abiname@