diff --git a/SOURCE b/SOURCE index 4871c222ecdeaf6da3b69a41ee48964cf580e376..7a2f8b958bdb979290c0db2c0798f92bbfe7f6b1 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -v6.1.6 +v6.2-rc4 diff --git a/kernel.spec b/kernel.spec index b6c96597b281eb5e1084adadcb541fc7efacf17c..767a0d000c5d60af14a5276cbdc48e075d6d9482 100644 --- a/kernel.spec +++ b/kernel.spec @@ -8,11 +8,11 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} %global debuginfodir /usr/lib/debug -%global upstream_version 6.1 -%global upstream_sublevel 6 +%global upstream_version 6.2 +%global upstream_sublevel rc4 %global devel_release 1 %global maintenance_release .0.0 -%global pkg_release .3 +%global pkg_release .4 %define with_debuginfo 0 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -118,6 +118,7 @@ ExclusiveOS: Linux %if %{with_perf} BuildRequires: flex xz-devel libzstd-devel BuildRequires: java-devel +BuildRequires: libtraceevent-devel %endif BuildRequires: dwarves @@ -359,7 +360,7 @@ make ARCH=%{Arch} modules %{?_smp_mflags} %if %{with_perf} # perf %global perf_make \ - make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix} + make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 LIBTRACEEVENT_DYNAMIC=1 prefix=%{_prefix} %if 0%{?with_python2} %global perf_python2 -C tools/perf PYTHON=%{__python2} %global perf_python3 -C tools/python3-perf PYTHON=%{__python3} @@ -625,12 +626,13 @@ popd # perf # perf tool binary and supporting scripts/binaries %if 0%{?with_python2} -%{perf_make} %{perf_python2} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins +%{perf_make} %{perf_python2} DESTDIR=%{buildroot} lib=%{_lib} install-bin %else -%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins +%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin %endif # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace +rm -f %{buildroot}%{_bindir}/traceevent # remove examples rm -rf %{buildroot}/usr/lib/perf/examples @@ -645,7 +647,6 @@ rm -rf %{buildroot}/usr/lib/perf/include/bpf/ # perf man pages (note: implicit rpm magic compresses them later) install -d %{buildroot}/%{_mandir}/man1 -install -pm0644 tools/kvm/kvm_stat/kvm_stat.1 %{buildroot}/%{_mandir}/man1/ install -pm0644 tools/perf/Documentation/*.1 %{buildroot}/%{_mandir}/man1/ %endif @@ -698,6 +699,7 @@ popd # kvm pushd tools/kvm/kvm_stat make INSTALL_ROOT=%{buildroot} install-tools +make INSTALL_ROOT=%{buildroot} install-man popd %define __spec_install_post\ @@ -799,8 +801,8 @@ fi %files -n perf %{_bindir}/perf %{_libdir}/libperf-jvmti.so -%dir %{_libdir}/traceevent -%{_libdir}/traceevent/plugins/ +# %dir %{_libdir}/traceevent +# %{_libdir}/traceevent/plugins/ %{_libexecdir}/perf-core %{_datadir}/perf-core/ %{_mandir}/man[1-8]/perf* @@ -882,6 +884,9 @@ fi %endif %changelog +* Tue Jan 17 2023 Xie XiuQi - 6.2.rc4-1.0.0.4 +- update to v6.2-rc4 + * Tue Jan 17 2023 Xie XiuQi - 6.1.6-1.0.0.3 - update to v6.1.6