r4539 - in dists/trunk/linux-2.6/debian: . bin
Simon Horman
horms at costa.debian.org
Wed Oct 19 10:31:53 UTC 2005
Author: horms
Date: 2005-10-19 10:31:52 +0000 (Wed, 19 Oct 2005)
New Revision: 4539
Modified:
dists/trunk/linux-2.6/debian/bin/apply
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/rules.real
Log:
* Allow versions of the form 2.6.13+2.6.14-rc4-1 to work,
at the expense of -rc4 being part of upstream rather
than a modifier that can set the ABI. It was a bit envasive,
hopefully it doesn't break anything.
Modified: dists/trunk/linux-2.6/debian/bin/apply
===================================================================
--- dists/trunk/linux-2.6/debian/bin/apply 2005-10-19 10:29:29 UTC (rev 4538)
+++ dists/trunk/linux-2.6/debian/bin/apply 2005-10-19 10:31:52 UTC (rev 4539)
@@ -156,7 +156,7 @@
# for THIS particular version of the source package
version=${override_version:- at version@}
-upstream=${version%-*}
+upstream=${override_upstream:- at upstream@}
revision=${version#*-}
home=${home:-/usr/src/kernel-patches/all/$upstream/debian}
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py 2005-10-19 10:29:29 UTC (rev 4538)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py 2005-10-19 10:31:52 UTC (rev 4539)
@@ -48,6 +48,7 @@
e['Distribution'] = match.group('header_distribution')
e['Source'] = match.group('header_source')
e['Version'] = parse_version(match.group('header_version'))
+ e['Version']['upstream'] = e['Version']['version']
entries.append(e)
return entries
@@ -88,19 +89,14 @@
^
(?P<source>
(?:
- \d+\.\d+\.\d+\+
+ (?P<parent>\d+\.\d+\.\d+)
+ \+
)?
- (?P<upstream>
- (?P<version>
- (?P<major>\d+\.\d+)
- \.
- \d+
- )
+ (?P<version>
+ (?P<major>\d+\.\d+)
+ \.\d+
(?:
- -
- (?P<modifier>
- .+?
- )
+ -.+?
)?
)
-
@@ -115,13 +111,16 @@
ret = [None, None, None, None]
ret[0] = version = changelog[0]['Version']
vars = in_vars.copy()
- if version['modifier'] is not None:
- ret[1] = vars['abiname'] = version['modifier']
- ret[2] = ""
+ ret[1] = vars['abiname'] = config['base']['abiname']
+ ret[2] = "-%s" % vars['abiname']
+ vars['version'] = version['version']
+ vars['upstream'] = version['version']
+ if version['parent'] is not None:
+ version['parent'] = version['parent']
+ version['parent_and_upstream'] = version['parent'] + '+' + version['upstream']
else:
- ret[1] = vars['abiname'] = config['base']['abiname']
- ret[2] = "-%s" % vars['abiname']
- vars['version'] = version['version']
+ version['parent'] = ''
+ version['parent_and_upstream'] = version['upstream']
vars['major'] = version['major']
ret[3] = vars
return ret
@@ -350,6 +349,7 @@
'VERSION': version['version'],
'SOURCE_VERSION': version['source'],
'UPSTREAM_VERSION': version['upstream'],
+ 'PARENT_AND_UPSTREAM_VERSION': version['parent_and_upstream'],
'ABINAME': abiname,
'KPKG_ABINAME': kpkg_abiname,
}
Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog 2005-10-19 10:29:29 UTC (rev 4538)
+++ dists/trunk/linux-2.6/debian/changelog 2005-10-19 10:31:52 UTC (rev 4539)
@@ -13,8 +13,14 @@
* Correct linux-patch-debian description. It replaces the
kernel-patch-debian packages, not the kernel-source packages.
- -- dann frazier <dannf at debian.org> Tue, 18 Oct 2005 13:29:06 -0600
+ [ Simon Horman ]
+ * Allow versions of the form 2.6.13+2.6.14-rc4-1 to work,
+ at the expense of -rc4 being part of upstream rather
+ than a modifier that can set the ABI. It was a bit envasive,
+ hopefully it doesn't break anything.
+ -- Simon Horman <horms at debian.org> Wed, 19 Oct 2005 18:06:19 +0900
+
linux-2.6 (2.6.13-2) UNRELEASED; urgency=low
[ Jurij Smakov ]
Modified: dists/trunk/linux-2.6/debian/rules.real
===================================================================
--- dists/trunk/linux-2.6/debian/rules.real 2005-10-19 10:29:29 UTC (rev 4538)
+++ dists/trunk/linux-2.6/debian/rules.real 2005-10-19 10:31:52 UTC (rev 4539)
@@ -135,7 +135,7 @@
rm -rf $(DIR)
mkdir -p $(DIR)
cp -al $(srcfiles) $(DIR)
- cd $(DIR); override_version=$(SOURCE_VERSION) home=$(CURDIR)/debian/patches-debian sh $(CURDIR)/debian/bin/apply
+ cd $(DIR); override_version=$(SOURCE_VERSION) override_upstream=$(PARENT_AND_UPSTREAM_VERSION) home=$(CURDIR)/debian/patches-debian sh $(CURDIR)/debian/bin/apply
#make-kpkg does this when building kernel-source.
mv $(DIR)/scripts/package/Makefile $(DIR)/scripts/package/Makefile.dist
mv $(DIR)/scripts/package/builddeb $(DIR)/scripts/package/builddeb.dist
@@ -267,8 +267,10 @@
dh_installdirs $(DH_OPTIONS) $(pbase)/apply $(pbase)/debian $(pbase)/unpatch
dh_install $(DH_OPTIONS) debian/patches-debian/* $(pbase)/debian
# Install the debian patches
- sed 's/@version@/$(release)/g' debian/bin/apply > $(pfull)/apply/debian
- sed 's/@upstream@/$(version)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
+ sed 's/@version@/$(SOURCE_VERSION)/g' debian/bin/apply > $(pfull)/apply/debian
+ sed 's/@upstream@/$(PARENT_AND_UPSTREAM_VERSION)/g' debian/bin/apply > $(pfull)/apply/debian
+ sed 's/@version@/$(UPSTREAM_VERSION)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
+ sed 's/@upstream@/$(PARENT_AND_UPSTREAM_VERSION)/g' debian/bin/unpatch > $(pfull)/apply/debian
chmod 755 $(pfull)/apply/debian $(pfull)/unpatch/debian
chmod 644 $(pfull)/debian/*.patch
bzip2 -9 $(pfull)/debian/*.patch
More information about the Kernel-svn-changes
mailing list