diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-02-12 16:05:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-14 11:42:19 +0000 |
commit | 03e1950f55ccf2942fb88beb10392b5f999c5003 (patch) | |
tree | 227f1b62c3152cef1ee252a56c2ffce0eb7ba043 /meta/recipes-devtools/mmc | |
parent | b5b8003a0b99fb591f2e2a0a5ed74e60a120dc87 (diff) | |
download | poky-03e1950f55ccf2942fb88beb10392b5f999c5003.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/mmc')
-rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 | ||||
-rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils_git.bb | 11 |
2 files changed, 5 insertions, 34 deletions
diff --git a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch b/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch deleted file mode 100644 index 1724de5c69..0000000000 --- a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | mmc.h: don't include <asm-generic/int-ll64.h> | ||
4 | |||
5 | Including this file causes a compile failure for qemumips64. | ||
6 | This file is not needed to be explicitly included, because it will be | ||
7 | included by the <linux/mmc/ioctl.h> file if _MIPS_SZLONG is not 64. | ||
8 | |||
9 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
10 | --- | ||
11 | mmc.h | 1 - | ||
12 | 1 file changed, 1 deletion(-) | ||
13 | |||
14 | diff --git a/mmc.h b/mmc.h | ||
15 | index 9871d62..3df2cdf 100644 | ||
16 | --- a/mmc.h | ||
17 | +++ b/mmc.h | ||
18 | @@ -14,7 +14,6 @@ | ||
19 | * Boston, MA 021110-1307, USA. | ||
20 | */ | ||
21 | |||
22 | -#include <asm-generic/int-ll64.h> | ||
23 | #include <linux/mmc/ioctl.h> | ||
24 | #include <stdio.h> | ||
25 | |||
26 | -- | ||
27 | 1.7.9.5 | ||
28 | |||
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index c50ba5478e..64b8910a27 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb | |||
@@ -4,18 +4,17 @@ LICENSE = "GPLv2" | |||
4 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" | 4 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" |
5 | 5 | ||
6 | SRCBRANCH ?= "master" | 6 | SRCBRANCH ?= "master" |
7 | SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189" | 7 | SRCREV = "44f94b925894577f9ffcf2c418dd013a5e582648" |
8 | 8 | ||
9 | PV = "0.1" | 9 | PV = "0.1" |
10 | 10 | ||
11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \ | 11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}" |
12 | file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" | ||
13 | 12 | ||
14 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
15 | 14 | ||
16 | do_configure_prepend() { | 15 | CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" |
17 | sed -i "s:-Werror::g" ${S}/Makefile | 16 | CFLAGS_append_mips64 = " -D__SANE_USERSPACE_TYPES__" |
18 | } | 17 | CFLAGS_append_mips64n32 = " -D__SANE_USERSPACE_TYPES__" |
19 | 18 | ||
20 | do_install() { | 19 | do_install() { |
21 | install -d ${D}${bindir} | 20 | install -d ${D}${bindir} |