diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-core/glib-2.0 | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/glib-2.0')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch | 40 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb (renamed from meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb) | 5 |
2 files changed, 2 insertions, 43 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch deleted file mode 100644 index 7899022f11..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt <kjellahlstedt@gmail.com> -Date: Wed, 20 Dec 2017 20:00:32 +0100 -Subject: [PATCH] Glib::Threads::Private: Fix gobj() - -Bug 791711 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] - glib/glibmm/threads.h | 2 +- - glib/src/threads.hg | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h -index f7e2b82a..2c0cbe8c 100644 ---- a/glib/glibmm/threads.h -+++ b/glib/glibmm/threads.h -@@ -657,7 +657,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; -diff --git a/glib/src/threads.hg b/glib/src/threads.hg -index 86d7a17b..c82a6130 100644 ---- a/glib/src/threads.hg -+++ b/glib/src/threads.hg -@@ -628,7 +628,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb index 4706432ab7..2f048d2f68 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.56.0.bb @@ -13,10 +13,9 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = " \ ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ file://remove-examples.patch \ - file://0001-Glib-Threads-Private-Fix-gobj.patch \ " -SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b" -SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a" +SRC_URI[md5sum] = "5aa7a60084fe3e01d746c96f4a115302" +SRC_URI[sha256sum] = "6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9" do_install_append() { install -d ${D}${datadir}/glibmm-2.4 |