diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch index d32fe78d32..42f2520175 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch @@ -1,6 +1,7 @@ -From f48a69fd11b2eda6c43ff046c202cbc4dcd4e92d Mon Sep 17 00:00:00 2001 +From 52360260c0d73a00082d867bc416225fbc2b657e Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 12 Jul 2011 11:46:37 +0200 +Subject: [PATCH] glibmm: add 2.28.2 --- Makefile.am | 7 +------ @@ -8,7 +9,7 @@ Date: Tue, 12 Jul 2011 11:46:37 +0200 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am -index a0df8af..c3d5e06 100644 +index 1b366b4..0ff58b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src @@ -26,7 +27,7 @@ index a0df8af..c3d5e06 100644 glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME) glibmm_include_HEADERS = glib/glibmm.h diff --git a/configure.ac b/configure.ac -index c20e778..74203be 100644 +index e706687..198e0d0 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile @@ -36,4 +37,4 @@ index c20e778..74203be 100644 - examples/Makefile docs/Makefile docs/reference/Doxyfile - MSVC_Net2013/glibmm/glibmm.rc + MSVC_NMake/glibmm/glibmm.rc |