Djam/kernel-6.1
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-6.1.git synced 2025-02-25 00:02:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix building perf on aarch64

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-11-27 01:21:49 +03:00
parent c75db816bb
commit 3f15f9038b
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel.spec
View file

@ -24,7 +24,7 @@
%define sublevel 80 %define sublevel 80
# Release number. Increase this before a rebuild. # Release number. Increase this before a rebuild.
%define rpmrel 1 %define rpmrel 2
%define fullrpmrel %{rpmrel} %define fullrpmrel %{rpmrel}
%define rpmtag %{disttag} %define rpmtag %{disttag}
@ -40,13 +40,12 @@
%define kverrel %{kversion}-%{fullrpmrel} %define kverrel %{kversion}-%{fullrpmrel}
%define tar_ver %{kernelversion}.%{patchlevel} %define tar_ver %{kernelversion}.%{patchlevel}
# i586
%ifarch %{ix86} %ifarch %{ix86}
%define arch_suffix i686 %define arch_suffix i686
%endif %endif
%ifarch %{x86_64} %ifarch %{x86_64}
%define arch_suffix %{_arch} %define arch_suffix x86_64
%endif %endif
%ifarch aarch64 %ifarch aarch64
@ -155,13 +154,8 @@
%endif %endif
# build perf and cpupower tools # build perf and cpupower tools
%ifarch %{ix86} %{x86_64}
%define build_perf 1 %define build_perf 1
%define build_cpupower 1 %define build_cpupower 1
%else
%define build_perf 0
%define build_cpupower 0
%endif
# compress modules with xz # compress modules with xz
@ -1645,8 +1639,8 @@ cat ../kernel_exclude_debug_files.%{flavour} >> $kernel_files
LC_ALL=C sed -ri "s/^EXTRAVERSION.*/EXTRAVERSION = -%{fullrpmrel}/" Makefile LC_ALL=C sed -ri "s/^EXTRAVERSION.*/EXTRAVERSION = -%{fullrpmrel}/" Makefile
%if %{build_perf} %if %{build_perf}
%smake -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} NO_GTK2=1 all %smake -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} lib=%{_lib} NO_GTK2=1 all
%smake -C tools/perf -s prefix=%{_prefix} NO_GTK2=1 man %smake -C tools/perf -s prefix=%{_prefix} lib=%{_lib} NO_GTK2=1 man
%endif %endif
%if %{build_cpupower} %if %{build_cpupower}
@ -1732,7 +1726,7 @@ LC_ALL=C sed -ri "s/^EXTRAVERSION.*/EXTRAVERSION = -%{fullrpmrel}/" Makefile
%if %{build_perf} %if %{build_perf}
# perf tool binary and supporting scripts/binaries # perf tool binary and supporting scripts/binaries
make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} lib=%{_lib} install
# Versionize shebang (#!/usr/bin/env python -> #!/usr/bin/python3) # Versionize shebang (#!/usr/bin/env python -> #!/usr/bin/python3)
sed -i -e '1 s,^.*$,#!%{__python3},' %{buildroot}%{_prefix}/libexec/perf-core/scripts/python/exported-sql-viewer.py sed -i -e '1 s,^.*$,#!%{__python3},' %{buildroot}%{_prefix}/libexec/perf-core/scripts/python/exported-sql-viewer.py