diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-25 22:55:05 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 14:22:49 +0000 |
commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/yocto-poky/meta/recipes-sato | |
parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
download | talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.gz talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.zip |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 5 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb | 2 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb (renamed from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb) | 6 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 1 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch | 32 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb | 4 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | 2 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb (renamed from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb) | 4 |
8 files changed, 47 insertions, 9 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 93e5a4eb6..531571ee8 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -4,3 +4,8 @@ DESCRIPTION += "Also includes ptest packages." IMAGE_FEATURES += "ptest-pkgs" +# This image is sufficiently large (~3GB) that it can't actually fit in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add just 500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "524288" diff --git a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb b/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb index 99dad1153..b89795028 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb @@ -8,7 +8,5 @@ LICENSE = "MIT" inherit core-image -IMAGE_INSTALL += "packagegroup-core-x11-sato-games" - TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index c9a7b4b22..b0cdfa2ae 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb @@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \ file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00" -DEPENDS = "gnome-common-native gtk+3 startup-notification dbus" +DEPENDS = "gtk+3 startup-notification dbus" SECTION = "x11/wm" -# SRCREV tagged 2.1 -SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80" +# SRCREV tagged 2.2 +SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ file://vfolders/* \ " diff --git a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 6fb1b678f..97cced7cc 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -19,7 +19,6 @@ RDEPENDS_${PN} = "\ " NETWORK_MANAGER ?= "connman-gnome" -NETWORK_MANAGER_libc-uclibc = "" SUMMARY_${PN}-base = "Sato desktop - base packages" RDEPENDS_${PN}-base = "\ diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch b/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch new file mode 100644 index 000000000..d40a3b1ef --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch @@ -0,0 +1,32 @@ +From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Apr 2017 12:18:08 -0700 +Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it + +we need this warning to be suppressed with gcc7+ +however older compilers dont support it so we need +a way to disble it only if compiler supports it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3a38c95..bb9035e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ fi + if test "x$GCC" = "xyes"; then + AC_MSG_CHECKING([for usable gcc warning flags]) + gccwarningflags= +- for flag in -Wall -Werror -std=c89 -pedantic; do ++ for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS" +-- +2.12.2 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb b/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb index a25c00760..decd2a8b3 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -14,7 +14,9 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ file://0001-Use-labs-instead-of-abs.patch \ file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ file://0001-Clarify-conditions-to-avoid-compiler-errors.patch \ -" + file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ + " +UPSTREAM_VERSION_UNKNOWN = "1" SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3" PE = "1" PV = "0.0+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch index 93a69c029..0f6eeed1a 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch @@ -9,6 +9,8 @@ This was not possible to override from the command line and in OpenEmbedded through the use of qemu target emulation. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +Upstream-Status: Pending --- Source/cmake/OptionsGTK.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index a64aee22e..ff0ff8fce 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb @@ -22,8 +22,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "af18c2cfa00cadfd0b4d8db21cab011d" -SRC_URI[sha256sum] = "0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8" +SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" +SRC_URI[sha256sum] = "93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |