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-13 08:27:18 +0000 |
| commit | 819541253d63b14bb6a5fd4cafdd2b6fa16f4ca3 (patch) | |
| tree | 26fbb4a7c0424ccb9af757e8c85ef80015ca9ffc | |
| parent | d17984eda9635f98d4472019d4af83f661b4dfe7 (diff) | |
| download | openembedded-core-819541253d63b14bb6a5fd4cafdd2b6fa16f4ca3.tar.gz openembedded-core-819541253d63b14bb6a5fd4cafdd2b6fa16f4ca3.tar.bz2 openembedded-core-819541253d63b14bb6a5fd4cafdd2b6fa16f4ca3.zip | |
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
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ -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 - 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" 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} |