mmc-utils: upgrade to latest git version

Removed 0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch

Instead of that patch, define __SANE_USERSPACE_TYPES__ to avoid
compile errors due to conflicting types for '__u64' in MIPS64/PPC64

(From OE-Core rev: 819541253d63b14bb6a5fd4cafdd2b6fa16f4ca3)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John 2016-02-12 16:05:20 +02:00 committed by Richard Purdie
parent b5b8003a0b
commit 03e1950f55
2 changed files with 5 additions and 34 deletions

View File

@ -1,28 +0,0 @@
Upstream-Status: Pending
mmc.h: don't include <asm-generic/int-ll64.h>
Including this file causes a compile failure for qemumips64.
This file is not needed to be explicitly included, because it will be
included by the <linux/mmc/ioctl.h> file if _MIPS_SZLONG is not 64.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
mmc.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/mmc.h b/mmc.h
index 9871d62..3df2cdf 100644
--- a/mmc.h
+++ b/mmc.h
@@ -14,7 +14,6 @@
* Boston, MA 021110-1307, USA.
*/
-#include <asm-generic/int-ll64.h>
#include <linux/mmc/ioctl.h>
#include <stdio.h>
--
1.7.9.5

View File

@ -4,18 +4,17 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0"
SRCBRANCH ?= "master"
SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189"
SRCREV = "44f94b925894577f9ffcf2c418dd013a5e582648"
PV = "0.1"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \
file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}"
S = "${WORKDIR}/git"
do_configure_prepend() {
sed -i "s:-Werror::g" ${S}/Makefile
}
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
CFLAGS_append_mips64 = " -D__SANE_USERSPACE_TYPES__"
CFLAGS_append_mips64n32 = " -D__SANE_USERSPACE_TYPES__"
do_install() {
install -d ${D}${bindir}