Author: waldi
Date: Sun Aug 20 11:42:38 2006
New Revision: 7203
Modified:
dists/sid/linux-2.6/debian/bin/gencontrol.py
dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/sid/linux-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Add makeflags definition for SOURCEVERSION.
* debian/lib/python/debian_linux/gencontrol.py
- Use upstream version for patches.
- Remove makeflags definitions for SOURCEVERSION and SOURCE_UPSTREAM.
* debian/rules.real: Use upstream version for patches.
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 Sun Aug 20 11:42:38 2006
@@ -13,6 +13,9 @@
def do_main_setup(self, vars, makeflags, extra):
super(gencontrol, self).do_main_setup(vars, makeflags, extra)
vars.update(self.config['image',])
+ makeflags.update({
+ 'SOURCEVERSION': self.version['linux']['source'],
+ })
def do_main_packages(self, packages, extra):
vars = self.vars
@@ -176,7 +179,7 @@
unpatch = self.templates['patch.unpatch']
vars = {
- 'home': '/usr/src/kernel-patches/all/%s' %
self.version['linux']['source_upstream'],
+ 'home': '/usr/src/kernel-patches/all/%s' %
self.version['linux']['upstream'],
'revisions': ' '.join([i['Version']['debian'] for i in
self.changelog[::-1]]),
}
vars.update(self.version['linux'])
Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sun Aug
20 11:42:38 2006
@@ -52,8 +52,6 @@
makeflags.update({
'MAJOR': self.version['linux']['major'],
'VERSION': self.version['linux']['version'],
- 'SOURCE_UPSTREAM': self.version['linux']['source_upstream'],
- 'SOURCEVERSION': self.version['linux']['source'],
'UPSTREAMVERSION': self.version['linux']['upstream'],
'ABINAME': self.abiname,
})
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real (original)
+++ dists/sid/linux-2.6/debian/rules.real Sun Aug 20 11:42:38 2006
@@ -382,7 +382,7 @@
$(MAKE) -f debian/rules.real install-base
install-patch: PACKAGE = linux-patch-debian-$(VERSION)
-install-patch: pbase := /usr/src/kernel-patches/all/$(SOURCE_UPSTREAM)
+install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAM)
install-patch: pfull := debian/$(PACKAGE)$(pbase)
install-patch: ptchs := $(notdir $(wildcard debian/patches-arch/*))
install-patch: DH_OPTIONS = -p$(PACKAGE)
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
