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-multimedia/recipes-multimedia/gstreamer-1.0/gstd | |
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-multimedia/recipes-multimedia/gstreamer-1.0/gstd')
2 files changed, 32 insertions, 38 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch new file mode 100644 index 0000000000..5a2861642d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch @@ -0,0 +1,32 @@ +From a84e9a6e1dca685eda072d58b58556b5b35cb4c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 10 Sep 2018 21:16:50 -0700 +Subject: [PATCH] Look for gtk-doc.make in builddir + +this is evident when S != B because gtkdocize +generates this file and its actually built into +build area + +Upstream-Status: Submitted [https://github.com/RidgeRun/gstd-1.x/pull/39] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + docs/reference/gstd/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am +index f860fa1..62870da 100644 +--- a/docs/reference/gstd/Makefile.am ++++ b/docs/reference/gstd/Makefile.am +@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la + + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/docs/gtk-doc.make ++include $(top_builddir)/docs/gtk-doc.make + + # Comment this out if you want 'make check' to test you doc status + # and run some sanity checks +-- +2.18.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch index ddc1831936..ffcc6ea94c 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch @@ -4,47 +4,9 @@ Date: Fri, 15 Dec 2017 10:14:05 -0600 Subject: [PATCH] gstd:yocto compatibility --- - autogen.sh | 8 +++++++- - docs/reference/gstd/Makefile.am | 2 +- gstd/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) -diff --git a/autogen.sh b/autogen.sh -index 66dbd42..793ee2f 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -21,7 +21,11 @@ - # ACLOCAL, AUTOPOINT and/or LIBTOOLIZE to the right versions, or leave them - # unset and get the defaults - --gtkdocize || exit 1 -+test -n "$srcdir" || srcdir=`dirname "$0"` -+test -n "$srcdir" || srcdir=. -+ -+olddir=`pwd` -+cd "$srcdir" - - autoreconf --verbose --force --install || { - echo 'autogen.sh failed'; -@@ -31,3 +35,5 @@ autoreconf --verbose --force --install || { - echo - echo "Now run './configure' with your system settings followed by 'make' to compile this module." - echo -+ -+cd "$olddir" -diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am -index f860fa1..153a13b 100644 ---- a/docs/reference/gstd/Makefile.am -+++ b/docs/reference/gstd/Makefile.am -@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la - - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/docs/gtk-doc.make -+# include $(top_srcdir)/docs/gtk-doc.make - - # Comment this out if you want 'make check' to test you doc status - # and run some sanity checks diff --git a/gstd/Makefile.am b/gstd/Makefile.am index 13c551d..11fe202 100644 --- a/gstd/Makefile.am |