[PATCH][Hirsute/linux-aws] UBUNTU: [Packaging] aws: Support building libperf-jvmti.so

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1944754

    BugLink: https://bugs.launchpad.net/bugs/1761379

    Adds default-jdk-headless and java-common as Build-Depends, which will
    allow libperf-jvmti.so to be built.

    The library will be installed on the linux-tools package the same way other
    tools are installed. That allows a user to use the current kernel version
    as given by `uname -r` to find the library at
    /usr/lib/linux-tools/`uname -r`/libperf-jvmti.so, which will be a symlink
    to a version-specific library.

    This requires arches and derivatives to opt in with do_tools_perf_jvmti.

    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
    Acked-by: Andy Whitcroft <apw at canonical.com>
    Acked-by: Colin Ian King <colin.king at canonical.com>
    Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>

Copied from focal:linux

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.aws/control.stub.in  | 2 ++
 debian.aws/rules.d/amd64.mk | 1 +
 debian.aws/rules.d/arm64.mk | 1 +
 3 files changed, 4 insertions(+)

diff --git a/debian.aws/control.stub.in b/debian.aws/control.stub.in
index 9afef0245974..230b53db0bf7 100644
--- a/debian.aws/control.stub.in
+++ b/debian.aws/control.stub.in
@@ -14,6 +14,8 @@ Build-Depends:
  libelf-dev <!stage1>,
  libnewt-dev <!stage1>,
  libiberty-dev <!stage1>,
+ default-jdk-headless <!stage1>,
+ java-common <!stage1>,
  rsync <!stage1>,
  libdw-dev <!stage1>,
  libpci-dev <!stage1>,
diff --git a/debian.aws/rules.d/amd64.mk b/debian.aws/rules.d/amd64.mk
index e5a8b4d76461..3f6fd26ad690 100644
--- a/debian.aws/rules.d/amd64.mk
+++ b/debian.aws/rules.d/amd64.mk
@@ -28,3 +28,4 @@ do_dtbs		= false
 do_common_headers_indep = false
 do_dkms_nvidia  = false
 do_dkms_nvidia_server = false
+do_tools_perf_jvmti = true
diff --git a/debian.aws/rules.d/arm64.mk b/debian.aws/rules.d/arm64.mk
index d87ccc4c9b8e..e3270babdf5e 100644
--- a/debian.aws/rules.d/arm64.mk
+++ b/debian.aws/rules.d/arm64.mk
@@ -25,3 +25,4 @@ do_doc_package = false
 do_source_package = false
 do_dtbs                = false
 do_common_headers_indep = false
+do_tools_perf_jvmti = true
-- 
2.33.0