* debian/bin/gencontrol.py: Support support to main packages.
* debian/rules.real: Build support package in binary-indep. * debian/templates/control.support.in: Set Architecture to all. svn path=/dists/trunk/linux-2.6/; revision=6362
This commit is contained in:
parent
1c2491ce77
commit
eec85fb833
|
@ -17,17 +17,18 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
||||||
tree = self.templates["control.tree"]
|
tree = self.templates["control.tree"]
|
||||||
packages.append(self.process_real_tree(tree[0], vars))
|
packages.append(self.process_real_tree(tree[0], vars))
|
||||||
|
|
||||||
|
packages.extend(self.process_packages(self.templates["control.support"], vars))
|
||||||
|
|
||||||
def do_arch_setup(self, vars, makeflags, arch):
|
def do_arch_setup(self, vars, makeflags, arch):
|
||||||
vars.update(self.config.get(('image', arch), {}))
|
vars.update(self.config.get(('image', arch), {}))
|
||||||
|
|
||||||
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
||||||
packages_support = self.process_packages(self.templates["control.support"], vars)
|
|
||||||
headers_arch = self.templates["control.headers.arch"]
|
headers_arch = self.templates["control.headers.arch"]
|
||||||
packages_headers_arch = self.process_packages(headers_arch, vars)
|
packages_headers_arch = self.process_packages(headers_arch, vars)
|
||||||
|
|
||||||
extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = package_relation_list()
|
extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = package_relation_list()
|
||||||
|
|
||||||
for package in packages_support + packages_headers_arch:
|
for package in packages_headers_arch:
|
||||||
name = package['Package']
|
name = package['Package']
|
||||||
if packages.has_key(name):
|
if packages.has_key(name):
|
||||||
package = packages.get(name)
|
package = packages.get(name)
|
||||||
|
|
|
@ -66,7 +66,7 @@ endif
|
||||||
#
|
#
|
||||||
# Targets
|
# Targets
|
||||||
#
|
#
|
||||||
binary-arch-arch: install-support install-headers-$(ARCH)
|
binary-arch-arch: install-headers-$(ARCH)
|
||||||
binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
|
binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
|
||||||
binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
||||||
ifeq ($(MODULES),True)
|
ifeq ($(MODULES),True)
|
||||||
|
@ -74,6 +74,7 @@ ifeq ($(MODULES),True)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
binary-indep: install-doc install-patch install-source install-tree
|
binary-indep: install-doc install-patch install-source install-tree
|
||||||
|
binary-indep: install-support
|
||||||
|
|
||||||
build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Package: linux-support-@upstreamversion@@abiname@
|
Package: linux-support-@upstreamversion@@abiname@
|
||||||
|
Architecture: all
|
||||||
Section: devel
|
Section: devel
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Depends: python2.4-minimal
|
Depends: python2.4-minimal
|
||||||
|
|
Loading…
Reference in New Issue