| Message ID | 20240606143732.999290-1-masahiro.yamada@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Oracular/Unstable] UBUNTU: [packaging] remove the kernel configuration for perf | expand |
On Thu, Jun 06, 2024 at 11:37:32PM +0900, Masahiro Yamada wrote: > This was introduced by commit "UBUNTU: [Debian] perf -- build in the > context of the full generated local headers". [1] > > If you intend to build perf with the latest UAPI headers, you need > to run 'make headers_install'. > > Since tools/perf is a userspace program, the kernel configuration > or 'make prepare' should not be necessary. > > Remove this, as it never worked as intended. > > [1]: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/xenial/commit/?id=5531fa5fadf52af8cd0cfcd6ac65a2663cf3a863 > > Signed-off-by: Masahiro Yamada <masahiro.yamada@canonical.com>
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 94c9cd5c6b89..13032f221664 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -647,13 +647,6 @@ ifeq ($(do_tools_cpupower),true) CPUFREQ_BENCH=false endif ifeq ($(do_tools_perf),true) - cd $(builddirpa) && $(kmake) $(defconfig) - mv $(builddirpa)/.config $(builddirpa)/.config.old - sed -e 's/^# \(CONFIG_MODVERSIONS\) is not set$$/\1=y/' \ - -e 's/.*CONFIG_LOCALVERSION_AUTO.*/# CONFIG_LOCALVERSION_AUTO is not set/' \ - $(builddirpa)/.config.old > $(builddirpa)/.config - cd $(builddirpa) && $(kmake) syncconfig - cd $(builddirpa) && $(kmake) prepare cd $(builddirpa)/tools/perf && \ $(kmake) prefix=/usr NO_LIBTRACEEVENT=1 HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0 endif
This was introduced by commit "UBUNTU: [Debian] perf -- build in the context of the full generated local headers". [1] If you intend to build perf with the latest UAPI headers, you need to run 'make headers_install'. Since tools/perf is a userspace program, the kernel configuration or 'make prepare' should not be necessary. Remove this, as it never worked as intended. [1]: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/xenial/commit/?id=5531fa5fadf52af8cd0cfcd6ac65a2663cf3a863 Signed-off-by: Masahiro Yamada <masahiro.yamada@canonical.com> --- This was originally written during the hackathon last year, but it was not merged. Let me retry as a separate patch. debian/rules.d/2-binary-arch.mk | 7 ------- 1 file changed, 7 deletions(-)