diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/mcelog')
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch | 36 | ||||
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.40.bb) | 5 |
2 files changed, 2 insertions, 39 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch deleted file mode 100644 index bea2f6293c..0000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8f57d35747a3b3fabc33466563077373090f869c Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 2 Sep 2014 07:05:15 -0700 -Subject: [PATCH] cache-error-trigger: remove bashism - -Use "$(cat $F)" to instead of "$(< $F)" to debash. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - triggers/cache-error-trigger | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/triggers/cache-error-trigger b/triggers/cache-error-trigger -index e32bfd6..785526f 100755 ---- a/triggers/cache-error-trigger -+++ b/triggers/cache-error-trigger -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # cache error trigger. This shell script is executed by mcelog in daemon mode - # when a CPU reports excessive corrected cache errors. This could be a indication - # for future uncorrected errors. -@@ -28,7 +28,7 @@ for i in $AFFECTED_CPUS ; do - logger -s -p daemon.crit -t mcelog "Offlining CPU $i due to cache error threshold" - F=$(printf "/sys/devices/system/cpu/cpu%d/online" $i) - echo 0 > $F -- if [ "$(< $F)" != "0" ] ; then -+ if [ "$(cat $F)" != "0" ] ; then - logger -s -p daemon.warn -t mcelog "Offlining CPU $i failed" - EXIT=1 - fi --- -1.7.9.5 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.40.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb index 9aebbd571c..84633a76c9 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.40.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb @@ -6,14 +6,13 @@ HOMEPAGE = "http://mcelog.org/" SECTION = "System Environment/Base" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ - file://mcelog-debash.patch \ file://run-ptest \ " -SRCREV = "008c73e6de3a4bf969d1627e695d4efc807aed92" +SRCREV = "2cfdf29b2ef98ccd5ed42cdde8bbe437e0d6412f" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README;md5=3d12dd2a10bdd22379cc4c0fc6949a88" +LIC_FILES_CHKSUM = "file://README.md;md5=279840fabb191e6cd9150492d31b0e20" S = "${WORKDIR}/git" |