From d193caa4bd94661b87393719d72d6e9cacc60439 Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Tue, 5 Nov 2019 18:04:20 +0800 Subject: 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 Signed-off-by: Wenlin Kang Signed-off-by: Ross Burton --- ...1-configure.in-remove-check-for-chkconfig.patch | 31 ++++++++++++++++++++++ meta/recipes-extended/sysstat/sysstat_12.1.6.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch (limited to 'meta/recipes-extended/sysstat') 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 @@ +From 1590cc614aaf0fb81cd804414d6c9d5a9227352c Mon Sep 17 00:00:00 2001 +From: Wenlin Kang +Date: Tue, 5 Nov 2019 16:16:44 +0800 +Subject: [PATCH] configure.in: remove check for chkconfig + +chkconfig can't work on cross-platform, so should remove check for it. + +Upstream-Status: Inappropriate [ embedded specific ] + +Signed-off-by: Wenlin Kang +--- + configure.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 48b9a31..cedeb43 100644 +--- a/configure.in ++++ b/configure.in +@@ -42,7 +42,8 @@ AC_SUBST(VER_JSON) + AC_SUBST(VER_XML) + + AC_PATH_PROG(PATH_CP, cp) +-AC_PATH_PROG(PATH_CHKCONFIG, chkconfig) ++#AC_PATH_PROG(PATH_CHKCONFIG, chkconfig) ++AC_SUBST(PATH_CHKCONFIG) + + # Check for systemd + AC_CHECK_PROG(PKG_CONFIG, pkg-config, pkg-config) +-- +1.9.1 + 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" SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ file://0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch \ + file://0001-configure.in-remove-check-for-chkconfig.patch \ " SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570" -- cgit 1.2.3-korg