| Message ID | 20210924140632.24228-3-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Focal/linux-aws] UBUNTU: [Packaging] aws: Support building libperf-jvmti.so | expand |
diff --git a/debian.aws/control.stub.in b/debian.aws/control.stub.in index bb65230def813..f18a47280a0aa 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 163ee5b72d35a..cb95fbbba05de 100644 --- a/debian.aws/rules.d/amd64.mk +++ b/debian.aws/rules.d/amd64.mk @@ -28,3 +28,4 @@ do_source_package = false do_dtbs = false do_common_headers_indep = false do_dkms_wireguard = true +do_tools_perf_jvmti = true diff --git a/debian.aws/rules.d/arm64.mk b/debian.aws/rules.d/arm64.mk index 5bfc998420794..8de9e8d9953e9 100644 --- a/debian.aws/rules.d/arm64.mk +++ b/debian.aws/rules.d/arm64.mk @@ -27,3 +27,4 @@ do_source_package = false do_dtbs = false do_common_headers_indep = false do_dkms_wireguard = true +do_tools_perf_jvmti = true
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@canonical.com> Acked-by: Andy Whitcroft <apw@canonical.com> Acked-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com> Copied from focal:linux Signed-off-by: Tim Gardner <tim.gardner@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(+)