diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:01:54 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:48:48 +0300 |
| commit | 456380bb272d3a301c887eee513a3937cc1f48e1 (patch) | |
| tree | 124399167d539582befbe35ad28377eaea6cc8bc /meta-openbmc-mods/meta-common-small | |
| parent | 9722c6ee87766a45a337c094d1293de81cdcb106 (diff) | |
| download | openbmc-456380bb272d3a301c887eee513a3937cc1f48e1.tar.xz | |
Update to internal 10-22-19
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common-small')
4 files changed, 6 insertions, 4 deletions
diff --git a/meta-openbmc-mods/meta-common-small/conf/layer.conf b/meta-openbmc-mods/meta-common-small/conf/layer.conf index 666ddbcab..65569b5b2 100644 --- a/meta-openbmc-mods/meta-common-small/conf/layer.conf +++ b/meta-openbmc-mods/meta-common-small/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "common-small" BBFILE_PATTERN_common-small = "^${LAYERDIR}/" BBFILE_PRIORITY_common-small = "10" -LAYERSERIES_COMPAT_common-small = "warrior" +LAYERSERIES_COMPAT_common-small = "warrior zeus" diff --git a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend index 4b4630d7c..e0bc525ba 100644 --- a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend +++ b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI = "git://github.com/openbmc/qemu.git \ +SRC_URI = "git://github.com/openbmc/qemu.git;nobranch=1 \ file://0001-hw-arm-aspeed-Add-an-intel-ast2500-machine-type.patch \ file://0002-Turn-Off-FFWUPD-Jumper.patch" @@ -7,3 +7,5 @@ QEMU_TARGETS = "arm" S = "${WORKDIR}/git" SRCREV = "5dca85cb0b85ac309d131f9db1fb57af282d67cc" + +PACKAGECONFIG[ssh] = "--enable-libssh2,--disable-libssh2,libssh2," diff --git a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-system-native_%.bbappend index fb0a749bb..3a0ccb83f 100644 --- a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-system-native_%.bbappend +++ b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-system-native_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI = "git://github.com/openbmc/qemu.git \ +SRC_URI = "git://github.com/openbmc/qemu.git;nobranch=1 \ file://powerpc_rom.bin \ file://run-ptest \ file://0001-hw-arm-aspeed-Add-an-intel-ast2500-machine-type.patch \ diff --git a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu_%.bbappend b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu_%.bbappend index b25c0f2e8..6b59f16b0 100644 --- a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu_%.bbappend +++ b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI = "git://github.com/openbmc/qemu.git \ +SRC_URI = "git://github.com/openbmc/qemu.git;nobranch=1 \ file://0001-hw-arm-aspeed-Add-an-intel-ast2500-machine-type.patch \ file://0002-Turn-Off-FFWUPD-Jumper.patch" |