From 335ddbb02ff01349747b0645783776ea939cf3bc Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 3 Mar 2021 11:18:10 +0800 Subject: mcelog: Upgrade to 175 Rebase 0001-test-avoid-the-pfa-test-hang.patch to the new version. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../mcelog/0001-test-avoid-the-pfa-test-hang.patch | 14 ++++----- meta-oe/recipes-support/mcelog/mcelog_170.bb | 36 ---------------------- meta-oe/recipes-support/mcelog/mcelog_175.bb | 36 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-support/mcelog/mcelog_170.bb create mode 100644 meta-oe/recipes-support/mcelog/mcelog_175.bb diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch index 83c29a651f..03bcc451df 100644 --- a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch @@ -1,6 +1,6 @@ -From 139177715a2d66ccd3e099be5d9d4dc86db30055 Mon Sep 17 00:00:00 2001 +From 3765b3a4cabf76f55c1c126ac64780a8c117d1d9 Mon Sep 17 00:00:00 2001 From: Mingli Yu -Date: Tue, 12 Jan 2021 03:05:38 +0000 +Date: Tue, 12 Jan 2021 10:30:13 +0800 Subject: [PATCH] test: avoid the pfa test hang Per [1], the pfa test needs to install page-types and the pfa test @@ -18,13 +18,13 @@ Signed-off-by: Mingli Yu 1 file changed, 3 insertions(+) diff --git a/tests/test b/tests/test -index 9623f4a..7c552a9 100755 +index 020ae2b..320f57f 100755 --- a/tests/test +++ b/tests/test -@@ -45,6 +45,9 @@ for conf in `ls *.conf` - do - log=`echo $conf | sed "s/conf/log/g"` - ./inject $conf +@@ -47,6 +47,9 @@ do + # Inject mce records and run mcelog in parallel. + # So that the mce records can be consumed by mcelog in time (avoid mce record overflow). + ./inject $conf & + if [ "$1" = "pfa" ] ; then + which page-types > /dev/null 2>&1 || continue + fi diff --git a/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-oe/recipes-support/mcelog/mcelog_170.bb deleted file mode 100644 index f3e018d4a8..0000000000 --- a/meta-oe/recipes-support/mcelog/mcelog_170.bb +++ /dev/null @@ -1,36 +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 = "http://mcelog.org/" -SECTION = "System Environment/Base" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ - file://0001-test-avoid-the-pfa-test-hang.patch \ - file://run-ptest \ -" - -SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" - -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_175.bb b/meta-oe/recipes-support/mcelog/mcelog_175.bb new file mode 100644 index 0000000000..ae810eff8e --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog_175.bb @@ -0,0 +1,36 @@ +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 = "http://mcelog.org/" +SECTION = "System Environment/Base" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ + file://0001-test-avoid-the-pfa-test-hang.patch \ + file://run-ptest \ +" + +SRCREV = "7b776a8c005b60572f49797e81287540f99fff1f" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" + +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 1.2.3-korg