From 4044db50ad5f206107d4fafa627e3c85bba95686 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 6 Jun 2022 19:02:27 -0700 Subject: [PATCH] LU-15918 build: update debhelper compatibility level to 11 This patch updates debhelper compatibility level to 11 (which is currently the recommended level) to resolve the following build warnings while running "make debs": Compatibility levels before 10 are deprecated (level 9 in use) Test-Parameters: trivial clientdistro=ubuntu2004 \ testlist=sanity Change-Id: Ie5c63f6a3eb29e9aeace1f008d8d492e7587adf2 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/47551 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- debian/compat | 2 +- debian/control | 4 ++-- debian/control.main | 4 ++-- debian/control.modules.in | 2 +- debian/rules | 2 +- lipe/debian/compat | 2 +- lipe/debian/control | 2 +- lipe/debian/control.main | 2 +- lipe/debian/rules | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +11 diff --git a/debian/control b/debian/control index 05212cb..e3b2558 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Brian J. Murrell Uploaders: Brian J. Murrell Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>=9.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync, libssl-dev +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync, libssl-dev Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 9.0.0), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, dpatch, pkg-config +Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, dpatch, pkg-config Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Whamcloud and available from diff --git a/debian/control.main b/debian/control.main index 05212cb..e3b2558 100644 --- a/debian/control.main +++ b/debian/control.main @@ -4,7 +4,7 @@ Priority: optional Maintainer: Brian J. Murrell Uploaders: Brian J. Murrell Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>=9.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync, libssl-dev +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync, libssl-dev Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 9.0.0), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, dpatch, pkg-config +Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, dpatch, pkg-config Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Whamcloud and available from diff --git a/debian/control.modules.in b/debian/control.modules.in index 9fcd4ad..b2d5411 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Brian J. Murrell Uploaders: Brian J. Murrell Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 9.0.0), bzip2 +Build-Depends: debhelper (>= 11), bzip2 Package: lustre-client-modules-_KVERS_ Architecture: any diff --git a/debian/rules b/debian/rules index fc87b9d..d8575ac 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ endif #export CC # This is the debhelper compatibility version to use. -export DH_COMPAT=9 +export DH_COMPAT=11 # Module-assistant stuff ifneq (,$(findstring server,$(DEB_BUILD_PROFILES))) diff --git a/lipe/debian/compat b/lipe/debian/compat index 7f8f011..b4de394 100644 --- a/lipe/debian/compat +++ b/lipe/debian/compat @@ -1 +1 @@ -7 +11 diff --git a/lipe/debian/control b/lipe/debian/control index c68288e..39ae314 100644 --- a/lipe/debian/control +++ b/lipe/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Minh Diep Uploaders: Minh Diep Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>=9.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git diff --git a/lipe/debian/control.main b/lipe/debian/control.main index c68288e..39ae314 100644 --- a/lipe/debian/control.main +++ b/lipe/debian/control.main @@ -4,7 +4,7 @@ Priority: optional Maintainer: Minh Diep Uploaders: Minh Diep Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>=9.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git diff --git a/lipe/debian/rules b/lipe/debian/rules index d707661..b7feba2 100755 --- a/lipe/debian/rules +++ b/lipe/debian/rules @@ -17,7 +17,7 @@ else endif # This is the debhelper compatibility version to use. -export DH_COMPAT=9 +export DH_COMPAT=11 ARCH=$(shell dpkg --print-architecture) TOP_DIR:=$(shell pwd) -- 1.8.3.1