Prepare gencontrol and templates for Linux 3.0
- Remove all relations based on the 'major' template variable - Define 'source_package' template variable and use it in place of 'linux-@major@' in linux-patch-debian-<version> description - Expect only 2 upstream version components if first component is not '2' - Remove the 'major' template variable and 'MAJOR' make variable svn path=/dists/trunk/linux-2.6/; revision=17482
This commit is contained in:
parent
c23ad30622
commit
1b919cfb84
|
@ -84,7 +84,6 @@ run during an automatic build. The following variables are substituted
|
|||
into the templates:
|
||||
|
||||
@version@ Upstream kernel version, for example 2.6.11.
|
||||
@major@ The major version, for example 2.6
|
||||
@arch@ The Debian arch name, such as powerpc or i386.
|
||||
@flavour@ The build flavour, such as 686 or k7-smp.
|
||||
@class@ The CPU/architecture class; displayed in synopsis. It should
|
||||
|
|
|
@ -22,7 +22,6 @@ class Gencontrol(Base):
|
|||
def do_main_setup(self, vars, makeflags, extra):
|
||||
super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
|
||||
makeflags.update({
|
||||
'MAJOR': self.version.linux_major,
|
||||
'VERSION': self.version.linux_version,
|
||||
'UPSTREAMVERSION': self.version.linux_upstream,
|
||||
'ABINAME': self.abiname,
|
||||
|
@ -335,7 +334,7 @@ class Gencontrol(Base):
|
|||
'upstreamversion': self.version.linux_upstream,
|
||||
'version': self.version.linux_version,
|
||||
'source_upstream': self.version.upstream,
|
||||
'major': self.version.linux_major,
|
||||
'source_package': self.changelog[0].source,
|
||||
'abiname': self.abiname,
|
||||
}
|
||||
self.config['version',] = {'source': self.version.complete, 'abiname': self.abiname}
|
||||
|
|
|
@ -100,9 +100,7 @@ class VersionLinux(Version):
|
|||
_version_linux_rules = ur"""
|
||||
^
|
||||
(?P<version>
|
||||
(?P<major>\d+\.\d+)
|
||||
\.
|
||||
\d+
|
||||
(?:2\.)?\d+\.\d+
|
||||
)
|
||||
(?:
|
||||
~
|
||||
|
@ -138,7 +136,6 @@ $
|
|||
if match is None:
|
||||
raise RuntimeError, "Invalid debian linux version"
|
||||
d = match.groupdict()
|
||||
self.linux_major = d['major']
|
||||
self.linux_modifier = d['modifier']
|
||||
self.linux_version = d['version']
|
||||
if d['modifier'] is not None:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Package: linux-headers-@upstreamversion@@abiname@@localversion@
|
||||
Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@, ${misc:Depends}
|
||||
Provides: linux-headers, linux-headers-@major@
|
||||
Provides: linux-headers
|
||||
Description: Header files for Linux @upstreamversion@@abiname@@localversion@
|
||||
This package provides the architecture-specific kernel header files
|
||||
for Linux kernel @upstreamversion@@abiname@@localversion@, generally
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Pre-Depends: debconf | debconf-2.0
|
||||
Depends: module-init-tools, ${misc:Depends}
|
||||
Suggests: linux-doc-@version@
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-image-@major@
|
||||
Provides: linux-image
|
||||
Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
|
||||
Suggests: linux-doc-@version@
|
||||
Description: Linux @upstreamversion@ for @class@
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Depends: module-init-tools, ${misc:Depends}
|
||||
Suggests: linux-doc-@version@
|
||||
Description: Linux @upstreamversion@ for @class@
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Pre-Depends: debconf | debconf-2.0
|
||||
Depends: module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}
|
||||
Recommends: firmware-linux-free (>= 3~)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||
Provides: linux-image, linux-image-@major@
|
||||
Provides: linux-image
|
||||
Suggests: linux-doc-@version@
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Description: Linux @upstreamversion@ for @class@
|
||||
|
|
|
@ -13,7 +13,7 @@ Description: Performance analysis tools for Linux @upstreamversion@
|
|||
Package: linux-source-@version@
|
||||
Architecture: all
|
||||
Section: kernel
|
||||
Provides: linux-source, linux-source-@major@
|
||||
Provides: linux-source
|
||||
Depends: binutils, bzip2, ${misc:Depends}
|
||||
Recommends: libc6-dev | libc-dev, gcc, make
|
||||
Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
|
||||
|
@ -28,7 +28,6 @@ Package: linux-doc-@version@
|
|||
Architecture: all
|
||||
Depends: ${misc:Depends}
|
||||
Section: doc
|
||||
Provides: linux-doc-@major@
|
||||
Description: Linux kernel specific documentation for version @version@
|
||||
This package provides the various README files and HTML documentation for
|
||||
the Linux kernel version @version@. Plenty of information, including the
|
||||
|
@ -41,9 +40,9 @@ Package: linux-manual-@version@
|
|||
Architecture: all
|
||||
Depends: ${misc:Depends}
|
||||
Section: doc
|
||||
Provides: linux-manual, kernel-manual-@major@
|
||||
Conflicts: linux-manual, kernel-manual-@major@
|
||||
Replaces: linux-manual, kernel-manual-@major@
|
||||
Provides: linux-manual
|
||||
Conflicts: linux-manual
|
||||
Replaces: linux-manual
|
||||
Description: Linux kernel API manual pages for version @version@
|
||||
This package provides the Kernel Hacker's Guide in the form of
|
||||
manual pages, describing the kernel API functions. They
|
||||
|
@ -65,7 +64,7 @@ Description: Debian patches to version @version@ of the Linux kernel
|
|||
.
|
||||
Note that these patches do NOT apply against a pristine
|
||||
Linux @version@ kernel but only against the kernel tarball
|
||||
linux-@major@_@source_upstream@.orig.tar.gz from the Debian archive.
|
||||
@source_package@_@source_upstream@.orig.tar.gz from the Debian archive.
|
||||
|
||||
Package: linux-support-@upstreamversion@@abiname@
|
||||
Architecture: all
|
||||
|
|
Loading…
Reference in New Issue