[pve-devel] [PATCH kernel 4.13 0/3] Refactor version variables and versionize linux-tools manpages

Thomas Lamprecht t.lamprecht at proxmox.com
Mon May 28 16:41:25 CEST 2018


On 5/28/18 11:02 AM, Stoiko Ivanov wrote:
> This patchset improves three minor things:
> * splitting the kernel version variable into 3 separate variables, and removing
>   hardcoded references to $major.$minor
> * Changing the manpage filenames for linux-tools to include the $major.$minor
> * Not removing the manpage for the perf util (the one contained in linux-base
>   only references the versioned one and contains no actual documentation)
> 
> Stoiko Ivanov (3):
>   refactor variable names and remove hardcoded major.minor version
>   d/rules: don't remove perf.1 manpage
>   d/rules: add version to perf man pages
> 
>  Makefile     | 13 ++++++++++---
>  debian/rules | 11 ++++++-----
>  2 files changed, 16 insertions(+), 8 deletions(-)
> 

series looks OK.
I'd apply this and the 4.15 version of this with two small changes.

1. switch the 2/3 and 3/3 patches position, as else we have 
   temporary situation where we have duplicate perf.1 man pages

2. do something like the following on top:

----8<----
diff --git a/debian/control.in b/debian/control.in
index fd4b49e..997c682 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,14 +17,14 @@ Build-Conflicts: pve-headers- at KVNAME@,
 Vcs-Git: git://git.proxmox.com/git/pve-kernel
 Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git

-Package: linux-tools-4.13
+Package: linux-tools- at KVMAJMIN@
 Architecture: any
 Section: devel
 Priority: optional
 Depends: linux-base,
          ${misc:Depends},
          ${shlibs:Depends},
-Description: Linux kernel version specific tools for version 4.13
+Description: Linux kernel version specific tools for version @KVMAJMIN@
  This package provides the architecture dependent parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy)

diff --git a/debian/rules b/debian/rules
index 61954ba..96373e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ debian/control: $(wildcard debian/*.in)
        chmod +x debian/${PVE_KERNEL_PKG}.postrm
        chmod +x debian/${PVE_KERNEL_PKG}.postinst
        chmod +x debian/${PVE_HEADER_PKG}.postinst
-       sed -e 's/@KVNAME@/${KVNAME}/g' < debian/control.in > debian/control
+       sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/${KERNEL_MAJMIN}/g' < debian/control.in > debian/control

 build: .compile_mark .tools_compile_mark .modules_compile_mark

--

if this is OK for you.

(find-firmware remains still versioned, we could just pass the maj.min
version there as cli argument, but as it errors out quick if wrong I do
not care to much for now)



More information about the pve-devel mailing list