diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index fba6fe24d..fd6b794b7 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -26,7 +26,6 @@ class Gencontrol(Base): def do_main_packages(self, packages, vars, makeflags, extra): packages.extend(self.process_packages(self.templates["control.main"], self.vars)) - packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars)) def do_arch_setup(self, vars, makeflags, arch, extra): config_base = self.config.merge('base', arch) @@ -319,19 +318,6 @@ class Gencontrol(Base): entry[key] = value return entry - def process_real_tree(self, entry, vars): - entry = self.process_package(entry, vars) - version = self.changelog[0].version - - value = entry.setdefault('Depends', PackageRelation()) - value.append("linux-patch-debian-%s (= %s)" % (version.linux_version, version.complete)) - value.append(PackageRelationGroup(["linux-source-%s (= %s)" % (v.linux_version, v.complete) for v in self.versions])) - - value = entry.setdefault('Provides', PackageRelation()) - value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in self.versions]) - - return entry - def write(self, packages, makefile): self.write_config() super(Gencontrol, self).write(packages, makefile) diff --git a/debian/changelog b/debian/changelog index 6eb4182c5..6dc7a338e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low * [amd64, powerpc, sparc] Build USB support as module. * [amd64] Build AGP support as module. * Always enable dummy net driver support. + * Drop linux-tree package, it have no users left. [ Ben Hutchings ] * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König diff --git a/debian/rules.real b/debian/rules.real index 56d101dff..84b6c1d05 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -50,7 +50,6 @@ binary-indep: install-manual binary-indep: install-patch binary-indep: install-source binary-indep: install-support -binary-indep: install-tree binary-indep: install-firmware build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE) @@ -178,12 +177,6 @@ install-manual: $(STAMPS_DIR)/build-doc find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman +$(MAKE_SELF) install-base -install-dummy: - dh_testdir - dh_testroot - dh_prep - +$(MAKE_SELF) install-base - install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH) install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p)) install-headers_$(ARCH): @@ -457,10 +450,6 @@ install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 dh_install '$<' /usr/src +$(MAKE_SELF) install-base -install-tree: DH_OPTIONS = -plinux-tree-$(VERSION) -install-tree: - +$(MAKE_SELF) install-dummy - install-firmware: PACKAGE_NAME = firmware-linux-free install-firmware: DIR = $(BUILD_DIR)/build-firmware install-firmware: SOURCE_DIR = $(BUILD_DIR)/source diff --git a/debian/templates/control.tree.in b/debian/templates/control.tree.in deleted file mode 100644 index 517c43913..000000000 --- a/debian/templates/control.tree.in +++ /dev/null @@ -1,23 +0,0 @@ -Package: linux-tree-@version@ -Architecture: all -Section: devel -Description: Linux kernel source tree for building Debian kernel images - This metapackage is used as a build dependency of Debian - linux-image packages to prevent a version discrepancy between - the linux-image and corresponding linux-sources packages in the - fast-moving unstable archive. The package's dependency relations - are structured so that a linux-image package's build - dependencies can always be satisfied, even if the linux-source - package that had been used to compile the image has been - superseded by a newer Debian revision since the last build. - . - The package provides a list of virtual packages, corresponding to - Debian revisions of a linux-source package. The Debian - linux-patch contains the information needed to roll back the - current linux-source to any of the revisions identified by the - provided virtual packages. Therefore, the linux-tree package - ensures the availability of the Linux kernel source tree corresponding - to each of the virtual packages listed. - . - The package serves no purpose outside of the Debian build and - archive infrastructure.