Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernelshark for openSUSE:Factory checked in at 2022-09-15 22:59:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernelshark (Old) and /work/SRC/openSUSE:Factory/.kernelshark.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernelshark" Thu Sep 15 22:59:02 2022 rev:3 rq:1003727 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernelshark/kernelshark.changes 2022-01-22 08:19:08.354517597 +0100 +++ /work/SRC/openSUSE:Factory/.kernelshark.new.2083/kernelshark.changes 2022-09-15 22:59:59.833352070 +0200 @@ -1,0 +2,11 @@ +Wed Aug 17 12:09:55 UTC 2022 - Daniel Wagner <daniel.wag...@suse.com> + +- Update to latest upstream version (2.1.1) + - Drop 0001-trace-cmd-fix-multiple-definition-compiler-errors.patch + - Drop cmake-link-glut-libraries.patch + - Drop makefile-bash.patch + - Drop makefile-lib64.patch + - Drop kernelshark-make-fontheight.patch + - Add 0001-kernel-shark-Build-missed_event-as-GUI-plugin.patch + +------------------------------------------------------------------- Old: ---- 0001-trace-cmd-fix-multiple-definition-compiler-errors.patch cmake-link-glut-libraries.patch kernelshark-1.2.obscpio kernelshark-1.3.obscpio kernelshark-make-fontheight.patch makefile-bash.patch makefile-lib64.patch New: ---- 0001-kernel-shark-Build-missed_event-as-GUI-plugin.patch kernelshark-2.1.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernelshark.spec ++++++ --- /var/tmp/diff_new_pack.e37xR7/_old 2022-09-15 23:00:02.741360281 +0200 +++ /var/tmp/diff_new_pack.e37xR7/_new 2022-09-15 23:00:02.749360303 +0200 @@ -17,67 +17,102 @@ Name: kernelshark -Version: 1.3 +Version: 2.1.1 Release: 0 Summary: Visualisation tool for trace-cmd data License: GPL-2.0-only AND LGPL-2.1-only Group: Development/Tools/Debuggers -URL: https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git +URL: https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git Source0: kernelshark-%{version}.tar.xz -Patch1: makefile-lib64.patch -Patch2: makefile-bash.patch -Patch3: 0001-trace-cmd-fix-multiple-definition-compiler-errors.patch -Patch4: kernelshark-make-fontheight.patch -Patch5: cmake-link-glut-libraries.patch -BuildRequires: asciidoc +Patch1: 0001-kernel-shark-Build-missed_event-as-GUI-plugin.patch +BuildRequires: bison +BuildRequires: boost-devel BuildRequires: cmake -BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: flex BuildRequires: freeglut-devel -BuildRequires: libQt5Widgets-devel +BuildRequires: libXi-devel +BuildRequires: libXmu-devel BuildRequires: libjson-c-devel BuildRequires: libqt5-qtbase-devel +BuildRequires: libtracecmd-devel BuildRequires: libtraceevent-devel BuildRequires: libtracefs-devel +BuildRequires: trace-cmd >= 3.1.0 Recommends: trace-cmd -BuildRequires: xsltproc %description trace-cmd reporting can be extremely verbose making it difficult to analyse. kernelshark visualises the data so that it can be filtered or trimmed. +%package devel +Summary: Development files for kernelshark +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} + +%description devel +Development files for kernelshark + %prep %autosetup -p1 %build -make %{?_smp_mflags} prefix=%{_prefix} trace-cmd -make %{?_smp_mflags} prefix=%{_prefix} gui -make %{?_smp_mflags} MANPAGE_DOCBOOK_XSL=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl doc +# We would like to use _ttfontsdir macro but somehow the expension +# doesn't seem to work +%define fontname %{_datadir}/fonts/truetype/FreeSans.ttf + +# The upstream project decided it is a good idea to have a directory +# called build with build script. The cmake macro expects to be able +# to create and use a directory called build. This leads to complete +# broken configuration. For the time being let's expand the relavent +# parts of the cmake macro by hand until it is fixed in upstream. +cmake \ + -DTT_FONT_FILE:PATH=%{fontname} \ + -D_INSTALL_PREFIX:PATH=%{_prefix} \ + -D_LIBDIR:PATH=%{_libdir} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \ + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ +%if "%{?_lib}" == "lib64" + -DLIB_SUFFIX=64 \ +%endif +%if %suse_version <= 1500 + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ +%endif + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \ + -DPKG_CONGIG_DIR=%{_libdir}/pkgconfig + +make %{?_smp_mflags} %install -%make_install prefix=%{_prefix} install_gui -%make_install prefix=%{_prefix} install_doc -rm %{buildroot}/%{_mandir}/man1/trace-cmd* -rm %{buildroot}/%{_mandir}/man5/trace-cmd.dat.5 -rm %{buildroot}/%{_datadir}/bash-completion/completions/trace-cmd.bash -rm -rf %{buildroot}/%{_libdir}/trace-cmd -rm -rf %{buildroot}/%{_bindir}/trace-cmd +make DESTDIR=%{buildroot} install rm -rf %{buildroot}/%{_datadir}/polkit-1 sed -i -e 's/^Categories=.*/Categories=Development;Profiling/' %{buildroot}/%{_datadir}/applications/kernelshark.desktop -sed -i -e 's/^Version=1.0.0/Version=1.0/' %{buildroot}/%{_datadir}/applications/kernelshark.desktop +sed -i -e 's/^Version=1.5/Version=1.0/' %{buildroot}/%{_datadir}/applications/kernelshark.desktop + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%{_mandir}/man1/kernelshark.1%{?ext_man} %{_bindir}/kernelshark %{_bindir}/kshark-* %{_libdir}/kernelshark -%{_libdir}/libkshark* +%{_libdir}/libkshark*.so.* %{_datadir}/applications/kernelshark.desktop -%{_datadir}/kernelshark %{_datadir}/icons/kernelshark -%license COPYING - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%license LICENSES/GPL-2.0 +%license LICENSES/LGPL-2.1 +%doc README + +%files devel +%{_libdir}/libkshark*.so +%{_includedir}/kernelshark +%{_libdir}/pkgconfig/*.pc %changelog ++++++ 0001-kernel-shark-Build-missed_event-as-GUI-plugin.patch ++++++ >From 792088b73cefdea49dd0e1aee62579f05daeaa8b Mon Sep 17 00:00:00 2001 From: Daniel Wagner <dwag...@suse.de> Date: Wed, 24 Aug 2022 15:47:55 +0200 Subject: [PATCH kernelshark] kernel-shark: Build missed_event as GUI plugin missed_events depends on GUI elements hence it should be build as GUI plugin. Signged-off-by: Daniel Wagner <dwag...@suse.de> --- I had some build errors due to global build flags in our build service: Linker flags : -flto=auto -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now src/plugins/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index e9d906863424..49aee3ed7560 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -61,8 +61,8 @@ if (Qt5Widgets_FOUND AND TT_FONT_FILE) endif (Qt5Widgets_FOUND AND TT_FONT_FILE) -BUILD_PLUGIN(NAME missed_events - SOURCE missed_events.c MissedEvents.cpp) +BUILD_GUI_PLUGIN(NAME missed_events + SOURCE missed_events.c MissedEvents.cpp) list(APPEND PLUGIN_LIST "missed_events") install(TARGETS ${PLUGIN_LIST} -- 2.37.1 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.e37xR7/_old 2022-09-15 23:00:02.825360517 +0200 +++ /var/tmp/diff_new_pack.e37xR7/_new 2022-09-15 23:00:02.829360529 +0200 @@ -1,10 +1,10 @@ <services> <service name="obs_scm" mode="disabled"> <param name="scm">git</param> - <param name="url">git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git</param> + <param name="url">https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git</param> <param name="filename">kernelshark</param> - <param name="revision">kernelshark-v1.0</param> - <param name="version">v1.3</param> + <param name="revision">kernelshark-v2.1.1</param> + <param name="version">v2.1.1</param> <param name="match-tag">kernelshark-*</param> <param name="versionrewrite-pattern">v(.*)</param> </service> ++++++ kernelshark-1.2.obscpio -> kernelshark-2.1.1.obscpio ++++++ ++++ 111994 lines of diff (skipped) ++++++ kernelshark.obsinfo ++++++ --- /var/tmp/diff_new_pack.e37xR7/_old 2022-09-15 23:00:03.277361794 +0200 +++ /var/tmp/diff_new_pack.e37xR7/_new 2022-09-15 23:00:03.281361805 +0200 @@ -1,5 +1,5 @@ name: kernelshark -version: 1.3 -mtime: 1564148404 -commit: f97e28a331aba716cd431ce4b7f7fc1583875ae7 +version: 2.1.1 +mtime: 1650971316 +commit: 3b3c6c1de2f63a52d5b73fc84e7f23375590c845
