From patchwork Mon Oct 26 13:08:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 535942 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 1CAD914017E for ; Tue, 27 Oct 2015 00:10:00 +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=kn5ZYiQE; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B9F4428155D; Mon, 26 Oct 2015 14:08:05 +0100 (CET) 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 0CFD028155D for ; Mon, 26 Oct 2015 14:07:07 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 26 Oct 2015 14:07:06 +0100 (CET) Received: by wicll6 with SMTP id ll6so113568211wic.1 for ; Mon, 26 Oct 2015 06:08:47 -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=U2jXMvjZH0Boa8eUPWXXnZROv/wwiiZ7EQr28P/ASOA=; b=kn5ZYiQEZueiGSESu3/vR/uyXvo+aSKjDLotKyvaf9fyiE6vYBJsw8gBcJhERM1mq3 F+eORHlVAlfqyud3mtRuzopf4abVMWDf7/H1vbi5KO3fQk34xHpxOlG+CtJt4272VkY4 1yrbSwekYDrKpSSPmI4wgOeXv7+EpPg4+3PLyNRZe7Ay/WVoivKD8QJS/hH/o/xK8Zna AP5rPhgO4c4OrZsW8HBTuHJSaVOfYRu8JDTssqsFKvwrkj6XzFAOpWJ8YnYd15JpA+dn EP8zXVDzX/od7QpCR6tstiPO8T9+ng+jR5fSyWT1HJKnpFZ308CbV5/9X+LcwMDZ8uoO aPLw== X-Received: by 10.28.134.205 with SMTP id i196mr1964343wmd.17.1445864927736; Mon, 26 Oct 2015 06:08:47 -0700 (PDT) Received: from orion.ocedo.cluj.local ([5.2.198.78]) by smtp.gmail.com with ESMTPSA id an7sm17680589wjc.44.2015.10.26.06.08.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Oct 2015 06:08:46 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Mon, 26 Oct 2015 15:08:39 +0200 Message-Id: <1445864919-14638-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 NO_LZMA=1 to perf MAKE_FLAGS to disable LZMA support Signed-off-by: Alexandru Ardelean --- package/devel/perf/Makefile | 1 + ...f-build-Do-not-fail-on-missing-Build-file.patch | 67 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) 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..5e3d63f 100644 --- a/package/devel/perf/Makefile +++ b/package/devel/perf/Makefile @@ -50,6 +50,7 @@ MAKE_FLAGS = \ NO_LIBPERL=1 \ NO_LIBPYTHON=1 \ NO_NEWT=1 \ + NO_LZMA=1 \ CROSS_COMPILE="$(TARGET_CROSS)" \ CC="$(TARGET_CC)" \ LD="$(TARGET_CROSS)ld" \ 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 +