diff options
author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /poky/meta/recipes-sato | |
parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
download | openbmc-1-0.86.tar.xz |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'poky/meta/recipes-sato')
4 files changed, 6 insertions, 5 deletions
diff --git a/poky/meta/recipes-sato/images/core-image-sato.bb b/poky/meta/recipes-sato/images/core-image-sato.bb index 35d066773..e63a229d1 100644 --- a/poky/meta/recipes-sato/images/core-image-sato.bb +++ b/poky/meta/recipes-sato/images/core-image-sato.bb @@ -13,4 +13,5 @@ TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-2.0" TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' +QB_MEM:qemuarmv5 = "-m 256" QB_MEM:qemumips = "-m 256" diff --git a/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb index 6f2fe1df4..68214ffba 100644 --- a/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb +++ b/poky/meta/recipes-sato/webkit/libwpe_1.10.1.bb @@ -2,11 +2,11 @@ SUMMARY = "General-purpose library specifically developed for the WPE-flavored p HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" DEPENDS = "virtual/egl libxkbcommon" -inherit cmake features_check +inherit cmake features_check pkgconfig REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb index c30bdf342..1f3f7a9c0 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb @@ -2,7 +2,7 @@ SUMMARY = "WebKit web rendering engine for the GTK+ platform" HOMEPAGE = "https://www.webkitgtk.org/" BUGTRACKER = "https://bugs.webkit.org/" -LICENSE = "BSD & LGPLv2+" +LICENSE = "BSD-2-Clause & LGPLv2+" LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ diff --git a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb index 4588ee10e..f2d640f07 100644 --- a/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb +++ b/poky/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb @@ -2,13 +2,13 @@ SUMMARY = "WPE's backend based on a freedesktop.org stack." HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" DEPENDS:append:class-target = " wayland-native" -inherit meson features_check +inherit meson features_check pkgconfig REQUIRED_DISTRO_FEATURES = "opengl" |