From patchwork Fri Jul 12 12:49:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 168951 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp843166ilk; Fri, 12 Jul 2019 05:49:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxU3doJ9d6QOYPR434LWhMuSBsyVc0+Cliio8VtAchiryCSAvonup9T9V2WjWPepN4ali5y X-Received: by 2002:a63:5f95:: with SMTP id t143mr9997280pgb.304.1562935775480; Fri, 12 Jul 2019 05:49:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562935775; cv=none; d=google.com; s=arc-20160816; b=0+nIgO29egybfRny1s2//f4Cxx0wn06Fyq3ncHwXKLk1BJKCF7E95/Kj6MZaz5Z6Ak eWz1oJhF7X6gOY7eoc8YQJiByG9Yz8LgqRmweN+RSj3Y5cFCqOVbesm5T8mkGXIjAGPQ W2LoaXAYsBZb38FVElefuTBUlXVI6RUkGBOhZAt2etWkGJWPEizR0ty2NB58/0jf1tRM N1sM8yDgCbj/rsqWqOPwM4kcfwsri2bPpGHqzFQKkZiP3tQOuoNcUvPnI2AySRYDOyZ1 Hfw8tefr584WYLaT0tOt0KB6CBStP/ELUZs7It6qu4sZQi3vU0OzAcTe66Q+zRUXtIS7 ntpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=dCssQly/V/94jmTOg3nxhiS7c4Pbt8GPZrx1cX+b3cU=; b=vtAlbD7bPE7VFREVXhA2XPZQXfluWgukP2Lw61I/DU/wb4SEWKaTXuMIWx5ZIhS6Cd V1e1F9P8N5tW2k+OdutpTqtptwBNd+MyjO0uiR5vEXfRYVzGQHJklNQVyr6b9fxIG+9F gq+2lM7gX16fn7jbDdwAdieIowfuR1o9ID3PTbV3Xf0R+OsMrYuP68G8t0M10i2vWW2w DN7AZOVES4FRZEB19rHBMWrtKgARzsmzPBlg24EvkPU4CGx4vpcPy2qoghmuIvbQ+MPd qrtLHh7xnsBvl7pgzEC+ANsxH1RFWmFR66KhReW8yD8aFBUOvdlK75OxxegEsmVht45O 9tUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=JPikUfjk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f4si8019936plb.38.2019.07.12.05.49.35; Fri, 12 Jul 2019 05:49:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=JPikUfjk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C6BFD7F0FD; Fri, 12 Jul 2019 12:49:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 5A83A7EF54 for ; Fri, 12 Jul 2019 12:49:29 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id f17so8847508wme.2 for ; Fri, 12 Jul 2019 05:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=abnj1/l0mkwI9h/Qb5LLNIcTu0mtOkl1kyDQPvvCgMU=; b=JPikUfjkHH+1fFHn0gMKMpbRwkiZSrsOQdlx93nAUs67HGErdy7pGJYVqAA7uB6XVb KEftNRUTX+ij60lK8RxGvd5SwVCIZu3QKJRRU1shchlto4t/edAjPb5n0E8+lsPyi4T4 NGrmTQUd2VYYMQ1GEJGNnQB20zHAhpEu3BhdAihTWSvZS+sTe/OqBRB6Ep1N1iy0Ljyg 9K8edA0HIRVsSpxrBYo3ugx2wZlRyqqjR4fo6udPzm2iOnVkL3g62g9CM8ehiQp30wZX qqaPRHsMAL1KaDNiSotetGY+tz1H9yvbinE1bfwWoCEFHiWNVztFckIfrE3h84bagFru FpTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=abnj1/l0mkwI9h/Qb5LLNIcTu0mtOkl1kyDQPvvCgMU=; b=FuPOhRGh2pHT0xpnZQFjcX9Uegf6nqEAgKEgOPyD7m01yF9zloEmQLCZ7dhWX32yIZ jQ/78VQ395N0xk0Q5m4fITU+pe/IUyBXuStQVik9CbuJTFyfDzb7JkTRuQc7goSAF8W4 nH/PbZqaT3WP4pQ4Wxa2DljYvbzNPO/uTAYEnX7CReo6PzWgNtrHe2jeJ4nL09tSS5Zu ZOJ2lna++sx+w38yBd5ph4h4cjaLz8y7FsbbKQ3mR6PwBQ1tfhVgXEF9HO2vKVwv3t0k 77HqZBJwK6BcuDGzg01GTsi6vdfXVXIXtW/alLysdVtQgtY66r6ThUBl56A/65NuyTHC Q9cQ== X-Gm-Message-State: APjAAAUTCpleKAOzgh5TJpwiLBpLT7fyFoR7j7xJaI7pWHmQ2vDUBg7X EGk2f6QQLn0MPsDQU9dOTWwPTuTulL4= X-Received: by 2002:a05:600c:218d:: with SMTP id e13mr9893399wme.29.1562935770550; Fri, 12 Jul 2019 05:49:30 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id l8sm14806256wrg.40.2019.07.12.05.49.28 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 12 Jul 2019 05:49:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 12 Jul 2019 13:49:25 +0100 Message-Id: <20190712124926.32150-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/2] Revert "sysstat: use service file from source codes" X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This doesn't actually work as the unit file is only installed if cron support is enabled. This reverts commit 721f09d4897425c7131470bd756eee1b90937feb. Signed-off-by: Ross Burton --- meta/recipes-extended/sysstat/sysstat.inc | 8 ++++++-- .../recipes-extended/sysstat/sysstat/sysstat.service | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/sysstat/sysstat/sysstat.service -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 9085fcfe744..4e297216660 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -6,6 +6,7 @@ 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" @@ -16,10 +17,9 @@ DEPENDS += "base-passwd" # autotools-brokensep as this package doesn't use automake inherit autotools-brokensep gettext systemd upstream-version-is-even -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "" PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" EXTRA_OECONF += "--disable-stripping" @@ -45,6 +45,10 @@ do_install() { 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} () { diff --git a/meta/recipes-extended/sysstat/sysstat/sysstat.service b/meta/recipes-extended/sysstat/sysstat/sysstat.service new file mode 100644 index 00000000000..aff07109f54 --- /dev/null +++ b/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 + From patchwork Fri Jul 12 12:49:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 168952 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp843421ilk; Fri, 12 Jul 2019 05:49:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8tdWeKXp+40ZtBYnWTgX7pBr6gfYBOWMeyNUkQVk/cSEGScCVUUZ1VyHtHU2h2ZzX9R6W X-Received: by 2002:a17:90a:9f0b:: with SMTP id n11mr11337712pjp.98.1562935793142; Fri, 12 Jul 2019 05:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562935793; cv=none; d=google.com; s=arc-20160816; b=gf0qQU8/80hPIDkCuRh+4rYewNt3hNkaqQz7pPzQLuSu0JieIy6msFaH2KD8D3Dk/m NpH2sIFyAOV90S//+llOYQ1SkXEJVoL1g78HfM6TmQctaZO/OdhqEJzXwrbOBXZ/acml SnVdTQTJCFElO1/ogNE2LiTTB5dU01EpD/SNJHmqWDChcmcdSbNNIqW7RfVETETZVND0 qlyQJ42ZKVOKS0+Fr4rDl8EiekbHU7Cg+xl23ts0iKjx3cLFMPj812wrfj950SMWUizc WPmCZUD1K2TjNnGEAEYsTdhWmSlj+fH+Hnbr7CqkgkPDhQ5whDiisens0qh57k1zjMHO xxog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=yIT/qWBPXlXfSui6bjhmr6RS3LHAH/3OXd6i4y753TQ=; b=J8usvvO+AqCdgOfb9uH9iWHzKD/X+9M4Q/Gt7tYUFJrMB0tDqOPcw2ekuRqy0hjZAA aAbzHpnwxt8sOgTbEjusdO3zfNPo3DwEk+VBhFMegwiO38onKm7152ZS99YUHtnJbg8H aRWwUHZtJO6q7CrQ2H5Md+uvJutKSBCaFsnUBIYXv2E1pamb9UG2KIUC0m232LjS4+x8 DRmL9Aeas+Po4K1NeeAD/HrbJTr5cz5UiQN/aaZdInkEtBmtaHi/yHJHHUP17rwjsJjH Tr4xpgLbP5iUfhw/JeojVKe13tf9h1fuJ94F3iXgiLW95lMWE4nzKqYYMa9eXndNq6j3 ab4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=W1A+ZbeW; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y15si2845929pfb.28.2019.07.12.05.49.52; Fri, 12 Jul 2019 05:49:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=W1A+ZbeW; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3B73E7F111; Fri, 12 Jul 2019 12:49:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mail.openembedded.org (Postfix) with ESMTP id 1CADE7EF54 for ; Fri, 12 Jul 2019 12:49:30 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id z23so4648643wma.4 for ; Fri, 12 Jul 2019 05:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J+jrwkOkC+4+t8oucsbeEOp6DsKdwYGuEIgD+g3aJvY=; b=W1A+ZbeWuYN1yqserNTUmLVbiizL4E7pKHgJN8PI3T7niIAheSXmCHmTSNt7RsblH8 7vnNgcHXWm1caWv/N1QHjaTSkPMLzcWMEvkk9rbNUKm5VHgJimL3RE1RljfYSgBiOXtm IzPNZlWguvapkmyT5kWelHhvCHHyRNlcDF1j9HFo57CzMNp9ZadBcb77tWD65jQon3UB SWA33tqQ+j5vSU8enkBeBuverSlgyODpC8xJ39r3kK0CimFHDaZE02bY0L79eXc72JyG sbV6NKKJtoDala25UHl1htPUhvWLKY34aDlu7I2cwYNvn3cBDvIplqGjVLYEJwcLQqf+ 9STg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J+jrwkOkC+4+t8oucsbeEOp6DsKdwYGuEIgD+g3aJvY=; b=XtiUnsmsxZFEKFtpadQs/ovzU9o2VSu0bDxwRw4QOna5g1Iq+R4BidIPG6DDI4OHXj pnClo68o/bVOc7itGrP2KSISJ4dVI8GHQA2s7EP/Dgm4+mGMCBzWvjWhgObhUJ01+V5I mYIAufWeYFxW5MoW9JtEq5ceEmFJ3za7zdZnnbw42RrhqjceSTpJKs/GL0ITwZSroRUZ elr+ZV7v/Ny4bRn3G2qih2gDl+ZuTb0v5jhC1Y8/aIGj2NC/hUmS3ZKCZX/xJ8hCYdS/ khSXYPR6se9MCVAMgYqIuLGybLNAHKFSv+qTZaIN4cZr4Z0fCQgtUqlOGx2O9LKlVAjY eRHA== X-Gm-Message-State: APjAAAWmw7C8dM5NsCjs3cYTHCDfKOt5u8SzYIPoVORr1FW6oWwCpYT4 Sv2AHA6oh5TmLOWSvmcVrF/e8J4QtKs= X-Received: by 2002:a7b:c144:: with SMTP id z4mr10198766wmi.50.1562935771589; Fri, 12 Jul 2019 05:49:31 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id l8sm14806256wrg.40.2019.07.12.05.49.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 12 Jul 2019 05:49:30 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 12 Jul 2019 13:49:26 +0100 Message-Id: <20190712124926.32150-2-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190712124926.32150-1-ross.burton@intel.com> References: <20190712124926.32150-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/2] sysstat:The sysstat.service in source should be installed for cron with systemd X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Haiqing Bai The sysstat.service script in source launchs sysstat-collect and sysstat-summary services when cron is installed with systemd. At this time, the upstream sysstat.service must be installed. Signed-off-by: Haiqing Bai Signed-off-by: Ross Burton --- meta/recipes-extended/sysstat/sysstat.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 4e297216660..592cbf45743 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -20,6 +20,7 @@ inherit autotools-brokensep gettext systemd upstream-version-is-even PACKAGECONFIG ??= "" PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" EXTRA_OECONF += "--disable-stripping" @@ -44,11 +45,13 @@ do_install() { 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 + if ${@bb.utils.contains('PACKAGECONFIG', 'cron', 'false', 'true', d)}; then + 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 + fi + fi } pkg_postinst_${PN} () {