From 923552dcc8478872074ed5c11a1953e8e06a2158 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 8 May 2018 17:01:41 +0100
Subject: [PATCH] Reclassify lockdep packages as unversioned tools

The liblockdep<version> package is obviously versioned, but the others
aren't and it's not very useful to build just that one.
---
 debian/changelog                              |  1 +
 debian/rules.real                             |  6 ++--
 debian/templates/control.tools-unversioned.in | 31 +++++++++++++++++++
 debian/templates/control.tools-versioned.in   | 31 -------------------
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78521505a..5f40ebb09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (4.17~rc3-1~exp2) UNRELEASED; urgency=medium
 
   [ Ben Hutchings ]
   * Fix building only versioned tools packages
+  * Reclassify lockdep packages as unversioned tools
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 02 May 2018 12:59:01 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 8dc588cd7..f570dcab6 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -76,19 +76,19 @@ binary-indep: install-support
 
 ifneq ($(DO_TOOLS_VERSIONED),False)
   build-arch-arch: $(STAMPS_DIR)/build-tools
-  binary-arch-arch: install-kbuild install-liblockdep
+  binary-arch-arch: install-kbuild
   ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),)
     ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),)
       binary-arch-arch: install-perf
     endif
   endif
-  binary-indep: install-lockdep
 endif
 ifneq ($(DO_TOOLS_UNVERSIONED),False)
-  binary-arch-arch: install-usbip install-cpupower
+  binary-arch-arch: install-usbip install-cpupower install-liblockdep
   ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),)
     binary-arch-arch: install-hyperv-daemons
   endif
+  binary-indep: install-lockdep
 endif
 
 binary-indep-featureset: install-common-headers_$(FEATURESET)
diff --git a/debian/templates/control.tools-unversioned.in b/debian/templates/control.tools-unversioned.in
index 72f97ff74..dd8e0f2a8 100644
--- a/debian/templates/control.tools-unversioned.in
+++ b/debian/templates/control.tools-unversioned.in
@@ -70,3 +70,34 @@ Description: Support daemons for Linux running on Hyper-V
  .
  hv_vss_daemon provides the volume shadow copy service (VSS), allowing
  the host to freeze the guest filesystems while taking a snapshot.
+
+Package: lockdep
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@
+Recommends: liblockdep-dev
+Section: devel
+Multi-Arch: allowed
+Description: Runtime locking correctness validator
+ lockdep is a wrapper for programs that use the pthreads API, which detects
+ actual and potential deadlocks and other locking bugs.
+
+Package: liblockdep@version@
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libs
+Multi-Arch: same
+Description: Runtime locking correctness validator (shared library)
+ liblockdep is a library for programs that use the pthreads API, which can
+ be used to detect actual and potential deadlocks and other locking bugs.
+
+Package: liblockdep-dev
+Build-Profiles: <!stage1 !pkg.linux.notools>
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@ (= ${binary:Version})
+Section: libdevel
+Multi-Arch: same
+Description: Runtime locking correctness validator (development files)
+ liblockdep is a library for programs that use the pthreads API, which can
+ be used to detect actual and potential deadlocks and other locking bugs.
diff --git a/debian/templates/control.tools-versioned.in b/debian/templates/control.tools-versioned.in
index fa2491a81..9bef406a1 100644
--- a/debian/templates/control.tools-versioned.in
+++ b/debian/templates/control.tools-versioned.in
@@ -22,34 +22,3 @@ Description: Performance analysis tools for Linux @version@
  .
  The linux-base package contains a 'perf' command which will invoke the
  appropriate version for the running kernel.
-
-Package: lockdep
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@
-Recommends: liblockdep-dev
-Section: devel
-Multi-Arch: allowed
-Description: Runtime locking correctness validator
- lockdep is a wrapper for programs that use the pthreads API, which detects
- actual and potential deadlocks and other locking bugs.
-
-Package: liblockdep@version@
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Section: libs
-Multi-Arch: same
-Description: Runtime locking correctness validator (shared library)
- liblockdep is a library for programs that use the pthreads API, which can
- be used to detect actual and potential deadlocks and other locking bugs.
-
-Package: liblockdep-dev
-Build-Profiles: <!stage1 !pkg.linux.notools>
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblockdep@version@ (= ${binary:Version})
-Section: libdevel
-Multi-Arch: same
-Description: Runtime locking correctness validator (development files)
- liblockdep is a library for programs that use the pthreads API, which can
- be used to detect actual and potential deadlocks and other locking bugs.