* debian/bin/gencontrol.py: Don't use control.support template.
* debian/templates/control.main.in: Merge contents of debian/templates/control.support.in. svn path=/dists/trunk/linux-2.6/; revision=14697
This commit is contained in:
parent
d4b8d8ef32
commit
c22fbd4990
|
@ -27,7 +27,6 @@ class Gencontrol(Base):
|
||||||
def do_main_packages(self, packages, vars, makeflags, extra):
|
def do_main_packages(self, packages, vars, makeflags, extra):
|
||||||
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
|
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
|
||||||
packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars))
|
packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars))
|
||||||
packages.extend(self.process_packages(self.templates["control.support"], self.vars))
|
|
||||||
|
|
||||||
def do_arch_setup(self, vars, makeflags, arch, extra):
|
def do_arch_setup(self, vars, makeflags, arch, extra):
|
||||||
config_base = self.config.merge('base', arch)
|
config_base = self.config.merge('base', arch)
|
||||||
|
|
|
@ -67,3 +67,13 @@ Description: Binary firmware for various drivers in the Linux kernel
|
||||||
.
|
.
|
||||||
Most firmware previously included in the Linux kernel is non-free
|
Most firmware previously included in the Linux kernel is non-free
|
||||||
and has been moved to the firmware-linux-nonfree package.
|
and has been moved to the firmware-linux-nonfree package.
|
||||||
|
|
||||||
|
Package: linux-support-@upstreamversion@@abiname@
|
||||||
|
Architecture: all
|
||||||
|
Section: devel
|
||||||
|
Depends: ${python:Depends}
|
||||||
|
Description: Support files for Linux @upstreamversion@
|
||||||
|
This package provides support files for the Linux kernel build,
|
||||||
|
e.g. scripts to handle ABI information and for generation of
|
||||||
|
build system meta data.
|
||||||
|
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
Package: linux-support-@upstreamversion@@abiname@
|
|
||||||
Architecture: all
|
|
||||||
Section: devel
|
|
||||||
Depends: ${python:Depends}
|
|
||||||
Description: Support files for Linux @upstreamversion@
|
|
||||||
This package provides support files for the Linux kernel build,
|
|
||||||
e.g. scripts to handle ABI information and for generation of
|
|
||||||
build system meta data.
|
|
||||||
|
|
Loading…
Reference in New Issue