From 753d3e4c4995729114d41e2aacb997821fb74091 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Feb 2017 19:20:25 +0100 Subject: mmc-utils-cos: update to latest and unify with mmc-utils_git.bb Update to latest master of the Chromium OS port. A patch has been replaced by setting arch specific CFLAGS in mmc-utils in oe-core. Follow that change. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- ...mc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 ---------------------- recipes-devtools/mmc/mmc-utils-cos_git.bb | 15 +++++++----- 2 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 recipes-devtools/mmc/mmc-utils-cos/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch diff --git a/recipes-devtools/mmc/mmc-utils-cos/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch b/recipes-devtools/mmc/mmc-utils-cos/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch deleted file mode 100644 index 1724de5..0000000 --- a/recipes-devtools/mmc/mmc-utils-cos/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 - -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 file if _MIPS_SZLONG is not 64. - -Signed-off-by: Chen Qi ---- - 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 - #include - #include - --- -1.7.9.5 - diff --git a/recipes-devtools/mmc/mmc-utils-cos_git.bb b/recipes-devtools/mmc/mmc-utils-cos_git.bb index 54dcaca..5cc27ad 100644 --- a/recipes-devtools/mmc/mmc-utils-cos_git.bb +++ b/recipes-devtools/mmc/mmc-utils-cos_git.bb @@ -1,18 +1,21 @@ -DESCRIPTION = "Userspace tools for MMC/SD devices" -HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/" +SUMMARY = "Userspace tools for MMC/SD devices (Downstream version of Chromium OS Project)" +HOMEPAGE = "http://chromium.googlesource.com/chromiumos/third_party/mmc-utils.git" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" -BRANCH ?= "master" -SRCREV = "eb1cd019c6ad425633a509ab3578e59d5c9ebbc5" +SRCBRANCH ?= "master" +SRCREV = "bcc3e2e4246431be511be3959a11cd9733bedd29" PV = "0.1" -SRC_URI = "git://chromium.googlesource.com/chromiumos/third_party/mmc-utils.git;protocol=https;branch=${BRANCH} \ - file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" +SRC_URI = "git://chromium.googlesource.com/chromiumos/third_party/mmc-utils.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" +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} install -m 0755 mmc ${D}${bindir} -- cgit v1.2.3