From patchwork Mon Dec 12 19:58:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 45215 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 75CBB27BBEC; Mon, 12 Dec 2022 20:00:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_PDS_PRO_TLD,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2339927BBEB for ; Mon, 12 Dec 2022 20:00:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4oyB-0000YP-Cg; Mon, 12 Dec 2022 15:00:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4oy6-0000VT-KS for guix-patches@gnu.org; Mon, 12 Dec 2022 15:00:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4oy2-0002he-O6 for guix-patches@gnu.org; Mon, 12 Dec 2022 15:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4oy2-0003DI-JR for guix-patches@gnu.org; Mon, 12 Dec 2022 15:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60018] [PATCH 1/5] gnu: Add libtraceevent. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Dec 2022 20:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60018 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60018@debbugs.gnu.org, leo@famulari.name X-Debbugs-Original-To: Guix Patches , Leo Famulari Received: via spool by submit@debbugs.gnu.org id=B.167087514912303 (code B ref -1); Mon, 12 Dec 2022 20:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2022 19:59:09 +0000 Received: from localhost ([127.0.0.1]:54995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4oxA-0003CN-Ap for submit@debbugs.gnu.org; Mon, 12 Dec 2022 14:59:09 -0500 Received: from lists.gnu.org ([209.51.188.17]:39358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4ox7-0003CH-LP for submit@debbugs.gnu.org; Mon, 12 Dec 2022 14:59:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4ox7-0000Gg-AS for guix-patches@gnu.org; Mon, 12 Dec 2022 14:59:05 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4ox4-0002Xm-1o for guix-patches@gnu.org; Mon, 12 Dec 2022 14:59:05 -0500 Date: Mon, 12 Dec 2022 19:58:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1670875131; x=1671134331; bh=uHjZ8zVAVwF9IqZI4OKiMpqL7ryrXeM/xrWIQkrUG7U=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=LPcKFGgmdpux1js/G8Vu4PthKSY2HtxKhCpTsUtEyiGvRaNGlgzC2y1K4VtjRthO9 v4Sjb3PKmhQDdvGCxLwMYg7PmbuMdxu03rvY0wXCKlVmfFrwjQQE2ogG4b4VL5PFIB eVz3J4A6QKIF11w8QVfZ3VbAfyNa8iazLrO9TKcItdjmJ2b+RWxGNV4fcpr7ZoruC7 QuWRoshDAVBkHK8nxd3bYNfhoz5yRG1yZsONaWPr78q+XgbhAyrKEUxNiH9G67q8G8 U8Fqc4beCuGGxdOJ1w8IL2HieWfF1W27uxvm9Nj74yromLSLmKs7lopSL1Y6JlM5+w iecdFiVakXHkA== Message-ID: Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.133; envelope-from=phodina@protonmail.com; helo=mail-40133.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, the following patch set adds tracing tools to Linux. ---- Petr From f2d35e6a46360ed5fdf158c2ae8f037690bd0f80 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Mon, 12 Dec 2022 15:01:33 +0100 Subject: [PATCH 4/5] gnu: Add kernelshark. * gnu/packages/linux.scm (kernelshark): New variable. * gnu/local.mk: Add patch. * gnu/patches/kernelshark-disable-tests.patch: New variable. diff --git a/gnu/local.mk b/gnu/local.mk index 3329801fa6..b99acad616 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1389,6 +1389,7 @@ dist_patch_DATA = \ %D%/packages/patches/lightdm-vnc-color-depth.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kcontacts-incorrect-country-name.patch \ + %D%/packages/patches/kernelshark-disable-tests.patch \ %D%/packages/patches/kde-cli-tools-delay-mime-db.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1883a5bdd3..036ad48b76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -112,11 +112,13 @@ (define-module (gnu packages linux) #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -141,6 +143,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages nss) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) + #:use-module (gnu packages qt) #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -9860,6 +9863,52 @@ (define-public modprobed-db directly by @code{make localmodconfig} as described above.") (license license:expat))) +(define-public kernelshark + (package + (name "kernelshark") + (version "2.1.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernel-shark-kernelshark-v" + version ".tar.gz")) + ;; These require conectivity and GUI + (patches (search-patches "kernelshark-disable-tests.patch")) + (sha256 + (base32 + "0jw9nngyarnasqrqgc3f5yzjjc7351ydvzavj737cc14f75zkkfl")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list (string-append "-DPKG_CONGIG_DIR=" + #$output "/lib/pkgconfig") + (string-append "-D_POLKIT_INSTALL_PREFIX=" + #$output) + (string-append "-D_INSTALL_PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-font + (lambda* _ + ;; Use libre font + (substitute* "CMakeLists.txt" + (("FreeSans") + "FiraSans-Regular"))))))) + (native-inputs (list doxygen pkg-config)) + (inputs (list boost + fontconfig + font-fira-sans + freeglut + json-c + qtbase-5 + libtracefs + libtraceevent + trace-cmd)) + (home-page "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/") + (synopsis + "GUI frontend for @code{trace-cmd} based Linux kernel Ftrace captures") + (description + "This package provides a frontend reader of @code{trace-cmd}.") + (license license:gpl3+))) + (define-public kconfig-hardened-check (package (name "kconfig-hardened-check") diff --git a/gnu/packages/patches/kernelshark-disable-tests.patch b/gnu/packages/patches/kernelshark-disable-tests.patch new file mode 100644 index 0000000000..032f1830ec --- /dev/null +++ b/gnu/packages/patches/kernelshark-disable-tests.patch @@ -0,0 +1,43 @@ +From 81171884b9b8e8e054447bd982b81671e5cf0bc3 Mon Sep 17 00:00:00 2001 +From: Petr Hodina +Date: Mon, 12 Dec 2022 16:52:43 +0100 +Subject: [PATCH] Remove problematic tests. + + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1814c72..1280bdd 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -9,10 +9,6 @@ target_compile_definitions(kshark-tests PRIVATE "BOOST_TEST_DYN_LINK=1") + target_link_libraries(kshark-tests kshark + ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + +-add_test(NAME "get_test_data" +- COMMAND ${KS_TEST_DIR}/get_test_data.sh +- WORKING_DIRECTORY ${KS_TEST_DIR}) +- + add_library(dummy_dpi SHARED test-plugin_dpi.c) + set_target_properties(dummy_dpi PROPERTIES PREFIX "plugin-") + target_link_libraries(dummy_dpi kshark) +@@ -37,18 +33,3 @@ message(STATUS "libkshark-tests") + add_test(NAME "libkshark_tests" + COMMAND ${KS_TEST_DIR}/kshark-tests --log_format=HRF + WORKING_DIRECTORY ${KS_TEST_DIR}) +- +-if (Qt5Widgets_FOUND AND TT_FONT_FILE) +- +- add_executable(kshark-gui-tests libkshark-gui-tests.cpp) +- target_include_directories(kshark-gui-tests PRIVATE ${Boost_INCLUDE_DIRS}) +- target_compile_definitions(kshark-gui-tests PRIVATE "BOOST_TEST_DYN_LINK=1") +- target_link_libraries(kshark-gui-tests kshark-gui +- ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +- +- message(STATUS "libkshark-gui_tests") +- add_test(NAME "libkshark-gui_tests" +- COMMAND ${KS_TEST_DIR}/kshark-gui-tests --log_format=HRF +- WORKING_DIRECTORY ${KS_TEST_DIR}) +- +-endif (Qt5Widgets_FOUND AND TT_FONT_FILE) +-- +2.38.1 + -- 2.38.1