From e549ce1de190e31f36c1fca20132bebdddc4a4d0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 31 Aug 2022 16:22:28 -0700 Subject: mcelog: Upgrade to v189 Fix build with clang while here Drop 0001-genconfig.py-update-shebang.patch its fixed upstream now Signed-off-by: Khem Raj --- ...ude-string.h-form-mem-function-prototypes.patch | 26 +++++++++++++++ .../mcelog/0001-genconfig.py-update-shebang.patch | 33 ------------------- meta-oe/recipes-support/mcelog/mcelog_180.bb | 37 ---------------------- meta-oe/recipes-support/mcelog/mcelog_189.bb | 37 ++++++++++++++++++++++ 4 files changed, 63 insertions(+), 70 deletions(-) create mode 100644 meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch delete mode 100644 meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch delete mode 100644 meta-oe/recipes-support/mcelog/mcelog_180.bb create mode 100644 meta-oe/recipes-support/mcelog/mcelog_189.bb diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch new file mode 100644 index 0000000000..3b6fd7d702 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch @@ -0,0 +1,26 @@ +From c7753f82261d49862d5e0f9691bf87799d36ef0c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 31 Aug 2022 16:20:03 -0700 +Subject: [PATCH] client: Include string.h form mem* function prototypes + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/client.c b/client.c +index 883b1de..e474e55 100644 +--- a/client.c ++++ b/client.c +@@ -16,6 +16,7 @@ + on your Linux system; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include ++#include + #include + #include + #include +-- +2.37.3 + diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch deleted file mode 100644 index 10d17f57d8..0000000000 --- a/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b09ff147e9383d33e6adbcb356b52236610fceda Mon Sep 17 00:00:00 2001 -From: Kai Kang -Date: Fri, 1 Apr 2022 10:00:00 +0800 -Subject: [PATCH] genconfig.py: update shebang - -It fails to call genconfig.py if no /usr/bin/python on build machine: - -| ./genconfig.py mcelog.conf config-intro.man > mcelog.conf.5 -| /bin/sh: ./genconfig.py: /usr/bin/python: bad interpreter: No such file or directory -| Makefile:71: recipe for target 'mcelog.conf.5' failed - -Update shebang with 'env python3' instead. - -Upstream-Status: Pending - -Signed-off-by: Kai Kang ---- - genconfig.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/genconfig.py b/genconfig.py -index ce9987f..982cac6 100755 ---- a/genconfig.py -+++ b/genconfig.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - # generate man config documentation from mcelog.conf example - # genconfig.py mcelog.conf intro.html - from __future__ import print_function --- -2.17.1 - diff --git a/meta-oe/recipes-support/mcelog/mcelog_180.bb b/meta-oe/recipes-support/mcelog/mcelog_180.bb deleted file mode 100644 index a64aacabf9..0000000000 --- a/meta-oe/recipes-support/mcelog/mcelog_180.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." -DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ -and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ -and should run on all Linux systems that need error handling." -HOMEPAGE = "https://mcelog.org/" -SECTION = "System Environment/Base" - -SRC_URI = "\ - git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ - file://run-ptest \ - file://0001-genconfig.py-update-shebang.patch \ -" - -SRCREV = "4146c9296a0cbd26f1c5e411cb44877f350053bd" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep ptest - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -do_install:append() { - install -d ${D}${sysconfdir}/cron.hourly - install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ - sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} - sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test -} - -RDEPENDS:${PN}-ptest += "make bash mce-inject" diff --git a/meta-oe/recipes-support/mcelog/mcelog_189.bb b/meta-oe/recipes-support/mcelog/mcelog_189.bb new file mode 100644 index 0000000000..2f8af9aa3f --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog_189.bb @@ -0,0 +1,37 @@ +SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." +DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ +and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ +and should run on all Linux systems that need error handling." +HOMEPAGE = "https://mcelog.org/" +SECTION = "System Environment/Base" + +SRC_URI = "\ + git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ + file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ + file://run-ptest \ +" + +SRCREV = "b8dfb1fa34eb627a03adfb315326a29ec51214b3" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +do_install:append() { + install -d ${D}${sysconfdir}/cron.hourly + install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ + sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} + sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test +} + +RDEPENDS:${PN}-ptest += "make bash mce-inject" -- cgit v1.2.3-54-g00ecf