diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:08 +0100 |
commit | e18350d44fd5ecd08910ee2cc569c009653b78f9 (patch) | |
tree | 9081a269d35055608f8c42f272d028aa0aef7964 /meta/recipes-devtools | |
parent | f663b9512ba94fcc8b9ab4cfe21c814a5167d7ca (diff) | |
download | poky-e18350d44fd5ecd08910ee2cc569c009653b78f9.tar.gz |
mmc-utils: update to latest revision
Drop patch as upstream has fixed the issue.
(From OE-Core rev: 656894bc388bc5c65e2b7cc4a34642bf17db89bf)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils/0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/mmc/mmc-utils_git.bb | 6 |
2 files changed, 2 insertions, 36 deletions
diff --git a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch b/meta/recipes-devtools/mmc/mmc-utils/0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch deleted file mode 100644 index 12707357b2..0000000000 --- a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 04fbe6ddb5f1e02efbcae3cdf5beb16757a98948 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 10 May 2019 12:58:01 -0700 | ||
4 | Subject: [PATCH] mmc_cmd.c: Use extra braces when initializing subobjects | ||
5 | |||
6 | clang warns with -Werror,-Wmissing-braces, as following error | ||
7 | | mmc_cmds.c:1886:36: error: suggest braces around initialization of subobject [-Werror,-W | ||
8 | missing-braces] | ||
9 | | struct rpmb_frame frame_status = {0}; | ||
10 | | ^ | ||
11 | | {} | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | mmc_cmds.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/mmc_cmds.c b/mmc_cmds.c | ||
21 | index 19a9da1..838e8c3 100644 | ||
22 | --- a/mmc_cmds.c | ||
23 | +++ b/mmc_cmds.c | ||
24 | @@ -1883,7 +1883,7 @@ static int do_rpmb_op(int fd, | ||
25 | u_int16_t rpmb_type; | ||
26 | struct mmc_ioc_multi_cmd *mioc; | ||
27 | struct mmc_ioc_cmd *ioc; | ||
28 | - struct rpmb_frame frame_status = {0}; | ||
29 | + struct rpmb_frame frame_status = {{0}}; | ||
30 | |||
31 | if (!frame_in || !frame_out || !out_cnt) | ||
32 | return -EINVAL; | ||
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index 8fe606915e..bdd0bf7f1b 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb | |||
@@ -5,13 +5,11 @@ LICENSE = "GPLv2" | |||
5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" | 5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" |
6 | 6 | ||
7 | SRCBRANCH ?= "master" | 7 | SRCBRANCH ?= "master" |
8 | SRCREV = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5" | 8 | SRCREV = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc" |
9 | 9 | ||
10 | PV = "0.1+git${SRCPV}" | 10 | PV = "0.1+git${SRCPV}" |
11 | 11 | ||
12 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH} \ | 12 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}" |
13 | file://0001-mmc_cmd.c-Use-extra-braces-when-initializing-subobje.patch \ | ||
14 | " | ||
15 | UPSTREAM_CHECK_COMMITS = "1" | 13 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 14 | ||
17 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |