| Message ID | 20190411134842.11730-2-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,disco,1/1] UBUNTU: [Packaging] Support building libperf-jvmti.so | expand |
On 11.04.19 15:48, Thadeu Lima de Souza Cascardo wrote: > 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. > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > --- Actually, come back once it actually works... # Install only the full versioned libcpupower.so.5.0.0-14, not # the usual symlinks to it. install -m644 /tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/power/cpupower/libcpupower.so.5.0.0-14 \ /tmp/kernel-smb-7805e26-lMEp/build/debian/linux-tools-5.0.0-14/usr/lib/ install -m755 /tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/perf/perf /tmp/kernel-smb-7805e26-lMEp/build/debian/linux-tools-5.0.0-14/usr/lib/linux-tools-5.0.0-14 install -m755 /tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/perf/libperf-jvmti.so /tmp/kernel-smb-7805e26-lMEp/build/debian/linux-tools-5.0.0-14/usr/lib/linux-tools-5.0.0-14 install: cannot stat '/tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/perf/libperf-jvmti.so': No such file or directory make: *** [debian/rules.d/2-binary-arch.mk:682: install-perarch] Error 1 +++gbk++++ build exit status was 2 > debian.master/control.stub.in | 2 ++ > debian/rules.d/2-binary-arch.mk | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > index 7076ac27e322..04d677f8b717 100644 > --- a/debian.master/control.stub.in > +++ b/debian.master/control.stub.in > @@ -13,6 +13,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/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk > index b04c855f3cd8..8bc70b579d8f 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -375,6 +375,7 @@ ifeq ($(do_tools_cpupower),true) > endif > ifeq ($(do_tools_perf),true) > $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* > + $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* > endif > ifeq ($(do_tools_x86),true) > $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/x86_energy_perf_policy $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* > @@ -691,6 +692,7 @@ ifeq ($(do_tools_cpupower),true) > endif > ifeq ($(do_tools_perf),true) > install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) > + install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) > endif > ifeq ($(do_tools_x86),true) > install -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \ >
On Tue, Apr 23, 2019 at 11:32:36AM +0200, Stefan Bader wrote: > On 11.04.19 15:48, Thadeu Lima de Souza Cascardo wrote: > > 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. > > > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > > --- > > Actually, come back once it actually works... > > # Install only the full versioned libcpupower.so.5.0.0-14, not > # the usual symlinks to it. > install -m644 > /tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/power/cpupower/libcpupower.so.5.0.0-14 > \ > /tmp/kernel-smb-7805e26-lMEp/build/debian/linux-tools-5.0.0-14/usr/lib/ > install -m755 > /tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/perf/perf > /tmp/kernel-smb-7805e26-lMEp/build/debian/linux-tools-5.0.0-14/usr/lib/linux-tools-5.0.0-14 > install -m755 > /tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/perf/libperf-jvmti.so > /tmp/kernel-smb-7805e26-lMEp/build/debian/linux-tools-5.0.0-14/usr/lib/linux-tools-5.0.0-14 > install: cannot stat > '/tmp/kernel-smb-7805e26-lMEp/build/debian/build/tools-perarch/tools/perf/libperf-jvmti.so': > No such file or directory > make: *** [debian/rules.d/2-binary-arch.mk:682: install-perarch] Error 1 > +++gbk++++ build exit status was 2 > Hum... I even provided a test kernel after building on a ppa. I will investigate this. Cascardo. > > debian.master/control.stub.in | 2 ++ > > debian/rules.d/2-binary-arch.mk | 2 ++ > > 2 files changed, 4 insertions(+) > > > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in > > index 7076ac27e322..04d677f8b717 100644 > > --- a/debian.master/control.stub.in > > +++ b/debian.master/control.stub.in > > @@ -13,6 +13,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/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk > > index b04c855f3cd8..8bc70b579d8f 100644 > > --- a/debian/rules.d/2-binary-arch.mk > > +++ b/debian/rules.d/2-binary-arch.mk > > @@ -375,6 +375,7 @@ ifeq ($(do_tools_cpupower),true) > > endif > > ifeq ($(do_tools_perf),true) > > $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* > > + $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* > > endif > > ifeq ($(do_tools_x86),true) > > $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/x86_energy_perf_policy $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* > > @@ -691,6 +692,7 @@ ifeq ($(do_tools_cpupower),true) > > endif > > ifeq ($(do_tools_perf),true) > > install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) > > + install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) > > endif > > ifeq ($(do_tools_x86),true) > > install -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \ > > > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 7076ac27e322..04d677f8b717 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -13,6 +13,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/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index b04c855f3cd8..8bc70b579d8f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -375,6 +375,7 @@ ifeq ($(do_tools_cpupower),true) endif ifeq ($(do_tools_perf),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif ifeq ($(do_tools_x86),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/x86_energy_perf_policy $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* @@ -691,6 +692,7 @@ ifeq ($(do_tools_cpupower),true) endif ifeq ($(do_tools_perf),true) install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) + install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif ifeq ($(do_tools_x86),true) install -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \
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. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian.master/control.stub.in | 2 ++ debian/rules.d/2-binary-arch.mk | 2 ++ 2 files changed, 4 insertions(+)