diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-07-09 00:58:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-06 20:53:59 +0300 |
commit | 066be20a36c3f99cf5f0ba237f4e464b3378148a (patch) | |
tree | b56c6de5993d3f79d1da0f5551cfb173b84e4ecd /meta-openembedded/meta-oe/recipes-devtools | |
parent | 134b6d49de68990ff80b297e3cb627dc168a497e (diff) | |
download | openbmc-066be20a36c3f99cf5f0ba237f4e464b3378148a.tar.xz |
meta-openembedded: sumo refresh b0950aeff5..be79b8b111
Update meta-openembedded to sumo HEAD.
Armin Kuster (2):
wireshark: update to 2.4.7
wireshark: update to 2.4.8
Denys Dmytriyenko (1):
devmem2: ensure word is 32-bit, add support for 64-bit long
Jagadeesh Krishnanjanappa (1):
fuse: CVE-2018-10906
Oleksandr Kravchuk (1):
libsodium: update to 1.0.16
changqing.li@windriver.com (1):
php: upgrade 7.2.4 -> 7.2.7 Included:
leimaohui (2):
python-pytest: Fix conflict error as following:
libnih: Fix do_package error when enable mutilib.
Change-Id: I036baed004e407d5e9fde46eba75b6cc7e3479e0
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.7.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb) | 5 |
8 files changed, 9 insertions, 10 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch index 51a5e43b6..e7d326d7e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch @@ -4,7 +4,7 @@ Date: Tue, 17 Jun 2014 09:53:00 +0200 Subject: [PATCH 3/8] acinclude: use pkgconfig for libxml2 config Signed-off-by: Koen Kooi <koen.kooi@linaro.org> -Upstream-Status: pending +Upstream-Status: Pending --- acinclude.m4 | 63 ++++++++++++++++++++++-------------------------------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch index 30811a74b..d0831669f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch @@ -1,4 +1,4 @@ -Upstream-status: Unknown +Upstream-Status: Pending diff --git a/acinclude.m4 b/acinclude.m4 index 4fd452e..206fcbf 100644 diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch index b6e3ceb0b..ecf7d8720 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch @@ -1,7 +1,7 @@ From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-status: Unknown +Subject: [PATCH] Upstream-Status: Pending --- acinclude.m4 | 3 ++- diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch index b5fb7d4fd..16359af9f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch @@ -1,7 +1,7 @@ From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-status: Unknown +Subject: [PATCH] Upstream-Status: Pending --- acinclude.m4 | 2 +- diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch index 4bc102526..fcbf25be9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch @@ -1,7 +1,7 @@ From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-status: Unknown +Subject: [PATCH] Upstream-Status: Pending --- pear/Makefile.frag | 2 +- diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch index cff6426ab..997430309 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch @@ -1,7 +1,7 @@ From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-status: Unknown +Subject: [PATCH] Upstream-Status: Pending %% original patch: php5-pear-makefile.patch --- diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch index 6af0dc81a..80409000d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch @@ -1,7 +1,7 @@ From d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-status: Inappriate +Subject: [PATCH] Upstream-Status: Inappriate --- sapi/cli/config.m4 | 2 +- diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.7.bb index 2fd1e66c7..a256cd750 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.7.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ - file://0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch \ file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ " SRC_URI_append_class-target = " \ @@ -13,8 +12,8 @@ SRC_URI_append_class-target = " \ file://0001-opcache-config.m4-enable-opcache.patch \ " -SRC_URI[md5sum] = "864c64ffd2f1686b035ef8ce6a6d8478" -SRC_URI[sha256sum] = "11658a0d764dc94023b9fb60d4b5eb75d438ad17981efe70abb0d0d09a447ef3" +SRC_URI[md5sum] = "4b5698c8c6c2b9cbff3a5706da67bb0f" +SRC_URI[sha256sum] = "cc81675a96af4dd18d8ffc02f26a36c622abadf86af7ecfea7bcde8d3c96d5a3" PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ |