diff options
| author | Kai Kang <kai.kang@windriver.com> | 2022-04-01 10:42:51 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-03-31 21:23:05 -0700 |
| commit | af11f6ce731707418676042034808954f108b2a0 (patch) | |
| tree | a25d9e0ec996263764ed4135003292e6a7ef7f8b | |
| parent | 0caf66e939d56c419b0bebc021cd28823cdada02 (diff) | |
| download | meta-openembedded-af11f6ce731707418676042034808954f108b2a0.tar.gz | |
mcelog: fix compile error
Fix compile error of mcelog if no /usr/bin/python exists on build
machine. And adjust indent as well.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mcelog/mcelog_180.bb | 4 |
2 files changed, 36 insertions, 1 deletions
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 new file mode 100644 index 0000000000..10d17f57d8 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From b09ff147e9383d33e6adbcb356b52236610fceda Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kai Kang <kai.kang@windriver.com> | ||
| 3 | Date: Fri, 1 Apr 2022 10:00:00 +0800 | ||
| 4 | Subject: [PATCH] genconfig.py: update shebang | ||
| 5 | |||
| 6 | It fails to call genconfig.py if no /usr/bin/python on build machine: | ||
| 7 | |||
| 8 | | ./genconfig.py mcelog.conf config-intro.man > mcelog.conf.5 | ||
| 9 | | /bin/sh: ./genconfig.py: /usr/bin/python: bad interpreter: No such file or directory | ||
| 10 | | Makefile:71: recipe for target 'mcelog.conf.5' failed | ||
| 11 | |||
| 12 | Update shebang with 'env python3' instead. | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 17 | --- | ||
| 18 | genconfig.py | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/genconfig.py b/genconfig.py | ||
| 22 | index ce9987f..982cac6 100755 | ||
| 23 | --- a/genconfig.py | ||
| 24 | +++ b/genconfig.py | ||
| 25 | @@ -1,4 +1,4 @@ | ||
| 26 | -#!/usr/bin/python | ||
| 27 | +#!/usr/bin/env python3 | ||
| 28 | # generate man config documentation from mcelog.conf example | ||
| 29 | # genconfig.py mcelog.conf intro.html | ||
| 30 | from __future__ import print_function | ||
| 31 | -- | ||
| 32 | 2.17.1 | ||
| 33 | |||
diff --git a/meta-oe/recipes-support/mcelog/mcelog_180.bb b/meta-oe/recipes-support/mcelog/mcelog_180.bb index 249e2421c4..a64aacabf9 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_180.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_180.bb | |||
| @@ -5,8 +5,10 @@ and should run on all Linux systems that need error handling." | |||
| 5 | HOMEPAGE = "https://mcelog.org/" | 5 | HOMEPAGE = "https://mcelog.org/" |
| 6 | SECTION = "System Environment/Base" | 6 | SECTION = "System Environment/Base" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ | 8 | SRC_URI = "\ |
| 9 | git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ | ||
| 9 | file://run-ptest \ | 10 | file://run-ptest \ |
| 11 | file://0001-genconfig.py-update-shebang.patch \ | ||
| 10 | " | 12 | " |
| 11 | 13 | ||
| 12 | SRCREV = "4146c9296a0cbd26f1c5e411cb44877f350053bd" | 14 | SRCREV = "4146c9296a0cbd26f1c5e411cb44877f350053bd" |
