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 /poky/meta/recipes-devtools/diffstat | |
| 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 'poky/meta/recipes-devtools/diffstat')
| -rw-r--r-- | poky/meta/recipes-devtools/diffstat/diffstat/0001-aclocal.m4-add-missing-header-defines.patch | 24 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb (renamed from poky/meta/recipes-devtools/diffstat/diffstat_1.62.bb) | 7 |
2 files changed, 28 insertions, 3 deletions
diff --git a/poky/meta/recipes-devtools/diffstat/diffstat/0001-aclocal.m4-add-missing-header-defines.patch b/poky/meta/recipes-devtools/diffstat/diffstat/0001-aclocal.m4-add-missing-header-defines.patch new file mode 100644 index 0000000000..5bd94d7de4 --- /dev/null +++ b/poky/meta/recipes-devtools/diffstat/diffstat/0001-aclocal.m4-add-missing-header-defines.patch @@ -0,0 +1,24 @@ +From 004bd80d2523f538467b5ada2623eb207b55dad7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 20 Dec 2019 15:44:28 +0100 +Subject: [PATCH] aclocal.m4: add missing header defines + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + aclocal.m4 | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 3b19e82..c0c4acb 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1927,3 +1927,8 @@ make an error + fi + fi # cf_cv_posix_visible + ]) ++ ++AC_DEFINE([HAVE_TCGETATTR], [], [Description]) ++AC_DEFINE([HAVE_TCSETATTR], [], [Description]) ++AC_DEFINE([HAVE_TERMIOS_H], [], [Description]) ++ diff --git a/poky/meta/recipes-devtools/diffstat/diffstat_1.62.bb b/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb index 93d77797c9..ee0a7e7bd6 100644 --- a/poky/meta/recipes-devtools/diffstat/diffstat_1.62.bb +++ b/poky/meta/recipes-devtools/diffstat/diffstat_1.63.bb @@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://run-ptest \ file://avoid-check-user-break-cc.patch \ -" + file://0001-aclocal.m4-add-missing-header-defines.patch \ + " -SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc" -SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f" +SRC_URI[md5sum] = "b9272ec8af6257103261ec3622692991" +SRC_URI[sha256sum] = "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f" S = "${WORKDIR}/diffstat-${PV}" |