mmc-utils: fix compilation failure for mips64 target.
cover mmc-utils: fix compilation failure for mips64 target.
The following changes since commit b77494025b3d47fd5130ae6c445ac84cabb1f91e:
sstatetests: Use TUNE_ARCH instead of TARGET_ARCH (2014-05-04 17:36:14 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/mmc-utils-qemumips64
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/mmc-utils-qemumips64
Chen Qi (1):
mmc-utils: fix compilation failure for mips64 target.
...mc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 ++++++++++++++++++++ meta/recipes-devtools/mmc/mmc-utils_git.bb | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
Signature · 1 line
1.7.9.5
PATCH 1/1 mmc-utils: fix compilation failure for mips64 target.
This patch fixes mmc-utils compilation failure for qemumips64. Remove the 'include <asm-generic/int-ll64.h>' line from mmc.h, because this file is automatically included if _MIPS_SZLONG is not 64, otherwise, <asm-generic/int-l64.h> is included.
Expicitly including <asm-generic/int-ll64.h> will cause the compilation failure for mips64 target.
[YOCTO #6267]
--- ...mc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 ++++++++++++++++++++ meta/recipes-devtools/mmc/mmc-utils_git.bb | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch new file +28 -0
@@ -0,0 +1,28 @@ +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 <[email protected]> +--- + 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 +
meta/recipes-devtools/mmc/mmc-utils_git.bb +2 -2
@@ -8,8 +8,8 @@ SRCREV = "11f2ceabc4ad3f0dd568e0ce68166e4803e0615b" PV = "0.1" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH}" - +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH} \ + file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.9.5