From patchwork Thu Oct 15 13:01:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 530665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B9103140157 for ; Fri, 16 Oct 2015 00:01:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=D5j0UtR7; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id ED4A028028C; Thu, 15 Oct 2015 15:00:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 364992800A4 for ; Thu, 15 Oct 2015 15:00:07 +0200 (CEST) X-policyd-weight: using cached result; rate:hard: -8.5 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 15 Oct 2015 15:00:07 +0200 (CEST) Received: by wijp11 with SMTP id p11so28607669wij.0 for ; Thu, 15 Oct 2015 06:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=5QfR8GjaND2FdmUayIhTFL+2iIZhgTABt3EPVwOK0qM=; b=D5j0UtR7v8dm/6yDnaoj1QDLflT7LSw68nv8AmPusxtlpI5p7Ec0EnPaxEjFTdYbiG +e3z9aANEsdPKMcMJmykHhDyrKF21Kku7ZxDH1RPfZOH4IKnZUuiNKWgz/GhQMVgxWjG beCYi0NjOHdtkd5h5L8MhQX1T3Pq92iSOL4iYT1u6gmYtmiifdd3YE5MS2oYiVDhd/hC juKxV/kSE8dFTw4P928z6eWbCR812pcMIi0EbPg26XyuH8ggwsw0Y8XH+kJUmnD5Ujg1 y6xUN+7QgM+CqUxzCTpmj421lyedcgx9kC+LC9Fze533Dxh+oWpZ0cNcld7h7cOsqfVi GLIQ== X-Received: by 10.194.157.166 with SMTP id wn6mr10540933wjb.44.1444914099433; Thu, 15 Oct 2015 06:01:39 -0700 (PDT) Received: from orion.ocedo.cluj.local ([5.2.198.78]) by smtp.gmail.com with ESMTPSA id az6sm23535943wib.12.2015.10.15.06.01.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 06:01:38 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Thu, 15 Oct 2015 16:01:32 +0300 Message-Id: <1444914092-29029-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [OpenWrt-Devel] [PATCH] package/devel/perf: fix build for kernel 4.1 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This fix contains 2 parts: - kernel 4.1: backport upstream patch "perf build: Do not fail on missing Build file" - add +liblzma dependency Signed-off-by: Alexandru Ardelean --- package/devel/perf/Makefile | 2 +- ...f-build-Do-not-fail-on-missing-Build-file.patch | 67 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 target/linux/generic/patches-4.1/222-perf-build-Do-not-fail-on-missing-Build-file.patch diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile index b77e29a..5eba8f1 100644 --- a/package/devel/perf/Makefile +++ b/package/devel/perf/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk define Package/perf SECTION:=devel CATEGORY:=Development - DEPENDS:= @USE_GLIBC +libelf1 +libdw +libpthread +librt +binutils + DEPENDS:= @USE_GLIBC +libelf1 +libdw +libpthread +librt +binutils +liblzma TITLE:=Linux performance monitoring tool VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org diff --git a/target/linux/generic/patches-4.1/222-perf-build-Do-not-fail-on-missing-Build-file.patch b/target/linux/generic/patches-4.1/222-perf-build-Do-not-fail-on-missing-Build-file.patch new file mode 100644 index 0000000..3fb2df6 --- /dev/null +++ b/target/linux/generic/patches-4.1/222-perf-build-Do-not-fail-on-missing-Build-file.patch @@ -0,0 +1,67 @@ +From d7a3d85e08477a979933a2bb3b525a8de99543c2 Mon Sep 17 00:00:00 2001 +From: Jiri Olsa +Date: Fri, 29 May 2015 17:42:58 +0200 +Subject: [PATCH] perf build: Do not fail on missing Build file + +Allow nesting into directories without Build file. Currently we force +include of the Build file, which fails the build when the Build file is +missing. + +We already support empty *-in.o' objects if there's nothing in the +directory to be compiled, so we can just use it for missing Build file +cases. + +Also adding this case under tests. + +Reported-by: Rabin Vincent +Signed-off-by: Jiri Olsa +Cc: David Ahern +Cc: Namhyung Kim +Cc: Paul Mackerras +Cc: Peter Zijlstra +Cc: Rabin Vincent +Link: http://lkml.kernel.org/r/1432914178-24086-1-git-send-email-jolsa@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/build/Makefile.build | 2 +- + tools/build/tests/ex/Build | 1 + + tools/build/tests/ex/empty2/README | 2 ++ + 3 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 tools/build/tests/ex/empty2/README + +diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build +index 10df572..69c35cf 100644 +--- a/tools/build/Makefile.build ++++ b/tools/build/Makefile.build +@@ -37,7 +37,7 @@ subdir-obj-y := + + # Build definitions + build-file := $(dir)/Build +-include $(build-file) ++-include $(build-file) + + quiet_cmd_flex = FLEX $@ + quiet_cmd_bison = BISON $@ +diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build +index 0e6c3e6..70d8762 100644 +--- a/tools/build/tests/ex/Build ++++ b/tools/build/tests/ex/Build +@@ -2,6 +2,7 @@ ex-y += ex.o + ex-y += a.o + ex-y += b.o + ex-y += empty/ ++ex-y += empty2/ + + libex-y += c.o + libex-y += d.o +diff --git a/tools/build/tests/ex/empty2/README b/tools/build/tests/ex/empty2/README +new file mode 100644 +index 0000000..2107cc5 +--- /dev/null ++++ b/tools/build/tests/ex/empty2/README +@@ -0,0 +1,2 @@ ++This directory is left intentionally without Build file ++to test proper nesting into Build-less directories. +-- +2.1.4 +