From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- poky/meta/recipes-extended/sysstat/sysstat.inc | 65 ++++++++++++++++++++++ .../0001-Include-needed-headers-explicitly.patch | 59 ++++++++++++++++++++ .../recipes-extended/sysstat/sysstat/99_sysstat | 1 + .../sysstat/sysstat/sysstat.service | 12 ++++ .../recipes-extended/sysstat/sysstat_11.7.1.bb | 8 +++ 5 files changed, 145 insertions(+) create mode 100644 poky/meta/recipes-extended/sysstat/sysstat.inc create mode 100644 poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch create mode 100644 poky/meta/recipes-extended/sysstat/sysstat/99_sysstat create mode 100644 poky/meta/recipes-extended/sysstat/sysstat/sysstat.service create mode 100644 poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb (limited to 'poky/meta/recipes-extended/sysstat') diff --git a/poky/meta/recipes-extended/sysstat/sysstat.inc b/poky/meta/recipes-extended/sysstat/sysstat.inc new file mode 100644 index 000000000..0bc7e14d3 --- /dev/null +++ b/poky/meta/recipes-extended/sysstat/sysstat.inc @@ -0,0 +1,65 @@ +SUMMARY = "System performance tools" +DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." +HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" +LICENSE = "GPLv2+" +SECTION = "console/utils" + +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \ + file://99_sysstat \ + file://sysstat.service \ + " + +UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +DEPENDS += "base-passwd" + +# autotools-brokensep as this package doesn't use automake +inherit autotools-brokensep gettext systemd + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" + +EXTRA_OECONF += "--disable-stripping" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "sysstat.service" +SYSTEMD_AUTO_ENABLE = "enable" + +do_configure_prepend() { + export sa_lib_dir=${libdir}/sa +} + +do_install() { + autotools_do_install + + # don't install /var/log/sa when populating rootfs. Do it through volatile + rm -rf ${D}/var + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/sa - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf + fi + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system + sed -i -e 's#@LIBDIR@#${libdir}#g' ${D}${systemd_unitdir}/system/sysstat.service +} + +pkg_postinst_${PN} () { + if [ -n "$D" ]; then + exit 0 + fi + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + fi +} + + +FILES_${PN} += "${libdir}/sa" + +TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch new file mode 100644 index 000000000..1b63299aa --- /dev/null +++ b/poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch @@ -0,0 +1,59 @@ +From 42325faa88d64cce799977d611b2792beb154643 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 14 Sep 2015 08:36:59 +0000 +Subject: [PATCH] Include needed headers explicitly + +on glibc these headers get pulled in indirectly via other .h files +but right fix is to include them directly when used + +fixes + +error: use of undeclared identifier 'PATH_MAX' +error: called object type 'unsigned int' is not a function or function pointer +dm_major = major(aux.st_rdev); + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + common.c | 1 + + ioconf.c | 1 + + sa_common.c | 1 + + 3 files changed, 3 insertions(+) + +Index: sysstat-11.7.1/common.c +=================================================================== +--- sysstat-11.7.1.orig/common.c ++++ sysstat-11.7.1/common.c +@@ -20,6 +20,7 @@ + */ + + #include ++#include + #include + #include + #include +Index: sysstat-11.7.1/ioconf.c +=================================================================== +--- sysstat-11.7.1.orig/ioconf.c ++++ sysstat-11.7.1/ioconf.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "ioconf.h" + #include "common.h" +Index: sysstat-11.7.1/sa_common.c +=================================================================== +--- sysstat-11.7.1.orig/sa_common.c ++++ sysstat-11.7.1/sa_common.c +@@ -20,6 +20,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/poky/meta/recipes-extended/sysstat/sysstat/99_sysstat b/poky/meta/recipes-extended/sysstat/sysstat/99_sysstat new file mode 100644 index 000000000..0b0ec30de --- /dev/null +++ b/poky/meta/recipes-extended/sysstat/sysstat/99_sysstat @@ -0,0 +1 @@ +d root root 0755 /var/log/sa none diff --git a/poky/meta/recipes-extended/sysstat/sysstat/sysstat.service b/poky/meta/recipes-extended/sysstat/sysstat/sysstat.service new file mode 100644 index 000000000..aff07109f --- /dev/null +++ b/poky/meta/recipes-extended/sysstat/sysstat/sysstat.service @@ -0,0 +1,12 @@ +[Unit] +Description=Resets System Activity Logs + +[Service] +Type=oneshot +RemainAfterExit=yes +User=root +ExecStart=@LIBDIR@/sa/sa1 --boot + +[Install] +WantedBy=multi-user.target + diff --git a/poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb b/poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb new file mode 100644 index 000000000..86738e7b7 --- /dev/null +++ b/poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb @@ -0,0 +1,8 @@ +require sysstat.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" + +SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" + +SRC_URI[md5sum] = "bdcda7c9048c7c22fb1f30f75285d13d" +SRC_URI[sha256sum] = "303a595b1af0330b183a0f1febfccf89f183b9575ae0562b91fdb876f3ef1feb" -- cgit v1.2.3