From patchwork Thu Feb 6 21:55:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 317547 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 0E1452C009F for ; Fri, 7 Feb 2014 08:55:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F2A8793D30; Thu, 6 Feb 2014 21:55:35 +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 RlGkoMiaTsJF; Thu, 6 Feb 2014 21:55:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 36CBF89B78; Thu, 6 Feb 2014 21:55:34 +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 88B3E1BF868 for ; Thu, 6 Feb 2014 21:55:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 830048C5FF for ; Thu, 6 Feb 2014 21:55:32 +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 zuJMCEcjVQCW for ; Thu, 6 Feb 2014 21:55:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id 78A6382D0F for ; Thu, 6 Feb 2014 21:55:31 +0000 (UTC) Received: by mail-wi0-f182.google.com with SMTP id f8so274021wiw.9 for ; Thu, 06 Feb 2014 13:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=qLvlE2YJ7XikbzAPIbSc43sQNTaQUsQgm7gyruqUGrE=; b=Df8KnsF6Pl3HoYwteXOuTVo4LFcF1AuVo/XbMYZoDvzNThvI6V4+QwFZ/gnE+wxoT0 MnkA4sDazFA7FshzUJg/lsP32Gu8OMp7x5ZuAZXDzxTwJnfrLrU1L9PAkpbL5tgaBp9j ARiWKCe+AOM92Glmziv5EmufJREWAuDLpcAJOupb23tX+UioN236IfhCmBYLs6dpWRLL cOxDhTjcjx5tj6a07NL7Xh/HDTN8uunBAN/l35f7VFlOlmxG7nmehY02si1qmEpP9oRC FqC5CSChLT6HVRlydSuJXb20l2wNyjiAWk3GLZx6DvTJrctrWNsxybl9WCrQIPjbaWuF psOQ== X-Received: by 10.180.221.68 with SMTP id qc4mr1214282wic.30.1391723729827; Thu, 06 Feb 2014 13:55:29 -0800 (PST) Received: from localhost.localdomain (AToulouse-651-1-134-190.w109-222.abo.wanadoo.fr. [109.222.213.190]) by mx.google.com with ESMTPSA id f3sm2260445wiv.2.2014.02.06.13.55.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Feb 2014 13:55:29 -0800 (PST) From: Ryan Barnett To: buildroot@busybox.net Date: Thu, 6 Feb 2014 22:55:22 +0100 Message-Id: <1391723722-7567-1-git-send-email-rjbarnet@rockwellcollins.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH 1/1] mmc-utils: fix linux headers issue before 3-4 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 With toolchains that include linux kernel headers before the 3.4 kernel, an issue exists with linux/mmc/ioctl.h in that it doesn't include linux/types.h. Merged the patch with an existing patch for mmc-utils as it modifies the same file and fixes similar issues. Also updated the patch to conform to the buildroot patch naming standard. Fixes: http://autobuild.buildroot.net/results/828/828c7a686736710c4fcb152230d0fa6b5f4d6ad3 Signed-off-by: Ryan Barnett --- ...ion.patch => mmc-utils-001-fix-mmc-h-includes.patch} | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) rename package/mmc-utils/{0001-mmc-utils-Fix-64-bit-values-redefinition.patch => mmc-utils-001-fix-mmc-h-includes.patch} (79%) diff --git a/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch b/package/mmc-utils/mmc-utils-001-fix-mmc-h-includes.patch similarity index 79% rename from package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch rename to package/mmc-utils/mmc-utils-001-fix-mmc-h-includes.patch index 07dc742..8d0b2eb 100644 --- a/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch +++ b/package/mmc-utils/mmc-utils-001-fix-mmc-h-includes.patch @@ -1,4 +1,4 @@ -mmc-utils: Fix 64-bit values redefinition +mmc-utils: fix mmc.h includes Some toolchains include asm-generic/int-l64.h from their asm/types.h file for certain 64-bit architectures. This causes a conflict between @@ -13,28 +13,29 @@ asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was here __extension__ typedef __signed__ long long __s64; +[Ryan: added include of linux/types.h because mmc/ioctl.h does not + include it in kernel version before 3.4] + Signed-off-by: Vicente Olivert Riera +Signed-off-by: Ryan Barnett --- mmc.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) - diff --git a/mmc.h b/mmc.h index 9871d62..2d54ec5 100644 --- a/mmc.h +++ b/mmc.h -@@ -14,9 +14,11 @@ +@@ -14,9 +14,12 @@ * Boston, MA 021110-1307, USA. */ - + -#include ++#include #include #include +#ifndef _ASM_GENERIC_INT_L64_H +#include +#endif - + #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } } - --- -1.7.1