From aff9088493309893056f41cc3d32f1b079708f4c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 23 Feb 2017 18:50:04 +0100 Subject: mmc-utils-cos: rename recipe to be different from mmc-utils This allows to build either mmc-utils_git from openembedded or mmc-utils from the Chromium OS project. 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 | 19 +++++++++++++++ ...mc.h-don-t-include-asm-generic-int-ll64.h.patch | 28 ---------------------- recipes-devtools/mmc/mmc-utils_chromiumos.bb | 19 --------------- 4 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 recipes-devtools/mmc/mmc-utils-cos/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch create mode 100644 recipes-devtools/mmc/mmc-utils-cos_git.bb delete mode 100644 recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch delete mode 100644 recipes-devtools/mmc/mmc-utils_chromiumos.bb 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 new file mode 100644 index 0000000..1724de5 --- /dev/null +++ b/recipes-devtools/mmc/mmc-utils-cos/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..54dcaca --- /dev/null +++ b/recipes-devtools/mmc/mmc-utils-cos_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Userspace tools for MMC/SD devices" +HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" + +BRANCH ?= "master" +SRCREV = "eb1cd019c6ad425633a509ab3578e59d5c9ebbc5" + +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" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 mmc ${D}${bindir} +} diff --git a/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch b/recipes-devtools/mmc/mmc-utils/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/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_chromiumos.bb b/recipes-devtools/mmc/mmc-utils_chromiumos.bb deleted file mode 100644 index 54dcaca..0000000 --- a/recipes-devtools/mmc/mmc-utils_chromiumos.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Userspace tools for MMC/SD devices" -HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" - -BRANCH ?= "master" -SRCREV = "eb1cd019c6ad425633a509ab3578e59d5c9ebbc5" - -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" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${bindir} - install -m 0755 mmc ${D}${bindir} -} -- cgit v1.2.3