From patchwork Mon Oct 31 07:36:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16791 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id CE91583109; Mon, 31 Oct 2016 08:37:39 +0100 (CET) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=Pg3LztxQ; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 1F5ED83177 for ; Mon, 31 Oct 2016 08:36:58 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C593C2C3F9E217CA8766CEE734.dip0.t-ipconnect.de [IPv6:2003:c5:93c2:c3f9:e217:ca87:66ce:e734]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 929551100A9; Mon, 31 Oct 2016 08:36:57 +0100 (CET) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1477899417; bh=3YaucHFJaRimuWTRF9DGGMhrvENZdZxHBxi9bCwXPCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pg3LztxQB+/cC1mKKfqP/bRMm1zOp598rxW1v6jgr68g0Bj6QGp0F4KNTyBL6sUcG 8Sq4vlso1fKEcJ3fJuyyX1zKXac3EzUlB1+NOdhkUdeh/9XJ1/LO5z/b1zuclT3dei /A4y0DE2agOf6iX1r0HUmp+uEsUa0CFMxbA+TDYg= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 31 Oct 2016 08:36:29 +0100 Message-Id: <20161031073629.31819-6-sven@narfation.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <1637163.TC9CcXIrIP@sven-edge> References: <1637163.TC9CcXIrIP@sven-edge> Subject: [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: Revert "Add support for coccinelle in compat-patches" X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The coccinelle in Debian Jessie seems to be broken. It fails to parse the patches and thus makes it impossible to use the out-of-tree module in these systems. Therefore drop it for now. This reverts commit cd6361c9f4ea19e1318c6549f863a21921154896. Signed-off-by: Sven Eckelmann --- Makefile | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 67f1988..b852a17 100644 --- a/Makefile +++ b/Makefile @@ -40,19 +40,11 @@ ifeq ($(shell cd $(KERNELPATH) && pwd),) $(warning $(KERNELPATH) is missing, please set KERNELPATH) endif -ifeq ($(origin SPATCH), undefined) - SPATCH = spatch - ifeq ($(shell which $(SPATCH) 2>/dev/null),) - $(error $(SPATCH) (coccinelle) not found) - endif -endif - export KERNELPATH RM ?= rm -f MKDIR := mkdir -p PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- PATCH := patch $(PATCH_FLAGS) -i -SPATCH_FLAGS := --in-place --relax-include-path --use-coccigrep --very-quiet CP := cp -fpR LN := ln -sf @@ -114,17 +106,12 @@ $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @set -e; \ - patches="$$(ls -1 compat-patches/|grep -e '.patch$$' -e '.cocci$$'|sort)"; \ + patches="$$(ls -1 compat-patches/|grep '.patch$$'|sort)"; \ for i in $${patches}; do \ - echo ' COMPAT_PATCH '$${i}; \ - if echo $${i}|grep '.patch$$'; then \ - cd $(BUILD_DIR); \ - $(PATCH) ../compat-patches/$${i}; \ - cd - > /dev/null; \ - fi; \ - if echo $${i}|grep '.cocci$$'; then echo $$(pwd); \ - $(SPATCH) $(SPATCH_FLAGS) --dir $(BUILD_DIR) --sp-file compat-patches/$${i} > /dev/null; \ - fi; \ + echo ' COMPAT_PATCH '$${i};\ + cd $(BUILD_DIR); \ + $(PATCH) ../compat-patches/$${i}; \ + cd - > /dev/null; \ done compat-patches/replacements.sh touch $(SOURCE_STAMP)