From patchwork Tue Sep 1 21:50:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1355413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Id7iIdds; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qiCk7Llw; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bh14G4S9Rz9sR4 for ; Wed, 2 Sep 2020 07:51:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=FBJZ49LDr0gJzNpmvYPtiWiNRo1XiAwUtm5EWDwGeh0=; b=Id7iIdds1dCoBMfvAqmyQoRFJH Qe0ffZR4Y2x/BQx5BBmN0IL2/IGq7AKD+wshDn4XrpVsxI1xMWhEWEhdG4uhbKwLV5sV4fOFaP5G4 SD8/WURpbYrwTsk/DChf8bQc0pS3VV1u/zc6rdhln9eZlcB40idvy2d+LkBkCthavAOy6eXFz3Uci zur5/dW5i5MgyJ618dCmcx5VNz9d3VKWy5y996oX+AvVoIKEAIK1YXpvszGPwu2vCIzCCqTPbpAGl m/CVqv5qCPqPfnixf+1QqAHfOSMrLaZm4/xegDtDg37tlc2A7asXHekwl2/o5ylPfJNs+mCWWKuOc avzZiIpw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDEAi-0006nL-KT; Tue, 01 Sep 2020 21:50:32 +0000 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDEAg-0006mS-5g for openwrt-devel@lists.openwrt.org; Tue, 01 Sep 2020 21:50:31 +0000 Received: by mail-pj1-x1042.google.com with SMTP id nv17so1303007pjb.3 for ; Tue, 01 Sep 2020 14:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cgSeNL2gqbzJpOg8K9YLZBxznPZaYk4yeLtLEhdxGwk=; b=qiCk7LlwY4wa+IvtS3X+kJJQydhjc0XDCEe/SF1yxDqi/pmjKrzhUO1QSiwk0eQItH dUSd7QJKSmqg9I9FE1gdVIc0QCyMKZUheQcvmDuGS41ZqK6fL8RgZF/HdrODzA0PnYz4 UWIsH7hFq/BuOGyv7X7mMkLAo4EJVJSG6qQjEJ+aI1RIRsZXlzJTO4RAhQhWQU0ut1XP B3GoV3bvecCGi4Or4n7Jc6JpIm5NrRIHnvCrNZsdpDlYzO1bDATbsllOi98USI2fCySw 9A+O6ts3y+65ntlD3uSk47uck05xJtROKQ/KwuXN5EIRNPASbNlhKXmcDUTsbnfdhs9z l0ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cgSeNL2gqbzJpOg8K9YLZBxznPZaYk4yeLtLEhdxGwk=; b=adQ2kpyTMoQ71OsY3NkYsHwS5PRC2osi9/8Wx0fFkTCJNbKYXzSlXwebvAnL7kSYI8 VAW3z/SNJtz1SbGSV7KY29hUmFo9zyhi2qM6M0C0pxerab9ZPIKEydZNYoU01QbHLD+w +m4apddsHNGiTJsyteUK6w12ocbX65tx5iJXEfp/b3IkNjpog3mVj/J3YkRPwooSPG5z qfR9NQT6cPZMwE4T9ob5NqKxK8RULug76Q9ov+KTOkRtD1kHYlTZ7XcXoNqk3rPP0tgo 0JrkVy0UKoTGG5G5dvas2lTkHGEAYLZwvW8Fc28/4AaavXDla9HgW4Qkju8NCMZbiH0v 9BNA== X-Gm-Message-State: AOAM533jcG52mQ0ejPuAblP5bVNHINpKaR1nFMMGFncCy0sOGWtEomo6 2+Ie4JY8BcRr+jhB5dj+NkXCxFyIueVDJg== X-Google-Smtp-Source: ABdhPJxY87Xu4lwwPn1l1sXK+sEshhwYv+YdU54mDVTl+M3KfgGdg1nzrYrTIOjVvjfyZMROICDUpg== X-Received: by 2002:a17:902:fe15:: with SMTP id g21mr3180105plj.22.1598997027670; Tue, 01 Sep 2020 14:50:27 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id q5sm3037230pgi.31.2020.09.01.14.50.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 14:50:27 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] trace-cmd: update to 2.9 Date: Tue, 1 Sep 2020 14:50:26 -0700 Message-Id: <20200901215026.92841-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_175030_225276_8C114BF1 X-CRM114-Status: GOOD ( 20.28 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1042 listed in] [list.dnswl.org] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Fixes compilation with GCC 10. Signed-off-by: Rosen Penev --- package/devel/trace-cmd/Makefile | 25 +++++++++++-------- .../patches/110-mac80211_tracepoint.patch | 10 ++++---- .../devel/trace-cmd/patches/120-limits.patch | 24 ------------------ .../devel/trace-cmd/patches/120-pthread.patch | 11 ++++++++ .../trace-cmd/patches/130-byteswap.patch | 11 ++++++++ 5 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 package/devel/trace-cmd/patches/120-limits.patch create mode 100644 package/devel/trace-cmd/patches/120-pthread.patch create mode 100644 package/devel/trace-cmd/patches/130-byteswap.patch diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index 25831d8b1b..31ffdb1edf 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -1,16 +1,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd -PKG_VERSION:=v2.6.1 -PKG_RELEASE:=2 +PKG_VERSION:=v2.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/ -PKG_HASH:=4eb79001778a77c0ada10265e7f4b5515a3e21a46f0a15c2e8cc614efdf3f5df +PKG_HASH:=53d1d1d6d67ae972086868293e98c61f133bbdc064b8d9d6aebcdcc7d1a5cc6d + +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=COPYING + PKG_INSTALL:=1 PKG_USE_MIPS16:=0 -PKG_LICENSE:=GPL-2.0 - PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -30,30 +32,31 @@ define Package/trace-cmd-extra endef MAKE_FLAGS += \ + NO_AUDIT=1 \ NO_PYTHON=1 \ prefix=/usr -PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins +PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/traceevent/plugins PLUGINS_MAIN := function hrtimer mac80211 sched_switch -TARGET_CFLAGS += --std=gnu99 -D_GNU_SOURCE +TARGET_CFLAGS += --std=gnu99 -D_GNU_SOURCE $(if $(CONFIG_USE_MUSL),-Dpthread_attr_setaffinity_np=pthread_setaffinity_np) define Package/trace-cmd/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/trace-cmd/plugins + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/traceevent/plugins $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trace-cmd $(1)/usr/bin/ $(CP) \ $(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \ - $(1)/usr/lib/trace-cmd/plugins + $(1)/usr/lib/traceevent/plugins endef define Package/trace-cmd-extra/install - $(INSTALL_DIR) $(1)/usr/lib/trace-cmd/plugins + $(INSTALL_DIR) $(1)/usr/lib/traceevent/plugins $(CP) \ $$(patsubst %,$(PLUGINS_DIR)/plugin_%.so, \ $$(filter-out $(PLUGINS_MAIN), \ $$(patsubst $(PLUGINS_DIR)/plugin_%.so,%, \ $$(wildcard $(PLUGINS_DIR)/plugin_*.so)))) \ - $(1)/usr/lib/trace-cmd/plugins + $(1)/usr/lib/traceevent/plugins endef $(eval $(call BuildPackage,trace-cmd)) diff --git a/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch b/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch index e2a68972a3..7ad380c96b 100644 --- a/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch +++ b/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch @@ -1,16 +1,16 @@ ---- a/plugin_mac80211.c -+++ b/plugin_mac80211.c -@@ -179,12 +179,15 @@ static int drv_config(struct trace_seq * +--- a/lib/traceevent/plugins/plugin_mac80211.c ++++ b/lib/traceevent/plugins/plugin_mac80211.c +@@ -165,12 +165,15 @@ static int drv_config(struct trace_seq *s, struct tep_record *record, { 2, "IDLE" }, { 3, "QOS"}, ); -- pevent_print_num_field(s, " chan:%d/", event, "center_freq", record, 1); +- tep_print_num_field(s, " chan:%d/", event, "center_freq", record, 1); - print_enum(s, event, "channel_type", data, - { 0, "noht" }, - { 1, "ht20" }, - { 2, "ht40-" }, - { 3, "ht40+" }); -+ pevent_print_num_field(s, " chan:%d@", event, "control_freq", record, 1); ++ tep_print_num_field(s, " chan:%d@", event, "control_freq", record, 1); + print_enum(s, event, "chan_width", data, + { 0, "20_noht" }, + { 1, "20" }, diff --git a/package/devel/trace-cmd/patches/120-limits.patch b/package/devel/trace-cmd/patches/120-limits.patch deleted file mode 100644 index b9d91cc03e..0000000000 --- a/package/devel/trace-cmd/patches/120-limits.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 293ff6d5bc9d3b8bfbc3c57d20d3d2d00986c168 Mon Sep 17 00:00:00 2001 -From: Alexander Couzens -Date: Sun, 26 Nov 2017 05:22:51 +0100 -Subject: [PATCH] trace-cmd listen: Include limits.h to define PATH_MAX - -PATH_MAX is defined by limits.h. On some system it's also -defined by dirent.h but not on musl. - -Signed-off-by: Alexander Couzens -Signed-off-by: Steven Rostedt (VMware) ---- - trace-listen.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/trace-listen.c -+++ b/trace-listen.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/package/devel/trace-cmd/patches/120-pthread.patch b/package/devel/trace-cmd/patches/120-pthread.patch new file mode 100644 index 0000000000..e3c61c643f --- /dev/null +++ b/package/devel/trace-cmd/patches/120-pthread.patch @@ -0,0 +1,11 @@ +--- a/include/trace-cmd/trace-cmd.h ++++ b/include/trace-cmd/trace-cmd.h +@@ -6,6 +6,8 @@ + #ifndef _TRACE_CMD_H + #define _TRACE_CMD_H + ++#include ++ + #include "traceevent/event-parse.h" + + #define TRACECMD_MAGIC { 23, 8, 68 } diff --git a/package/devel/trace-cmd/patches/130-byteswap.patch b/package/devel/trace-cmd/patches/130-byteswap.patch new file mode 100644 index 0000000000..892a11e17e --- /dev/null +++ b/package/devel/trace-cmd/patches/130-byteswap.patch @@ -0,0 +1,11 @@ +--- a/lib/trace-cmd/include/trace-cmd-local.h ++++ b/lib/trace-cmd/include/trace-cmd-local.h +@@ -6,6 +6,8 @@ + #ifndef _TRACE_CMD_LOCAL_H + #define _TRACE_CMD_LOCAL_H + ++#include ++ + /* Can be overridden */ + void warning(const char *fmt, ...); +