diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-networking/recipes-support/openipmi | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/openipmi')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch | 31 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb (renamed from meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb) | 11 |
2 files changed, 5 insertions, 37 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch deleted file mode 100644 index e208de8b2..000000000 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bebfb3c24582ec4e45d79c5b52135197bf7373da Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Fri, 14 Jun 2019 14:17:34 +0800 -Subject: [PATCH] ipmi_serial_bmc_emu.c: include readline.h from readline - -The libedit had been removed and swithed to readline. -We need to include readline.h from readline rather than editline. - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - sample/ipmi_serial_bmc_emu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index e0ae019..1b8bb9a 100644 ---- a/sample/ipmi_serial_bmc_emu.c -+++ b/sample/ipmi_serial_bmc_emu.c -@@ -42,7 +42,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <sys/select.h> --#include <editline/readline.h> -+#include <readline/readline.h> - - #define _GNU_SOURCE - #include <getopt.h> --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb index f09278039..f196eb992 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb @@ -11,7 +11,7 @@ DEPENDS = " \ net-snmp \ openssl \ popt \ - python \ + python3 \ swig-native \ readline \ " @@ -29,21 +29,20 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ file://include_sys_types.patch \ - file://ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch \ file://openipmi-helper \ file://ipmi.service \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" -SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" +SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4" +SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996" -inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd cpan-base +inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base EXTRA_OECONF = "--disable-static \ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ - --with-python='${STAGING_BINDIR_NATIVE}/python-native/python' \ + --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \ --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \ --with-glibver=2.0" |