diff options
author | Wenlin Kang <wenlin.kang@windriver.com> | 2019-11-05 18:04:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-25 17:57:23 +0000 |
commit | 491d3708618e6a2924eee6c8901363680c08a90f (patch) | |
tree | 7c2fb3231fb48aa7aec29ce60699aa8fca824152 | |
parent | fb0a025f81711afa5852c1a0cd4dcf8d05541e9a (diff) | |
download | poky-491d3708618e6a2924eee6c8901363680c08a90f.tar.gz |
sysstat: remove check for chkconfig
For cross-platform, chkconfig can't work, so should remove check for it.
This can only be reproduced on some platform with chkconfig(e.g. CentOS
Linux release 7.2.1511), and need with --enable-install-cron and without
--enable-copy-only.
Fixed:
| if [ "n" == "n" ]; then \
| if [ -x "/usr/sbin/chkconfig" ]; then \
| cd /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/init.d && /usr/sbin/chkconfig --add sysstat; \
| else \
| [ -d /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc2.d ] || mkdir -p /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc2.d; \
| [ -d /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc3.d ] || mkdir -p /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc3.d; \
| [ -d /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc5.d ] || mkdir -p /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc5.d; \
| cd /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc2.d && ln -s -f ../init.d/sysstat S01sysstat; \
| cd /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc3.d && ln -s -f ../init.d/sysstat S01sysstat; \
| cd /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d/rc5.d && ln -s -f ../init.d/sysstat S01sysstat; \
| fi \
| fi \
| elif [ -d /path/to/tmp/work/corei7-64-wrs-linux/sysstat/11.1.5-r0/image/etc/rc.d ]; then \
| ...
| fi
| error reading information on service sysstat: No such file or directory
| Makefile:382: recipe for target 'install_all' failed
(From OE-Core rev: d193caa4bd94661b87393719d72d6e9cacc60439)
Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/sysstat/sysstat_12.1.6.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch b/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch new file mode 100644 index 0000000000..4067bb983b --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 1590cc614aaf0fb81cd804414d6c9d5a9227352c Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | ||
3 | Date: Tue, 5 Nov 2019 16:16:44 +0800 | ||
4 | Subject: [PATCH] configure.in: remove check for chkconfig | ||
5 | |||
6 | chkconfig can't work on cross-platform, so should remove check for it. | ||
7 | |||
8 | Upstream-Status: Inappropriate [ embedded specific ] | ||
9 | |||
10 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | ||
11 | --- | ||
12 | configure.in | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.in b/configure.in | ||
16 | index 48b9a31..cedeb43 100644 | ||
17 | --- a/configure.in | ||
18 | +++ b/configure.in | ||
19 | @@ -42,7 +42,8 @@ AC_SUBST(VER_JSON) | ||
20 | AC_SUBST(VER_XML) | ||
21 | |||
22 | AC_PATH_PROG(PATH_CP, cp) | ||
23 | -AC_PATH_PROG(PATH_CHKCONFIG, chkconfig) | ||
24 | +#AC_PATH_PROG(PATH_CHKCONFIG, chkconfig) | ||
25 | +AC_SUBST(PATH_CHKCONFIG) | ||
26 | |||
27 | # Check for systemd | ||
28 | AC_CHECK_PROG(PKG_CONFIG, pkg-config, pkg-config) | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta/recipes-extended/sysstat/sysstat_12.1.6.bb b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb index 362888d506..83bb45ea25 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.1.6.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb | |||
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" | |||
4 | 4 | ||
5 | SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ | 5 | SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ |
6 | file://0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch \ | 6 | file://0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch \ |
7 | file://0001-configure.in-remove-check-for-chkconfig.patch \ | ||
7 | " | 8 | " |
8 | 9 | ||
9 | SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570" | 10 | SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570" |