diff options
| author |   Randy MacLeod <randy.macleod@windriver.com> | 2022-03-20 18:21:35 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:45:25 -0700 |
| commit | 825cd3679770810eca84bb30b26000ca3816fc7a (patch) | |
| tree | a213b465426dd68df078da40da637766ca196837 /meta-oe/recipes-support | |
| parent | 11fa9655652130d91f419b359284ea9dca176010 (diff) | |
| download | meta-openembedded-contrib-825cd3679770810eca84bb30b26000ca3816fc7a.tar.gz | |
mcelog: update from 175 to 180
The patch has been merged upstream so drop it:
f922739 test: avoid the pfa test hang
A LICENSE file was added, with the same terms, so update the
file and checksum. Change the HOMEPAGE link to https.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mcelog/mcelog_180.bb (renamed from meta-oe/recipes-support/mcelog/mcelog_175.bb) | 7 |
2 files changed, 3 insertions, 40 deletions
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 deleted file mode 100644 index 03bcc451df..0000000000 --- a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3765b3a4cabf76f55c1c126ac64780a8c117d1d9 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -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 -will hang forever if there is no page-types installed. - -Improve the test script to avoid the pfa test hang. - -[1] https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/tree/tests/pfa/PFA_test_howto?id=7b776a8c005b60572f49797e81287540f99fff1f - -Upstream-Status: Submitted [https://github.com/andikleen/mcelog/pull/87] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - tests/test | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/test b/tests/test -index 020ae2b..320f57f 100755 ---- a/tests/test -+++ b/tests/test -@@ -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 - $D ../../mcelog --foreground --daemon --debug-numerrors --config $conf --logfile $log >> result - - # let triggers finish --- -2.29.2 - diff --git a/meta-oe/recipes-support/mcelog/mcelog_175.bb b/meta-oe/recipes-support/mcelog/mcelog_180.bb index bbe81a9207..249e2421c4 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_175.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_180.bb @@ -2,18 +2,17 @@ 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/" +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-test-avoid-the-pfa-test-hang.patch \ file://run-ptest \ " -SRCREV = "7b776a8c005b60572f49797e81287540f99fff1f" +SRCREV = "4146c9296a0cbd26f1c5e411cb44877f350053bd" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" |