Date   

dunfell gcc-sanitizers-arm-8.3 fails to build

Ryan Harkin <ryan.harkin@...>
 

Hello,

I'm migrating from Warrior to Dunfell and I'm getting a curious build failure in gcc-sanitizers.

Here's the full gory detail:
    https://pastebin.ubuntu.com/p/nh4cDKMvgS/

However, the main error is this:

| In file included from ../../../../../../../../../work-shared/gcc-arm-8.3-r2019.03/git/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc:193:
| ../../../../../../../../../work-shared/gcc-arm-8.3-r2019.03/git/libsanitizer/sanitizer_common/sanitizer_internal_defs.h:317:72: error: size of array 'assertion_failed__1152' is negative
|      typedef char IMPL_PASTE(assertion_failed_##_, line)[2*(int)(pred)-1]

I have no idea where to begin with this. I don't even know why gcc-sanitizers is included in the build, what it does, or why I need it. I'm building an image with dev packages and gcc, so I guess that's why.

I've hacked meta-arm to patch sanitizer_platform_limits_posix.cc to null out the macros and that builds fine. I'm sure it won't work, should someone want to use it, mind you.

Is there something obvious that I should be doing as part of a Warrior -> Dunfell migration to get this to work?

note: Warrior used meta-linaro-toolchain and for Dunfell, it's moved to meta-arm-toolchain.

Regards,
Ryan.


cannot build PDF docs

Rob Prowel <rprowel@...>
 

Is there some magic to building the PDF versions of the yocto docs? I've tried on multiple machines running debian and differing versions of ubuntu and consistently the PDF docs fail to build.

Font substitution errors are trivial, but not being able to locate the images that get are inserted is a pretty serious build bug.

What's the secret to building PDF docs, or where are they online? and no, not interested in referring to cloud based HTML docs. I want offline PDF documentation.

Thanks!

$ make DOC=adt-manual pdf
cd adt-manual; ../tools/poky-docbook-to-pdf adt-manual.xml ../template; cd ..
Note: namesp. cut : stripped namespace before processing
Yocto Project Application Developer's Guide

Making portrait pages on A4 paper (210mmx297mm)
Attributed 561 IDs for element, cleaned up 0
[warning] /usr/bin/fop: JVM flavor 'sun' not understood
Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true
[INFO] FopConfParser - Default page-height set to: 11in
[INFO] FopConfParser - Default page-width set to: 8.26in
[ERROR] FOUserAgent - Image not found. URI: figures/adt-title.png. (See position 2:38206)
[WARN] FOUserAgent - Font "Symbol,normal,700" not found. Substituting with "Symbol,normal,400".
[WARN] FOUserAgent - Font "ZapfDingbats,normal,700" not found. Substituting with "ZapfDingbats,normal,400".
[ERROR] FOUserAgent - Image not found. URI: figures/adt-title.png. (No context info available)
[INFO] FOUserAgent - Rendered page #1.
[INFO] FOUserAgent - Rendered page #2.
[INFO] FOUserAgent - Rendered page #3.
[INFO] FOUserAgent - Rendered page #4.
[INFO] FOUserAgent - Rendered page #5.
[ERROR] FOUserAgent - Image not found. URI: figures/using-a-pre-built-image.png. (See position 736:275)
[WARN] FOUserAgent - Font "veramono,italic,400" not found. Substituting with "veramono,normal,400".
[WARN] FOUserAgent - The contents of fo:block line 1 exceed the available area in the inline-progression direction by more than 50 points. (See position 496:372)
[WARN] FOUserAgent - The contents of fo:block line 1 exceed the available area in the inline-progression direction by more than 50 points. (See position 496:372)
[WARN] FOUserAgent - The contents of fo:block line 1 exceed the available area in the inline-progression direction by more than 50 points. (See position 496:372)
[WARN] FOUserAgent - The contents of fo:block line 1 exceed


Re: one way hash analogy of yocto

Rob Prowel <rprowel@...>
 

On 2020-07-31 08:53, Quentin Schulz wrote:

I do not know if there is such a mechanism for tasks, but the
bitbake-layers should help you get started in your quest of overridden
tasks.
Also, I'm not sure it matters much where the tasks are overridden? Just
override them again with your own bbappend (especially if it's a layer
you don't own (read upstream or provided by vendor)).
Thanks for the prompt followup. Yeah, the two comments above are related in my nightmare so I'll address both of them together.

vendor has layers that I am NOT modifying, and unfortunately I'm not 100% sure that they didn't modify poky or meta-oe in what they shipped to me. Just haven't had time to download and compare those layers to yocto official sources.

I really do need to be able to inspect what they've done in their BSP layer to be able to effectively override or modify it though. Things very easily break when I attempt to make changes.

Their as-delivered image builder creates an executable and the only way to update their board is to boot into linux on the board and run that executable (on the board) to update the secondary flash, then boot into the secondary flash and update the primary...which takes forever on QSPI NOR. Yeah, they disabled the jtag interface so you HAVE to be in a boot-able linux image on the board to update it.

My development model is to reconfigure to use nfsroot while developing and configuring and only update the flash for relatively solid release to be tested.

but thanks...will investigate the commands you mentioned. I really do need a quick way of seeing the authoritative version of a task though.


Re: one way hash analogy of yocto

Mikko Rapeli
 

On Fri, Jul 31, 2020 at 08:45:17AM -0400, Rob Prowel wrote:
What I really need is information about introspection or the ability to
query an existing yocto distro to return data about features included and
more to the point, to understand EXACTLY where recipes or classes are
overridden or appended. You can only do so much with recursive grep and
find scripts. Based on what I've seen so far, it seems that capability is
lacking in yocto.

In essence I have what is like a one way hash ABCDEFG-->X and I have X but
cannot fully figure out the whole input that generated it.

An example would be an overridden task method like

do_something

I need a quick way to determine the highest priority level that task was
overridden or appended in for a given recipe.

a command like "bitbake -describe -c do_something my-recipe"
bitbake -e my-recipe ?

Maybe grep for the variable of interest?

and it should also be possible to query this kind of information for
variables and not just methods or tasks.

Do these tools exist or am I looking at parsing megabytes of verbose build
data and tracing output to find what I'm looking for?

and no, I didn't create the distro...I'm an end user customer who was given
an undocumented distro with quazi-proprietary BSP layers in it that not only
describe our specific product purchased, but the vendor's others products as
well, which complicates matters.

Thoughts?
When adding layers, only way to be sure is to actually review the layers
and their bbappends. I tend to BBMASK everything out which I haven't checked
at least on BSP layer side. Open source layers from yocto community are better.

Cheers,

-Mikko


Re: one way hash analogy of yocto

Quentin Schulz
 

Hi Robm

On Fri, Jul 31, 2020 at 08:45:17AM -0400, Rob Prowel wrote:
What I really need is information about introspection or the ability to
query an existing yocto distro to return data about features included and
more to the point, to understand EXACTLY where recipes or classes are
overridden or appended. You can only do so much with recursive grep and
find scripts. Based on what I've seen so far, it seems that capability is
lacking in yocto.

In essence I have what is like a one way hash ABCDEFG-->X and I have X but
cannot fully figure out the whole input that generated it.

An example would be an overridden task method like

do_something

I need a quick way to determine the highest priority level that task was
overridden or appended in for a given recipe.

a command like "bitbake -describe -c do_something my-recipe"

and it should also be possible to query this kind of information for
variables and not just methods or tasks.

Do these tools exist or am I looking at parsing megabytes of verbose build
data and tracing output to find what I'm looking for?
For location of bbappends and recipes, etc.:
bitbake-layers show-appends
bitbake-layers show-recipes

For variables:
bitbake <recipe> -e | more
and find the line starting with the variable you're looking for. From
there, look the lines just before and you'll have the history of how the
variables was constructed.

bitbake <recipe> -e | awk '/^# \$FOOBAR \[/,/^FOOBAR/'
might do it for you. Not tested by me so can't attest. (source:
https://theyoctojester.info/session_14/main.html)

I do not know if there is such a mechanism for tasks, but the
bitbake-layers should help you get started in your quest of overridden
tasks.

Also, I'm not sure it matters much where the tasks are overridden? Just
override them again with your own bbappend (especially if it's a layer
you don't own (read upstream or provided by vendor)).

Quentin


one way hash analogy of yocto

Rob Prowel <rprowel@...>
 

What I really need is information about introspection or the ability to query an existing yocto distro to return data about features included and more to the point, to understand EXACTLY where recipes or classes are overridden or appended. You can only do so much with recursive grep and find scripts. Based on what I've seen so far, it seems that capability is lacking in yocto.

In essence I have what is like a one way hash ABCDEFG-->X and I have X but cannot fully figure out the whole input that generated it.

An example would be an overridden task method like

do_something

I need a quick way to determine the highest priority level that task was overridden or appended in for a given recipe.

a command like "bitbake -describe -c do_something my-recipe"

and it should also be possible to query this kind of information for variables and not just methods or tasks.

Do these tools exist or am I looking at parsing megabytes of verbose build data and tracing output to find what I'm looking for?

and no, I didn't create the distro...I'm an end user customer who was given an undocumented distro with quazi-proprietary BSP layers in it that not only describe our specific product purchased, but the vendor's others products as well, which complicates matters.

Thoughts?


Re: [meta-security] Clamav libclammspack.so missing from image

yoc
 

Hi Armin,
 
So I found libmspack where you said it would be. I have done some more digging and talked to the Clamav developers.
 
This line in the recipe (--with-system-libmspack=${CLAMAV_USR_DIR}) means that libmspack installed on the system is used and the output produced is libclamav.so* and libmspack.so*
 
When I built clamav outside of Yocto I didnt specify the --with-system-libmspack option and the output was libclamav.so* and libclammspack.so* i.e. the internal library bundled with Clamav was used.
 
Having spoken to the Clamav developers I want to use the internal as it gives additional capabilities and security protections:
 
"Upgrade from libmspack 0.5alpha to libmspack 0.7.1alpha. As a reminder, we support system-installed versions of libmspack. However, at this time the ClamAV-provided version of libmspack provides additional abilities to parse broken or non-standard CAB files beyond what the stock libmspack 0.7.1alpha provides. We are working with the upstream project to incorporate our modifications, and hopefully these changes will appear in a future release of libmspack."
 
So I went about trying to get the Yocto recipe to compile against the internal libclammspack bundled with Clamav and did not have any success:
 
tmp/work/aarch64-poky-linux/clamav/0.101.5-r0/recipe-sysroot-native/usr/bin/aarch64-poky-linux/../../libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.3.0/ld: warning: libclammspack.so.0, needed by ../libclamav/.libs/libclamav.so, not found (try using -rpath or -rpath-link)
 
Firstly, would you be able to give me a pointer on how to solve this issue - I think it requires a patch to the Clamav build process? I saw some historic commits mentioning rpath but was unsuccessful with getting anything to build.
 
Secondly, I would propose the following and am happy to implement the patches if these ideas are agreeable to you:
 
1) Use the PACKAGECONFIG mechanism to allow a switch between using the system and internal libmspack with the default being to use the internal version
2) Update the version of Clamav to the latest stable version - it was noted by the Clamav developers that the current version in the recipe is outdated
3) Fix the bug on line 92 of the recipe. I believe that this line should be surrounded by the same if statement as lines 75-79. I am behind a company proxy so need the INSTALL_CLAMAV_CVD option switched off
 
Thank you for your time with this.
 
Kind Regards,
 
Charlie


Re: [bitbake-devel] [yocto] Stable Warrior branch

Adrian Bunk
 

On Mon, Jul 27, 2020 at 07:36:49AM -0700, akuster808 wrote:
Adrian,
Hi Armin,

On 7/21/20 1:53 AM, Richard Purdie wrote:
On Tue, 2020-07-14 at 16:56 +0300, Adrian Bunk wrote:
On Thu, Jun 04, 2020 at 09:28:00PM -0700, akuster wrote:
Hello,

The Warrior branch of Poky has had its last official dot release.
It
will be moving to Community support and EOL within 6 weeks if no
one
steps up.
If someone is interested in taking on the responsibilities of
maintaining the "Warrior" branch moving forward, please email this
list.
I have an interest in keeping warrior branch alive in poky and meta-
oe,
and I'll take this responsibility since noone else seems to be
interested.
Are you still interested?
yes.

-armin
cu
Adrian


Re: [swupdate] [meta-swupdate][PATCH] mtd-utils: Remove patchs

Stefano Babic
 

Hi Richard,

On 30.07.20 12:28, Richard Purdie wrote:
On Thu, 2020-07-30 at 10:34 +0200, Stefano Babic wrote:
Hi Zheng,

I do not discuss abot the correctness of these patches (that I will
aplly to meta-swupdate, -master), but about mtd-utils version (for
this I pick up Richard in CC). There were in last month more breakage
around mtd-utils due to patches (required !) that are applied to an
undefined (from recipe) version of mtd-utils.

In fact, we have mtd-utils_git.bb in poky, and as "git" version, the
expectation is that it points to TOT. But this is not the case, and
meta-<layers> outside poky just add some patches to a not well
defined version.

Should we also replace mtd-utils_git.bb with a more precise
mtd-utils_2.1.2.bb ?
Adding patches in bbappends is always going to be high maintenance. Are
these patches swupdate specific?
Yes, they are. My question was related to mtd recipe in OE-Core.

The recipes use "git" in the filename and then set a sepcific SRCREV
and set PV correctly. This is an accepted behaviour. I can see how
renaming the recipe would also help for certain usecases but both are
really correct for different reasons.
Agree both are correct, but as you said, it can be more messy to maintain in external layers if it is not possible to identify a specific version,

I'd also note that git versions in oe-core are always locked down to
something and that something is therefore likely not to be TOT as they
don't get updated frequently enough.
ok, fine.

Regards,
Stefano


--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================


Re: [swupdate] [meta-swupdate][PATCH] mtd-utils: Remove patchs

Richard Purdie
 

On Thu, 2020-07-30 at 10:34 +0200, Stefano Babic wrote:
Hi Zheng,

I do not discuss abot the correctness of these patches (that I will
aplly to meta-swupdate, -master), but about mtd-utils version (for
this I pick up Richard in CC). There were in last month more breakage
around mtd-utils due to patches (required !) that are applied to an
undefined (from recipe) version of mtd-utils.

In fact, we have mtd-utils_git.bb in poky, and as "git" version, the
expectation is that it points to TOT. But this is not the case, and
meta-<layers> outside poky just add some patches to a not well
defined version.

Should we also replace mtd-utils_git.bb with a more precise
mtd-utils_2.1.2.bb ?
Adding patches in bbappends is always going to be high maintenance. Are
these patches swupdate specific?

The recipes use "git" in the filename and then set a sepcific SRCREV
and set PV correctly. This is an accepted behaviour. I can see how
renaming the recipe would also help for certain usecases but both are
really correct for different reasons.

I'd also note that git versions in oe-core are always locked down to
something and that something is therefore likely not to be TOT as they
don't get updated frequently enough.

Cheers,

Richard


Re: [swupdate] [meta-swupdate][PATCH] mtd-utils: Remove patchs

Stefano Babic
 

Hi Zheng,

I do not discuss abot the correctness of these patches (that I will
aplly to meta-swupdate, -master), but about mtd-utils version (for this
I pick up Richard in CC). There were in last month more breakage around
mtd-utils due to patches (required !) that are applied to an undefined
(from recipe) version of mtd-utils.

In fact, we have mtd-utils_git.bb in poky, and as "git" version, the
expectation is that it points to TOT. But this is not the case, and
meta-<layers> outside poky just add some patches to a not well defined
version.

Should we also replace mtd-utils_git.bb with a more precise
mtd-utils_2.1.2.bb ?

Regards,
Stefano

On 30.07.20 03:18, Zheng Ruoqin wrote:
files/0001-libubigen-remove-unnecessary-include.patch
files/0002-libubi-remove-private-kernel-header-from-includes.patch
Removed since these are included in 2.1.2.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>/
---
...libubigen-remove-unnecessary-include.patch | 29 ----------
...-private-kernel-header-from-includes.patch | 58 -------------------
recipes-devtools/mtd/mtd-utils_%.bbappend | 5 --
3 files changed, 92 deletions(-)
delete mode 100644 recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch
delete mode 100644 recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch

diff --git a/recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch b/recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch
deleted file mode 100644
index 61e1380..0000000
--- a/recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 87809c4804d3355ecd2fd0bd3362526fa27bf953 Mon Sep 17 00:00:00 2001
-From: Bastian Germann <bastiangermann@fishpost.de>
-Date: Wed, 29 Jan 2020 19:50:12 +0100
-Subject: [PATCH 1/2] libubigen: remove unnecessary include
-
-libubigen.h does not use any symbol from mtd/ubi-media.h,
-so remove it from includes.
-
-Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
-Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
----
- include/libubigen.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/libubigen.h b/include/libubigen.h
-index c25ac20..48d2fad 100644
---- a/include/libubigen.h
-+++ b/include/libubigen.h
-@@ -26,7 +26,6 @@
- #define __LIBUBIGEN_H__
-
- #include <stdint.h>
--#include <mtd/ubi-media.h>
-
- #ifdef __cplusplus
- extern "C" {
---
-2.25.1
-
diff --git a/recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch b/recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch
deleted file mode 100644
index 7ca79b2..0000000
--- a/recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 42e051acd32c28c2f93c946d0c4bf6f9eada2aa4 Mon Sep 17 00:00:00 2001
-From: Bastian Germann <bastiangermann@fishpost.de>
-Date: Wed, 29 Jan 2020 19:50:13 +0100
-Subject: [PATCH 2/2] libubi: remove private kernel header from includes
-
-libubi.h includes ubi-media.h which was made private in the kernel a
-long time ago. There are users of libubi.h, e.g. swupdate, which have to
-have ubi-media.h available at build time with this inclusion.
-
-However, libubi.h uses only one symbol from ubi-media.h. Define that symbol
-in the header to enable using libubi.h without installing ubi-media.h.
-
-Make up for the transitive symbol use in ubiformat.c by including ubi-media.h.
-
-Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
-Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
----
- include/libubi.h | 4 +++-
- ubi-utils/ubiformat.c | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/include/libubi.h b/include/libubi.h
-index 46596a3..46c732a 100644
---- a/include/libubi.h
-+++ b/include/libubi.h
-@@ -26,7 +26,6 @@
- #include <ctype.h>
- #include <stdint.h>
- #include <mtd/ubi-user.h>
--#include <mtd/ubi-media.h>
-
- #ifdef __cplusplus
- extern "C" {
-@@ -38,6 +37,9 @@ extern "C" {
- /* Maximum physical eraseblock size in bytes */
- #define UBI_MAX_PEB_SZ (2*1024*1024)
-
-+/* The maximum volume name length (from Linux's ubi-media.h) */
-+#define UBI_VOL_NAME_MAX 127
-+
- /* UBI library descriptor */
- typedef void * libubi_t;
-
-diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c
-index be40e52..d1b12e4 100644
---- a/ubi-utils/ubiformat.c
-+++ b/ubi-utils/ubiformat.c
-@@ -38,6 +38,7 @@
- #include <getopt.h>
- #include <fcntl.h>
-
-+#include <mtd/ubi-media.h>
- #include <libubi.h>
- #include <libmtd.h>
- #include <libscan.h>
---
-2.25.1
-
diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend
index 72cc858..471c8ad 100644
--- a/recipes-devtools/mtd/mtd-utils_%.bbappend
+++ b/recipes-devtools/mtd/mtd-utils_%.bbappend
@@ -2,11 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

FILES_${PN}-staticdev += "ubi-utils/libubi.a ${libdir}/*.a"

-SRC_URI += " \
- file://0001-libubigen-remove-unnecessary-include.patch \
- file://0002-libubi-remove-private-kernel-header-from-includes.patch \
-"
-
do_install_append () {
install -d ${D}${includedir}/mtd/
install -d ${D}${libdir}/
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================


Re: [meta-virtualization][zeus][PATCH] kubernetes: CVE-2019-11254

Zhixiong Chi
 

Hi Bruce,

Sorry for late response. Due to something wrong of the mail server, I
just see your email.

I believe it can be applied successfully now. I find the

file://CVE-2020-8551.patch \
file://CVE-2020-8552.patch \
file://CVE-2020-8555.patch \
these three patches had been merged into zeus.
So I try to apply this patch again, and it works well.

Thanks.

On 2020/6/22 下午9:35, Bruce Ashfield wrote:
This patch doesn't apply to zeus.

Can you rebase and resubmit ?

Cheers,

Bruce

In message: [yocto][meta-virtualization][zeus][PATCH] kubernetes: CVE-2019-11254
on 18/06/2020 Zhixiong Chi wrote:

Backport the CVE patch from the upstream:
https://github.com/kubernetes/kubernetes.git

Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
---
.../kubernetes/CVE-2019-11254.patch | 797 ++++++++++++++++++
.../kubernetes/kubernetes_git.bb | 1 +
2 files changed, 798 insertions(+)
create mode 100644 recipes-containers/kubernetes/kubernetes/CVE-2019-11254.patch

diff --git a/recipes-containers/kubernetes/kubernetes/CVE-2019-11254.patch b/recipes-containers/kubernetes/kubernetes/CVE-2019-11254.patch
new file mode 100644
index 0000000..2d991a9
--- /dev/null
+++ b/recipes-containers/kubernetes/kubernetes/CVE-2019-11254.patch
@@ -0,0 +1,797 @@
+From e9ba264d57d379d86dfbf3ae94e82eb0ead9c468 Mon Sep 17 00:00:00 2001
+From: CJ Cullen <cjcullen@google.com>
+Date: Wed, 22 Jan 2020 11:32:39 -0800
+Subject: [PATCH] update gopkg.in/yaml.v2 to v2.2.8
+
+CVE: CVE-2019-11254
+Upstream-Status: Backport [https://github.com/kubernetes/kubernetes.git branch: release-1.16]
+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+---
+ src/import/go.mod | 4 +-
+ src/import/go.sum | 4 +-
+ src/import/staging/src/k8s.io/api/go.sum | 4 +-
+ .../src/k8s.io/apiextensions-apiserver/go.mod | 2 +-
+ .../src/k8s.io/apiextensions-apiserver/go.sum | 4 +-
+ src/import/staging/src/k8s.io/apimachinery/go.mod | 2 +-
+ src/import/staging/src/k8s.io/apimachinery/go.sum | 4 +-
+ src/import/staging/src/k8s.io/apiserver/go.mod | 2 +-
+ src/import/staging/src/k8s.io/apiserver/go.sum | 4 +-
+ src/import/staging/src/k8s.io/cli-runtime/go.sum | 4 +-
+ src/import/staging/src/k8s.io/client-go/go.sum | 4 +-
+ src/import/staging/src/k8s.io/cloud-provider/go.sum | 4 +-
+ src/import/staging/src/k8s.io/cluster-bootstrap/go.sum | 4 +-
+ src/import/staging/src/k8s.io/code-generator/go.mod | 2 +-
+ src/import/staging/src/k8s.io/code-generator/go.sum | 4 +-
+ src/import/staging/src/k8s.io/component-base/go.sum | 4 +-
+ src/import/staging/src/k8s.io/csi-translation-lib/go.sum | 4 +-
+ src/import/staging/src/k8s.io/kube-aggregator/go.sum | 4 +-
+ .../src/k8s.io/kube-controller-manager/go.sum | 4 +-
+ src/import/staging/src/k8s.io/kube-proxy/go.sum | 4 +-
+ src/import/staging/src/k8s.io/kube-scheduler/go.sum | 4 +-
+ src/import/staging/src/k8s.io/kubectl/go.mod | 2 +-
+ src/import/staging/src/k8s.io/kubectl/go.sum | 4 +-
+ src/import/staging/src/k8s.io/kubelet/go.sum | 4 +-
+ .../src/k8s.io/legacy-cloud-providers/go.sum | 4 +-
+ src/import/staging/src/k8s.io/metrics/go.sum | 4 +-
+ src/import/staging/src/k8s.io/node-api/go.sum | 4 +-
+ src/import/staging/src/k8s.io/sample-apiserver/go.sum | 4 +-
+ src/import/staging/src/k8s.io/sample-cli-plugin/go.sum | 4 +-
+ src/import/staging/src/k8s.io/sample-controller/go.sum | 4 +-
+ src/import/vendor/gopkg.in/yaml.v2/.travis.yml | 18 +--
+ src/import/vendor/gopkg.in/yaml.v2/decode.go | 14 ++-
+ src/import/vendor/gopkg.in/yaml.v2/scannerc.go | 107 +++++++++---------
+ src/import/vendor/gopkg.in/yaml.v2/yaml.go | 2 +-
+ src/import/vendor/gopkg.in/yaml.v2/yamlh.go | 1 +
+ src/import/vendor/modules.txt | 2 +-
+ 36 files changed, 130 insertions(+), 124 deletions(-)
+
+diff --git a/src/import/go.mod b/go.mod
+index cf8c9147e62..884870f8843 100644
+--- a/src/import/go.mod
++++ b/src/import/go.mod
+@@ -139,7 +139,7 @@ require (
+ google.golang.org/grpc v1.23.0
+ gopkg.in/gcfg.v1 v1.2.0
+ gopkg.in/square/go-jose.v2 v2.2.2
+- gopkg.in/yaml.v2 v2.2.4
++ gopkg.in/yaml.v2 v2.2.8
+ gotest.tools v2.2.0+incompatible
+ gotest.tools/gotestsum v0.3.5
+ honnef.co/go/tools v0.0.1-2019.2.2
+@@ -444,7 +444,7 @@ replace (
+ gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2
+ gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
+ gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.1
+- gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.4
++ gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.8
+ gotest.tools => gotest.tools v2.2.0+incompatible
+ gotest.tools/gotestsum => gotest.tools/gotestsum v0.3.5
+ honnef.co/go/tools => honnef.co/go/tools v0.0.1-2019.2.2
+diff --git a/src/import/go.sum b/src/import/go.sum
+index b5e3f74686f..617081d2d9e 100644
+--- a/src/import/go.sum
++++ b/src/import/go.sum
+@@ -492,8 +492,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+ gopkg.in/warnings.v0 v0.1.1 h1:XM28wIgFzaBmeZ5dNHIpWLQpt/9DGKxk+rCg/22nnYE=
+ gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ gotest.tools/gotestsum v0.3.5 h1:VePOWRsuWFYpfp/G8mbmOZKxO5T3501SEGQRUdvq7h0=
+diff --git a/src/import/staging/src/k8s.io/api/go.sum b/src/import/staging/src/k8s.io/api/go.sum
+index c162d16011e..8ac86891676 100644
+--- a/src/import/staging/src/k8s.io/api/go.sum
++++ b/src/import/staging/src/k8s.io/api/go.sum
+@@ -90,8 +90,8 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+ k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+diff --git a/src/import/staging/src/k8s.io/apiextensions-apiserver/go.mod b/src/import/staging/src/k8s.io/apiextensions-apiserver/go.mod
+index f2cc6ca100f..41289345ad7 100644
+--- a/src/import/staging/src/k8s.io/apiextensions-apiserver/go.mod
++++ b/src/import/staging/src/k8s.io/apiextensions-apiserver/go.mod
+@@ -21,7 +21,7 @@ require (
+ github.com/spf13/pflag v1.0.3
+ github.com/stretchr/testify v1.3.0
+ google.golang.org/grpc v1.23.0
+- gopkg.in/yaml.v2 v2.2.4
++ gopkg.in/yaml.v2 v2.2.8
+ k8s.io/api v0.0.0
+ k8s.io/apimachinery v0.0.0
+ k8s.io/apiserver v0.0.0
+diff --git a/src/import/staging/src/k8s.io/apiextensions-apiserver/go.sum b/src/import/staging/src/k8s.io/apiextensions-apiserver/go.sum
+index 853644fbe6d..1c4460fdc38 100644
+--- a/src/import/staging/src/k8s.io/apiextensions-apiserver/go.sum
++++ b/src/import/staging/src/k8s.io/apiextensions-apiserver/go.sum
+@@ -349,8 +349,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git a/src/import/staging/src/k8s.io/apimachinery/go.mod b/src/import/staging/src/k8s.io/apimachinery/go.mod
+index 5b49085be74..bdd9ed2f63d 100644
+--- a/src/import/staging/src/k8s.io/apimachinery/go.mod
++++ b/src/import/staging/src/k8s.io/apimachinery/go.mod
+@@ -30,7 +30,7 @@ require (
+ golang.org/x/text v0.3.2 // indirect
+ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+ gopkg.in/inf.v0 v0.9.0
+- gopkg.in/yaml.v2 v2.2.4
++ gopkg.in/yaml.v2 v2.2.8
+ k8s.io/klog v0.4.0
+ k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
+ sigs.k8s.io/yaml v1.1.0
+diff --git a/src/import/staging/src/k8s.io/apimachinery/go.sum b/src/import/staging/src/k8s.io/apimachinery/go.sum
+index 916261e42c0..636ef5751ea 100644
+--- a/src/import/staging/src/k8s.io/apimachinery/go.sum
++++ b/src/import/staging/src/k8s.io/apimachinery/go.sum
+@@ -106,8 +106,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+ k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+diff --git a/src/import/staging/src/k8s.io/apiserver/go.mod b/src/import/staging/src/k8s.io/apiserver/go.mod
+index 8f97b49b06a..e1fdb94df10 100644
+--- a/src/import/staging/src/k8s.io/apiserver/go.mod
++++ b/src/import/staging/src/k8s.io/apiserver/go.mod
+@@ -47,7 +47,7 @@ require (
+ google.golang.org/grpc v1.23.0
+ gopkg.in/natefinch/lumberjack.v2 v2.0.0
+ gopkg.in/square/go-jose.v2 v2.2.2
+- gopkg.in/yaml.v2 v2.2.4
++ gopkg.in/yaml.v2 v2.2.8
+ gotest.tools v2.2.0+incompatible // indirect
+ k8s.io/api v0.0.0
+ k8s.io/apimachinery v0.0.0
+diff --git a/src/import/staging/src/k8s.io/apiserver/go.sum b/src/import/staging/src/k8s.io/apiserver/go.sum
+index 9658ae1784a..d055f0d08a2 100644
+--- a/src/import/staging/src/k8s.io/apiserver/go.sum
++++ b/src/import/staging/src/k8s.io/apiserver/go.sum
+@@ -268,8 +268,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git a/src/import/staging/src/k8s.io/cli-runtime/go.sum b/src/import/staging/src/k8s.io/cli-runtime/go.sum
+index 71af2c05905..641ba432230 100644
+--- a/src/import/staging/src/k8s.io/cli-runtime/go.sum
++++ b/src/import/staging/src/k8s.io/cli-runtime/go.sum
+@@ -207,8 +207,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/client-go/go.sum b/src/import/staging/src/k8s.io/client-go/go.sum
+index ec7d3780cad..315bfceda79 100644
+--- a/src/import/staging/src/k8s.io/client-go/go.sum
++++ b/src/import/staging/src/k8s.io/client-go/go.sum
+@@ -175,8 +175,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/cloud-provider/go.sum b/src/import/staging/src/k8s.io/cloud-provider/go.sum
+index e00d8e24a27..7d446c66231 100644
+--- a/src/import/staging/src/k8s.io/cloud-provider/go.sum
++++ b/src/import/staging/src/k8s.io/cloud-provider/go.sum
+@@ -158,8 +158,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/cluster-bootstrap/go.sum b/src/import/staging/src/k8s.io/cluster-bootstrap/go.sum
+index 09c98a9ccd8..e148b9741de 100644
+--- a/src/import/staging/src/k8s.io/cluster-bootstrap/go.sum
++++ b/src/import/staging/src/k8s.io/cluster-bootstrap/go.sum
+@@ -91,8 +91,8 @@ gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+ k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+diff --git a/src/import/staging/src/k8s.io/code-generator/go.mod b/src/import/staging/src/k8s.io/code-generator/go.mod
+index 7717cae18ba..0dc05a6c181 100644
+--- a/src/import/staging/src/k8s.io/code-generator/go.mod
++++ b/src/import/staging/src/k8s.io/code-generator/go.mod
+@@ -15,7 +15,7 @@ require (
+ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac // indirect
+ gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485
+ gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
+- gopkg.in/yaml.v2 v2.2.4 // indirect
++ gopkg.in/yaml.v2 v2.2.8 // indirect
+ k8s.io/gengo v0.0.0-20190822140433-26a664648505
+ k8s.io/klog v0.4.0
+ k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
+diff --git a/src/import/staging/src/k8s.io/code-generator/go.sum b/src/import/staging/src/k8s.io/code-generator/go.sum
+index a34b8497afa..a3be7c382b8 100644
+--- a/src/import/staging/src/k8s.io/code-generator/go.sum
++++ b/src/import/staging/src/k8s.io/code-generator/go.sum
+@@ -103,8 +103,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+ k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=
+diff --git a/src/import/staging/src/k8s.io/component-base/go.sum b/src/import/staging/src/k8s.io/component-base/go.sum
+index 34151a5846d..155e3e420e9 100644
+--- a/src/import/staging/src/k8s.io/component-base/go.sum
++++ b/src/import/staging/src/k8s.io/component-base/go.sum
+@@ -171,8 +171,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/csi-translation-lib/go.sum b/src/import/staging/src/k8s.io/csi-translation-lib/go.sum
+index 71646a53606..a4de3199c55 100644
+--- a/src/import/staging/src/k8s.io/csi-translation-lib/go.sum
++++ b/src/import/staging/src/k8s.io/csi-translation-lib/go.sum
+@@ -139,8 +139,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/kube-aggregator/go.sum b/src/import/staging/src/k8s.io/kube-aggregator/go.sum
+index 306beb4d2c1..be07875a640 100644
+--- a/src/import/staging/src/k8s.io/kube-aggregator/go.sum
++++ b/src/import/staging/src/k8s.io/kube-aggregator/go.sum
+@@ -303,8 +303,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git a/src/import/staging/src/k8s.io/kube-controller-manager/go.sum b/src/import/staging/src/k8s.io/kube-controller-manager/go.sum
+index 346871c01de..1653f3eca5a 100644
+--- a/src/import/staging/src/k8s.io/kube-controller-manager/go.sum
++++ b/src/import/staging/src/k8s.io/kube-controller-manager/go.sum
+@@ -147,8 +147,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/kube-proxy/go.sum b/src/import/staging/src/k8s.io/kube-proxy/go.sum
+index 346871c01de..1653f3eca5a 100644
+--- a/src/import/staging/src/k8s.io/kube-proxy/go.sum
++++ b/src/import/staging/src/k8s.io/kube-proxy/go.sum
+@@ -147,8 +147,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/kube-scheduler/go.sum b/src/import/staging/src/k8s.io/kube-scheduler/go.sum
+index 346871c01de..1653f3eca5a 100644
+--- a/src/import/staging/src/k8s.io/kube-scheduler/go.sum
++++ b/src/import/staging/src/k8s.io/kube-scheduler/go.sum
+@@ -147,8 +147,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/kubectl/go.mod b/src/import/staging/src/k8s.io/kubectl/go.mod
+index 5e5e4b2bbed..d1c8a52cbb4 100644
+--- a/src/import/staging/src/k8s.io/kubectl/go.mod
++++ b/src/import/staging/src/k8s.io/kubectl/go.mod
+@@ -33,7 +33,7 @@ require (
+ github.com/spf13/pflag v1.0.3
+ github.com/stretchr/testify v1.3.0
+ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
+- gopkg.in/yaml.v2 v2.2.4
++ gopkg.in/yaml.v2 v2.2.8
+ gotest.tools v2.2.0+incompatible // indirect
+ k8s.io/api v0.0.0
+ k8s.io/apimachinery v0.0.0
+diff --git a/src/import/staging/src/k8s.io/kubectl/go.sum b/src/import/staging/src/k8s.io/kubectl/go.sum
+index b164ecd3dc3..17d56a30001 100644
+--- a/src/import/staging/src/k8s.io/kubectl/go.sum
++++ b/src/import/staging/src/k8s.io/kubectl/go.sum
+@@ -268,8 +268,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git a/src/import/staging/src/k8s.io/kubelet/go.sum b/src/import/staging/src/k8s.io/kubelet/go.sum
+index 0635238e2ce..e12860540cd 100644
+--- a/src/import/staging/src/k8s.io/kubelet/go.sum
++++ b/src/import/staging/src/k8s.io/kubelet/go.sum
+@@ -87,8 +87,8 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+ k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+diff --git a/src/import/staging/src/k8s.io/legacy-cloud-providers/go.sum b/src/import/staging/src/k8s.io/legacy-cloud-providers/go.sum
+index 7da7d10f1b0..4affb42e698 100644
+--- a/src/import/staging/src/k8s.io/legacy-cloud-providers/go.sum
++++ b/src/import/staging/src/k8s.io/legacy-cloud-providers/go.sum
+@@ -271,8 +271,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git a/src/import/staging/src/k8s.io/metrics/go.sum b/src/import/staging/src/k8s.io/metrics/go.sum
+index 4ba35f7c725..b820dfe346b 100644
+--- a/src/import/staging/src/k8s.io/metrics/go.sum
++++ b/src/import/staging/src/k8s.io/metrics/go.sum
+@@ -192,8 +192,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
+diff --git a/src/import/staging/src/k8s.io/node-api/go.sum b/src/import/staging/src/k8s.io/node-api/go.sum
+index eb2113416f4..df4095e8c53 100644
+--- a/src/import/staging/src/k8s.io/node-api/go.sum
++++ b/src/import/staging/src/k8s.io/node-api/go.sum
+@@ -195,8 +195,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
+diff --git a/src/import/staging/src/k8s.io/sample-apiserver/go.sum b/src/import/staging/src/k8s.io/sample-apiserver/go.sum
+index 6100b600021..c9af593485a 100644
+--- a/src/import/staging/src/k8s.io/sample-apiserver/go.sum
++++ b/src/import/staging/src/k8s.io/sample-apiserver/go.sum
+@@ -300,8 +300,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+diff --git a/src/import/staging/src/k8s.io/sample-cli-plugin/go.sum b/src/import/staging/src/k8s.io/sample-cli-plugin/go.sum
+index 71af2c05905..641ba432230 100644
+--- a/src/import/staging/src/k8s.io/sample-cli-plugin/go.sum
++++ b/src/import/staging/src/k8s.io/sample-cli-plugin/go.sum
+@@ -207,8 +207,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+diff --git a/src/import/staging/src/k8s.io/sample-controller/go.sum b/src/import/staging/src/k8s.io/sample-controller/go.sum
+index 2729443484f..9d360830a5a 100644
+--- a/src/import/staging/src/k8s.io/sample-controller/go.sum
++++ b/src/import/staging/src/k8s.io/sample-controller/go.sum
+@@ -196,8 +196,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
+diff --git a/src/import/vendor/gopkg.in/yaml.v2/.travis.yml b/src/import/vendor/gopkg.in/yaml.v2/.travis.yml
+index 9f556934d8b..055480b9ef8 100644
+--- a/src/import/vendor/gopkg.in/yaml.v2/.travis.yml
++++ b/src/import/vendor/gopkg.in/yaml.v2/.travis.yml
+@@ -1,12 +1,16 @@
+ language: go
+
+ go:
+- - 1.4
+- - 1.5
+- - 1.6
+- - 1.7
+- - 1.8
+- - 1.9
+- - tip
++ - "1.4.x"
++ - "1.5.x"
++ - "1.6.x"
++ - "1.7.x"
++ - "1.8.x"
++ - "1.9.x"
++ - "1.10.x"
++ - "1.11.x"
++ - "1.12.x"
++ - "1.13.x"
++ - "tip"
+
+ go_import_path: gopkg.in/yaml.v2
+diff --git a/src/import/vendor/gopkg.in/yaml.v2/decode.go b/src/import/vendor/gopkg.in/yaml.v2/decode.go
+index 53108765555..129bc2a97d3 100644
+--- a/src/import/vendor/gopkg.in/yaml.v2/decode.go
++++ b/src/import/vendor/gopkg.in/yaml.v2/decode.go
+@@ -319,10 +319,14 @@ func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unm
+ }
+
+ const (
+- // 400,000 decode operations is ~500kb of dense object declarations, or ~5kb of dense object declarations with 10000% alias expansion
++ // 400,000 decode operations is ~500kb of dense object declarations, or
++ // ~5kb of dense object declarations with 10000% alias expansion
+ alias_ratio_range_low = 400000
+- // 4,000,000 decode operations is ~5MB of dense object declarations, or ~4.5MB of dense object declarations with 10% alias expansion
++
++ // 4,000,000 decode operations is ~5MB of dense object declarations, or
++ // ~4.5MB of dense object declarations with 10% alias expansion
+ alias_ratio_range_high = 4000000
++
+ // alias_ratio_range is the range over which we scale allowed alias ratios
+ alias_ratio_range = float64(alias_ratio_range_high - alias_ratio_range_low)
+ )
+@@ -784,8 +788,7 @@ func (d *decoder) merge(n *node, out reflect.Value) {
+ case mappingNode:
+ d.unmarshal(n, out)
+ case aliasNode:
+- an, ok := d.doc.anchors[n.value]
+- if ok && an.kind != mappingNode {
++ if n.alias != nil && n.alias.kind != mappingNode {
+ failWantMap()
+ }
+ d.unmarshal(n, out)
+@@ -794,8 +797,7 @@ func (d *decoder) merge(n *node, out reflect.Value) {
+ for i := len(n.children) - 1; i >= 0; i-- {
+ ni := n.children[i]
+ if ni.kind == aliasNode {
+- an, ok := d.doc.anchors[ni.value]
+- if ok && an.kind != mappingNode {
++ if ni.alias != nil && ni.alias.kind != mappingNode {
+ failWantMap()
+ }
+ } else if ni.kind != mappingNode {
+diff --git a/src/import/vendor/gopkg.in/yaml.v2/scannerc.go b/src/import/vendor/gopkg.in/yaml.v2/scannerc.go
+index 570b8ecd10f..0b9bb6030a0 100644
+--- a/src/import/vendor/gopkg.in/yaml.v2/scannerc.go
++++ b/src/import/vendor/gopkg.in/yaml.v2/scannerc.go
+@@ -626,31 +626,18 @@ func trace(args ...interface{}) func() {
+ func yaml_parser_fetch_more_tokens(parser *yaml_parser_t) bool {
+ // While we need more tokens to fetch, do it.
+ for {
+- // Check if we really need to fetch more tokens.
+- need_more_tokens := false
+-
+- if parser.tokens_head == len(parser.tokens) {
+- // Queue is empty.
+- need_more_tokens = true
+- } else {
+- // Check if any potential simple key may occupy the head position.
+- if !yaml_parser_stale_simple_keys(parser) {
++ if parser.tokens_head != len(parser.tokens) {
++ // If queue is non-empty, check if any potential simple key may
++ // occupy the head position.
++ head_tok_idx, ok := parser.simple_keys_by_tok[parser.tokens_parsed]
++ if !ok {
++ break
++ } else if valid, ok := yaml_simple_key_is_valid(parser, &parser.simple_keys[head_tok_idx]); !ok {
+ return false
+- }
+-
+- for i := range parser.simple_keys {
+- simple_key := &parser.simple_keys[i]
+- if simple_key.possible && simple_key.token_number == parser.tokens_parsed {
+- need_more_tokens = true
+- break
+- }
++ } else if !valid {
++ break
+ }
+ }
+-
+- // We are finished.
+- if !need_more_tokens {
+- break
+- }
+ // Fetch the next token.
+ if !yaml_parser_fetch_next_token(parser) {
+ return false
+@@ -678,11 +665,6 @@ func yaml_parser_fetch_next_token(parser *yaml_parser_t) bool {
+ return false
+ }
+
+- // Remove obsolete potential simple keys.
+- if !yaml_parser_stale_simple_keys(parser) {
+- return false
+- }
+-
+ // Check the indentation level against the current column.
+ if !yaml_parser_unroll_indent(parser, parser.mark.column) {
+ return false
+@@ -837,29 +819,30 @@ func yaml_parser_fetch_next_token(parser *yaml_parser_t) bool {
+ "found character that cannot start any token")
+ }
+
+-// Check the list of potential simple keys and remove the positions that
+-// cannot contain simple keys anymore.
+-func yaml_parser_stale_simple_keys(parser *yaml_parser_t) bool {
+- // Check for a potential simple key for each flow level.
+- for i := range parser.simple_keys {
+- simple_key := &parser.simple_keys[i]
+-
+- // The specification requires that a simple key
+- //
+- // - is limited to a single line,
+- // - is shorter than 1024 characters.
+- if simple_key.possible && (simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index) {
+-
+- // Check if the potential simple key to be removed is required.
+- if simple_key.required {
+- return yaml_parser_set_scanner_error(parser,
+- "while scanning a simple key", simple_key.mark,
+- "could not find expected ':'")
+- }
+- simple_key.possible = false
++func yaml_simple_key_is_valid(parser *yaml_parser_t, simple_key *yaml_simple_key_t) (valid, ok bool) {
++ if !simple_key.possible {
++ return false, true
++ }
++
++ // The 1.2 specification says:
++ //
++ // "If the ? indicator is omitted, parsing needs to see past the
++ // implicit key to recognize it as such. To limit the amount of
++ // lookahead required, the “:” indicator must appear at most 1024
++ // Unicode characters beyond the start of the key. In addition, the key
++ // is restricted to a single line."
++ //
++ if simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index {
++ // Check if the potential simple key to be removed is required.
++ if simple_key.required {
++ return false, yaml_parser_set_scanner_error(parser,
++ "while scanning a simple key", simple_key.mark,
++ "could not find expected ':'")
+ }
++ simple_key.possible = false
++ return false, true
+ }
+- return true
++ return true, true
+ }
+
+ // Check if a simple key may start at the current position and add it if
+@@ -879,13 +862,14 @@ func yaml_parser_save_simple_key(parser *yaml_parser_t) bool {
+ possible: true,
+ required: required,
+ token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
++ mark: parser.mark,
+ }
+- simple_key.mark = parser.mark
+
+ if !yaml_parser_remove_simple_key(parser) {
+ return false
+ }
+ parser.simple_keys[len(parser.simple_keys)-1] = simple_key
++ parser.simple_keys_by_tok[simple_key.token_number] = len(parser.simple_keys) - 1
+ }
+ return true
+ }
+@@ -900,9 +884,10 @@ func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool {
+ "while scanning a simple key", parser.simple_keys[i].mark,
+ "could not find expected ':'")
+ }
++ // Remove the key from the stack.
++ parser.simple_keys[i].possible = false
++ delete(parser.simple_keys_by_tok, parser.simple_keys[i].token_number)
+ }
+- // Remove the key from the stack.
+- parser.simple_keys[i].possible = false
+ return true
+ }
+
+@@ -912,7 +897,12 @@ const max_flow_level = 10000
+ // Increase the flow level and resize the simple key list if needed.
+ func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool {
+ // Reset the simple key on the next level.
+- parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
++ parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{
++ possible: false,
++ required: false,
++ token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
++ mark: parser.mark,
++ })
+
+ // Increase the flow level.
+ parser.flow_level++
+@@ -928,7 +918,9 @@ func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool {
+ func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool {
+ if parser.flow_level > 0 {
+ parser.flow_level--
+- parser.simple_keys = parser.simple_keys[:len(parser.simple_keys)-1]
++ last := len(parser.simple_keys) - 1
++ delete(parser.simple_keys_by_tok, parser.simple_keys[last].token_number)
++ parser.simple_keys = parser.simple_keys[:last]
+ }
+ return true
+ }
+@@ -1005,6 +997,8 @@ func yaml_parser_fetch_stream_start(parser *yaml_parser_t) bool {
+ // Initialize the simple key stack.
+ parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
+
++ parser.simple_keys_by_tok = make(map[int]int)
++
+ // A simple key is allowed at the beginning of the stream.
+ parser.simple_key_allowed = true
+
+@@ -1286,7 +1280,11 @@ func yaml_parser_fetch_value(parser *yaml_parser_t) bool {
+ simple_key := &parser.simple_keys[len(parser.simple_keys)-1]
+
+ // Have we found a simple key?
+- if simple_key.possible {
++ if valid, ok := yaml_simple_key_is_valid(parser, simple_key); !ok {
++ return false
++
++ } else if valid {
++
+ // Create the KEY token and insert it into the queue.
+ token := yaml_token_t{
+ typ: yaml_KEY_TOKEN,
+@@ -1304,6 +1302,7 @@ func yaml_parser_fetch_value(parser *yaml_parser_t) bool {
+
+ // Remove the simple key.
+ simple_key.possible = false
++ delete(parser.simple_keys_by_tok, simple_key.token_number)
+
+ // A simple key cannot follow another simple key.
+ parser.simple_key_allowed = false
+diff --git a/src/import/vendor/gopkg.in/yaml.v2/yaml.go b/src/import/vendor/gopkg.in/yaml.v2/yaml.go
+index de85aa4cdb7..89650e293ac 100644
+--- a/src/import/vendor/gopkg.in/yaml.v2/yaml.go
++++ b/src/import/vendor/gopkg.in/yaml.v2/yaml.go
+@@ -89,7 +89,7 @@ func UnmarshalStrict(in []byte, out interface{}) (err error) {
+ return unmarshal(in, out, true)
+ }
+
+-// A Decorder reads and decodes YAML values from an input stream.
++// A Decoder reads and decodes YAML values from an input stream.
+ type Decoder struct {
+ strict bool
+ parser *parser
+diff --git a/src/import/vendor/gopkg.in/yaml.v2/yamlh.go b/src/import/vendor/gopkg.in/yaml.v2/yamlh.go
+index e25cee563be..f6a9c8e34b1 100644
+--- a/src/import/vendor/gopkg.in/yaml.v2/yamlh.go
++++ b/src/import/vendor/gopkg.in/yaml.v2/yamlh.go
+@@ -579,6 +579,7 @@ type yaml_parser_t struct {
+
+ simple_key_allowed bool // May a simple key occur at the current position?
+ simple_keys []yaml_simple_key_t // The stack of simple keys.
++ simple_keys_by_tok map[int]int // possible simple_key indexes indexed by token_number
+
+ // Parser stuff
+
+diff --git a/src/import/vendor/modules.txt b/src/import/vendor/modules.txt
+index 4585ca5ec0d..06a5d7fa5a0 100644
+--- a/src/import/vendor/modules.txt
++++ b/src/import/vendor/modules.txt
+@@ -1069,7 +1069,7 @@ gopkg.in/square/go-jose.v2/jwt
+ gopkg.in/tomb.v1
+ # gopkg.in/warnings.v0 v0.1.1 => gopkg.in/warnings.v0 v0.1.1
+ gopkg.in/warnings.v0
+-# gopkg.in/yaml.v2 v2.2.4 => gopkg.in/yaml.v2 v2.2.4
++# gopkg.in/yaml.v2 v2.2.8 => gopkg.in/yaml.v2 v2.2.8
+ gopkg.in/yaml.v2
+ # gotest.tools v2.2.0+incompatible => gotest.tools v2.2.0+incompatible
+ gotest.tools
+--
+2.23.0
+
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index e96b7d6..941e0ca 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.16;name=k
file://CVE-2020-8551.patch \
file://CVE-2020-8552.patch \
file://CVE-2020-8555.patch \
+ file://CVE-2019-11254.patch \
"

DEPENDS += "rsync-native \
--
2.17.1
--
---------------------
Thanks,
Zhixiong Chi
Tel: +86-10-8477-7036


[meta-selinux][PATCH] selinux-*.service: install to sysinit.target

Yi Zhao
 

The selinux-init/autorelabel/labeldev services have a constraint of
Before=sysinit.arget. So it is better to install them to sysinit.target
rather than multi-user.target.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../selinux/selinux-autorelabel/selinux-autorelabel.service | 2 +-
recipes-security/selinux/selinux-init/selinux-init.service | 2 +-
.../selinux/selinux-labeldev/selinux-labeldev.service | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-security/selinux/selinux-autorelabel/selinux-autorelabel.service b/recipes-security/selinux/selinux-autorelabel/selinux-autorelabel.service
index 9520f6e..3c2a576 100644
--- a/recipes-security/selinux/selinux-autorelabel/selinux-autorelabel.service
+++ b/recipes-security/selinux/selinux-autorelabel/selinux-autorelabel.service
@@ -8,4 +8,4 @@ Type=oneshot
ExecStart=/usr/bin/selinux-autorelabel.sh

[Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target
diff --git a/recipes-security/selinux/selinux-init/selinux-init.service b/recipes-security/selinux/selinux-init/selinux-init.service
index 49c6d98..91b3e72 100644
--- a/recipes-security/selinux/selinux-init/selinux-init.service
+++ b/recipes-security/selinux/selinux-init/selinux-init.service
@@ -9,4 +9,4 @@ Type=oneshot
ExecStart=/usr/bin/selinux-init.sh

[Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target
diff --git a/recipes-security/selinux/selinux-labeldev/selinux-labeldev.service b/recipes-security/selinux/selinux-labeldev/selinux-labeldev.service
index d45ecbc..96142a3 100644
--- a/recipes-security/selinux/selinux-labeldev/selinux-labeldev.service
+++ b/recipes-security/selinux/selinux-labeldev/selinux-labeldev.service
@@ -8,4 +8,4 @@ Type=oneshot
ExecStart=/usr/bin/selinux-labeldev.sh

[Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target
--
2.17.1


Re: Building extensible SDK

Kjeld Flarup
 

Thanks Khem

I guess the eSDK is quite new then.

I have to ask my BSP supplier, about what version of Yocto they are using.

"The extensible SDK can currently only be built for the same architecture as the machine being built on - SDK_ARCH is
set to i686 (likely via setting SDKMACHINE) which is different from the architecture of the build machine (x86_64)."


Regards
Kjeld Flarup
DEIF R&D - Platform Software



________________________________________
From: Khem Raj <raj.khem@gmail.com>
Sent: Thursday, July 30, 2020 7:40:04 AM
To: Kjeld Flarup; yocto@lists.yoctoproject.org
Subject: Re: [yocto] Building extensible SDK

On 7/28/20 2:58 AM, Kjeld Flarup via lists.yoctoproject.org wrote:
The eSDK looks interesting, but the documentation does not say anything about how to build it.
Am I missing something about how to obtain the eSDK?
its all in the manual e.g.

https://www.yoctoproject.org/docs/current/sdk-manual/sdk-manual.html#sdk-building-an-sdk-installer



Regards
Kjeld Flarup
DEIF R&D - Platform Software



________________________________________
From: Khem Raj <raj.khem@gmail.com>
Sent: Friday, July 10, 2020 02:38
To: Kjeld Flarup; yocto@lists.yoctoproject.org
Subject: Re: [yocto] Add application with library to target

On 7/8/20 2:37 AM, Kjeld Flarup via lists.yoctoproject.org wrote:
I have a functioning Yocto build today, but two of the recipes are
optional. An application and a library.
I would like to split my build in two.

One that contains the basic system with kernel rootfs etc.
A second that just contains the application and the library

If I just had the application, it would be simple just to use the SDK
and generate the application.
But when adding the library, things starts to be more complex.

I would also like to use my existing recipe with dependencies etc.

What is the best approach

* Can this be done with the ADT?
* Can a layer solve it
* Do I need to do it all manually with the SDK
I think eSDK might be good fit for your usecase.

https://www.yoctoproject.org/docs/current/sdk-manual/sdk-manual.html#sdk-extensible

--
Regards
Kjeld Flarup
DEIF A/S





Re: Remove connman package from yocto sdk.

Khem Raj
 

On 7/24/20 5:44 AM, NIKHIL PATIL wrote:
Hi team,
          We want to use NetworkManager to access internet using LTE module . but connman and Networkmaanger both are installed.
          I struggled so much to remove connman,  I tried as follows :-
           1) Added IMAGE_INSTALL_remove = "connman"  in local.conf
                            but it still come with sato image.
            2) Added DISTRO_FEATURE_remove = "connman"  in local.conf
                            but it still come with sato image.
    By default connman is coming in image , how to remove connman ?
try to find where its being added. Perhaps bitbake -g <image> should give you dependency file where you can check where it appear on right hand side of -> and equate to which package is bringing it in as dependency


Re: How to enable preempt-rt in Yocto Zeus or Warrior?

Khem Raj
 

On 7/27/20 12:51 PM, Scott Whitney wrote:
Hi Yocto group,
I’m working with a newly-released copy of Yocto Zeus from Variscite for the i.MX8MM Mini, although the same option seems to apply to the previous Yocto Warrior.
I understand that a Linux real-time kernel can be enabled by setting LINUX_KERNEL_TYPE = “preempt-rt”.  Where does this option need to be set so that when I bitbake fsl-image-qt5, I get the Linux “preempt-rt” kernel instead of the “standard” kernel?
Is there a specific configuration file that needs to be modified, or a new recipe in a layer?  I am confused and hoping that you can help.
These are custom options perhaps you have from your SDK provider, since variscite SOMs are based on IMX perhaps you also need to see if they are using linux-imx kernel and ensure that they have preempt-rt patches integrated into which ever kernel you are using. Thereafter you could use right kconfig options to enable it. So first find out who is providing your kernel and does it have above

Best regards,
*Scott D. Whitney*
Principal Software Engineer
Intertech Engineering Associates, Inc.
100 Lowder Brook Drive, Suite 2500
Westwood, MA  02090
_sdw@inea.com <mailto:sdw@inea.com>_    |     T: 781-801-1152    | F: 781-801-1108    | _www.inea.com <http://www.inea.com/>___


Re: Building extensible SDK

Khem Raj
 

On 7/28/20 2:58 AM, Kjeld Flarup via lists.yoctoproject.org wrote:
The eSDK looks interesting, but the documentation does not say anything about how to build it.
Am I missing something about how to obtain the eSDK?
its all in the manual e.g.

https://www.yoctoproject.org/docs/current/sdk-manual/sdk-manual.html#sdk-building-an-sdk-installer

Regards
Kjeld Flarup
DEIF R&D - Platform Software
________________________________________
From: Khem Raj <raj.khem@gmail.com>
Sent: Friday, July 10, 2020 02:38
To: Kjeld Flarup; yocto@lists.yoctoproject.org
Subject: Re: [yocto] Add application with library to target
On 7/8/20 2:37 AM, Kjeld Flarup via lists.yoctoproject.org wrote:
I have a functioning Yocto build today, but two of the recipes are
optional. An application and a library.
I would like to split my build in two.

One that contains the basic system with kernel rootfs etc.
A second that just contains the application and the library

If I just had the application, it would be simple just to use the SDK
and generate the application.
But when adding the library, things starts to be more complex.

I would also like to use my existing recipe with dependencies etc.

What is the best approach

* Can this be done with the ADT?
* Can a layer solve it
* Do I need to do it all manually with the SDK
I think eSDK might be good fit for your usecase.
https://www.yoctoproject.org/docs/current/sdk-manual/sdk-manual.html#sdk-extensible

--
Regards
Kjeld Flarup
DEIF A/S





Re: #toolchain #yocto #devtool #linux #devtool #linux #toolchain #yocto

Khem Raj
 

On 7/27/20 10:09 PM, andymishra97@gmail.com wrote:
Hi,
I am trying to build a yocto *demo-coreip-cli* image for my custom RISC-V SOC which only supports *imafd* instructions. For the compilation of cross toolchain that is used by Bitbake, I tried changing cross-binutils.inc recipe and cross-gcc.inc recipe in openembedded-core layer by including “*–with-arch=rv64imafd*” in "*EXTRA_OECONF* " variable. Is there anything else I am missing or doing wrong? Thank You.
I think you could start by defining new tune files for this look into
meta/conf/machine/include/riscv/arch-riscv.inc and also tune-riscv.inc to understand the underlying mechanism, we currently have lp64 and ilp32 options available, its not clear what particular ABI you are looking for ( is it rv32 ? ) but you can encode it there and then use the right tunes in your machine to use it.


Re: [meta-security] Clamav libclammspack.so missing from image

Armin Kuster
 



On 7/29/20 12:34 PM, yoc wrote:
Hi,

I am adding clamav to my custom image.

I have added the target clamav-libclamav to my image and libclamav.so is added, as expected, to /usr/lib but libclammspack.so is not added to /usr/lib

How to I make sure that libclammspack.so is include in the image?
You can find it in the 'libmspack' package.

-armin


I am using the meta-security layer on the dunfell branch.

Many Thanks,

Charlie



    


Re: [meta-security] Clamav libclammspack.so missing from image

Armin Kuster
 



On 7/29/20 12:34 PM, yoc wrote:
Hi,

I am adding clamav to my custom image.

I have added the target clamav-libclamav to my image and libclamav.so is added, as expected, to /usr/lib but libclammspack.so is not added to /usr/lib

How to I make sure that libclammspack.so is include in the image?

You can check the build directory in the package dir and see if it is there. Then check the package-split to see if it ended up in a different package.

I am rebuilding dunfell now to see what is up.

-armin

I am using the meta-security layer on the dunfell branch.

Many Thanks,

Charlie



    

4141 - 4160 of 54277