From 86d3251eb52dd336ccae9bc2f337008e6e5fba81 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 8 Sep 2015 17:01:12 +0200 Subject: [PATCH] Add new recipe for vboot-utils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the chrome OS verified boot utils, required to generate partition layout and sign kernel on veyron platforms Signed-off-by: Romain Perier ² --- .../vboot-utils/vboot-utils-native_43.6946.bb | 25 ++++++++++++++ ...initialized-variable-val-in-function.patch | 27 +++++++++++++++ ...ning-treated-as-error-about-uninitia.patch | 34 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 recipes-support/vboot-utils/vboot-utils-native_43.6946.bb create mode 100644 recipes-support/vboot-utils/vboot-utils/0001-host_misc-Fix-uninitialized-variable-val-in-function.patch create mode 100644 recipes-support/vboot-utils/vboot-utils/0002-futility-fix-warning-treated-as-error-about-uninitia.patch diff --git a/recipes-support/vboot-utils/vboot-utils-native_43.6946.bb b/recipes-support/vboot-utils/vboot-utils-native_43.6946.bb new file mode 100644 index 0000000..7528802 --- /dev/null +++ b/recipes-support/vboot-utils/vboot-utils-native_43.6946.bb @@ -0,0 +1,25 @@ +# Copyright (C) 2015 Romain Perier +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Chromium OS verified boot utilities" +HOMEPAGE = "http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git;a=summary" +SECTION = "admin" +LICENSE = "Chromium" +LIC_FILES_CHKSUM = "file://LICENSE;md5=562c740877935f40b262db8af30bca36" + +DEPENDS = "openssl util-linux-native libyaml-native" +TAG = "43-6946" +SRC_URI = "git://chromium.googlesource.com/chromiumos/platform/vboot_reference;protocol=http;branch=release-R${TAG}.B \ + file://0001-host_misc-Fix-uninitialized-variable-val-in-function.patch \ + file://0002-futility-fix-warning-treated-as-error-about-uninitia.patch" +SRCREV = "9978e0aa0069697816a38c7dcc6a81be5975cab7" +S = "${WORKDIR}/git" +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "" + +inherit base native + +do_install_append() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} + diff --git a/recipes-support/vboot-utils/vboot-utils/0001-host_misc-Fix-uninitialized-variable-val-in-function.patch b/recipes-support/vboot-utils/vboot-utils/0001-host_misc-Fix-uninitialized-variable-val-in-function.patch new file mode 100644 index 0000000..f1d2fc3 --- /dev/null +++ b/recipes-support/vboot-utils/vboot-utils/0001-host_misc-Fix-uninitialized-variable-val-in-function.patch @@ -0,0 +1,27 @@ +From 338007c7f5ceace1c3de82c79e0bca29b6e73ce6 Mon Sep 17 00:00:00 2001 +From: Romain Perier +Date: Thu, 15 Oct 2015 19:07:59 +0200 +Subject: [PATCH] host_misc: Fix uninitialized variable 'val' in function + vb2_str_to_id + +Signed-off-by: Romain Perier +--- + host/lib21/host_misc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/host/lib21/host_misc.c b/host/lib21/host_misc.c +index db5e824..ee9426a 100644 +--- a/host/lib21/host_misc.c ++++ b/host/lib21/host_misc.c +@@ -138,7 +138,7 @@ static const char *onebyte(const char *str, uint8_t *vptr) + + int vb2_str_to_id(const char *str, struct vb2_id *id) + { +- uint8_t val; ++ uint8_t val = 0; + int i; + + if (!str) +-- +2.1.4 + diff --git a/recipes-support/vboot-utils/vboot-utils/0002-futility-fix-warning-treated-as-error-about-uninitia.patch b/recipes-support/vboot-utils/vboot-utils/0002-futility-fix-warning-treated-as-error-about-uninitia.patch new file mode 100644 index 0000000..e1e0681 --- /dev/null +++ b/recipes-support/vboot-utils/vboot-utils/0002-futility-fix-warning-treated-as-error-about-uninitia.patch @@ -0,0 +1,34 @@ +From 064cd293ac8351f77eada971e24fb72bb0bb0568 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner +Date: Mon, 19 Oct 2015 18:22:47 +0200 +Subject: [PATCH] futility: fix warning treated as error about uninitialized + value + +--- + futility/futility.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/futility/futility.c b/futility/futility.c +index 60cc9c5..edd4c56 100644 +--- a/futility/futility.c ++++ b/futility/futility.c +@@ -230,7 +230,7 @@ static int run_command(const struct futil_cmd_t *cmd, int argc, char *argv[]) + static int do_help(int argc, char *argv[]) + { + const struct futil_cmd_t *cmd; +- const char *vstr; ++ const char *vstr = ""; + + /* Help about a known command? */ + if (argc > 1) { +@@ -256,7 +256,6 @@ static int do_help(int argc, char *argv[]) + vstr = "version 2.1 "; + break; + case VBOOT_VERSION_ALL: +- vstr = ""; + break; + } + printf("The following %scommands are built-in:\n\n", vstr); +-- +2.1.4 +