diff options
author | 2019-01-24 10:08:44 -0800 | |
---|---|---|
committer | 2019-01-24 10:08:44 -0800 | |
commit | 3f69a516588908e1f0d4edfad47ab5b3e159cf90 (patch) | |
tree | 074dc905eb7e03e9a8503c1733623c5f97837f97 /src/vnet/util | |
parent | 909ba93249532a35ce53e578cf622c8069045f84 (diff) |
install-dep: force osleap boost dep install
Triple commit this patch to stable/1807. Manually created it due to merge
conflict from cherrypicking the original patch 16631. This patch differs from
16631 that it skips the second chunk from the original patch, listed below,
because it has no significance which is also the source of the merge conflict.
@@ -309,7 +309,7 @@
@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
@sudo -E zypper refresh
- @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+ @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
@sudo -E zypper refresh
@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
This patch is needed for stable/1807 because verify job failed for
https://gerrit.fd.io/r/#/c/17031/
Change-Id: Iab863ab57738179ec59d6cd088cc83354acada08
Signed-off-by: Steven Luong <sluong@cisco.com>
Diffstat (limited to 'src/vnet/util')
0 files changed, 0 insertions, 0 deletions