From patchwork Wed Oct 23 12:55:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Alyoshin X-Patchwork-Id: 285667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7E9542C00A4 for ; Wed, 23 Oct 2013 23:55:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 81375930C4; Wed, 23 Oct 2013 12:55:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SLA-ff-FmCV2; Wed, 23 Oct 2013 12:55:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E09919392A; Wed, 23 Oct 2013 12:55:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2567B1BFA15 for ; Wed, 23 Oct 2013 12:55:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 22C8D8C1A6 for ; Wed, 23 Oct 2013 12:55:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nCwMIxyMG3VF for ; Wed, 23 Oct 2013 12:55:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6D15E8C186 for ; Wed, 23 Oct 2013 12:55:14 +0000 (UTC) Received: by mail-la0-f49.google.com with SMTP id eh20so600290lab.8 for ; Wed, 23 Oct 2013 05:55:12 -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:in-reply-to:references; bh=4jotItH2zJDEWvSnCMoLdf/O6e8GJBmdHZFL7KoamZs=; b=i3aGlfzVnWjbM38PwUlvKJvMngd8q7fv/W4FTdmAckFUuKaOFSj2UPFQTMkP+z1NbX Np+yMxslYmJcGdETFrUVG3uu1+jssYo7Alr73cHiNl46ZHFyS03XfrtlkcY9Wf5yQoYn vWF5m5Lp6EzB+svMKtCmRMT2YH1d0H3ievdXFJhzm7Tx5u5aZZk9MIH33F9odd3grGMB A0tb4VrIqvcVmKs91+bkCPLsP428PMyD1TMVypsFC5FUpm9ESIC80hoje9OwjF0PPwOK VWLO+05/rcKCt4QDgUTyI/4PKJiSnA5PJZpnR5dhBudsDg2SkEvCc5+d8BfljLz4FOHS y/nw== X-Received: by 10.112.59.134 with SMTP id z6mr2089958lbq.28.1382532912592; Wed, 23 Oct 2013 05:55:12 -0700 (PDT) Received: from debian.bit ([62.117.93.12]) by mx.google.com with ESMTPSA id ua4sm19244505lbb.17.2013.10.23.05.55.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Oct 2013 05:55:12 -0700 (PDT) From: Sergey Alyoshin To: buildroot@busybox.net Date: Wed, 23 Oct 2013 16:55:00 +0400 Message-Id: <1382532900-18456-1-git-send-email-alyoshin.s@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1382518620-26320-2-git-send-email-alyoshin.s@gmail.com> References: <1382518620-26320-2-git-send-email-alyoshin.s@gmail.com> Cc: Sergey Alyoshin Subject: [Buildroot] [PATCH 2/2] kobs-ng: test kernel version for redefines X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net kobs-ng failed to build with 2.6.36, because enum tested with #ifndef mtd.c: In function 'mtd_open': mtd.c:696:42: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this function) mtd.c:696:42: note: each undeclared identifier is reported only once for each function it appears in mtd.c: In function 'mtd_set_ecc_mode': mtd.c:896:43: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this function) mtd.c:914:43: error: 'MTD_FILE_MODE_RAW' undeclared (first use in this function) Do kernel version test before enum redefines. Signed-off-by: Sergey Alyoshin Tested-by: Thomas De Schampheleire --- package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch index 39d7474..3ffba71 100644 --- a/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch +++ b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch @@ -3,6 +3,7 @@ MEMSETOOBSEL. Allow code to work with both older and newer kernel versions. Signed-off-by: Paul B. Henson +Signed-off-by: Sergey Alyoshin diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c 2012-12-17 22:37:40.000000000 -0800 @@ -56,16 +57,15 @@ diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h 2012-12-17 22:37:40.000000000 -0800 +++ kobs-ng-3.0.35-4.0.0/src/mtd.h 2013-07-28 19:33:57.000000000 -0700 -@@ -31,6 +31,14 @@ +@@ -31,6 +31,13 @@ #include "BootControlBlocks.h" #include "rom_nand_hamming_code_ecc.h" +// Newer kernel headers renamed define -+#ifndef MTD_MODE_NORMAL -+#define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL -+#endif -+#ifndef MTD_MODE_RAW -+#define MTD_MODE_RAW MTD_FILE_MODE_RAW ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL ++# define MTD_MODE_RAW MTD_FILE_MODE_RAW +#endif + //------------------------------------------------------------------------------