From patchwork Sun Nov 10 19:46:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1192662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43b; helo=mail-wr1-x43b.google.com; envelope-from=swupdate+bncbaabbf6suhxakgqefrduhby@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="fvQTh93L"; dkim-atps=neutral Received: from mail-wr1-x43b.google.com (mail-wr1-x43b.google.com [IPv6:2a00:1450:4864:20::43b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47B4JX1k02z9sPc for ; Mon, 11 Nov 2019 06:46:34 +1100 (AEDT) Received: by mail-wr1-x43b.google.com with SMTP id q12sf417012wrr.3 for ; Sun, 10 Nov 2019 11:46:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1573415191; cv=pass; d=google.com; s=arc-20160816; b=hUF0Gv7DEPPG5p2SPear1Jnl0XMtIDB/W1GCtllReotVl+DrjiqxLtuo8jY1V30i5o K2cqD6wT/FtTCp5L31PRE8VgKYTcV6yuc+gWKvPa/r8ftLHyoyH9A3wDpmaDpBfBFhF6 RzbBKaw77IGFOP+4fMgVcNGhlmGLuqMKVU7xPH1apenffKQMMUa/SCpwsm2T7kxuDHYv mbazhxw4hHf4v1qzQgm7vVzzps3p8veI4lmPPmL5rtwi0ORgPiRyweE5Eu0eW05ITH6n 4CNGYklqBIN+hRiTbbjXvcKgcTeT4bSFQxWmokQN8DMrMmHS75vbHcHPcV5xWzwp6h9V 1VLA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:mime-version:sender:dkim-signature; bh=7zxxyQeWyO52cuUbwVZ03w65U5373kDpsZI3nhUW28o=; b=LvrLQ8EnaVrxKlUzYxMjCPTSCuNfBZk1azkHc9WHg2rpMrhkwBlX5jdINUhVDBm23U s49fKyrKAelV/QAhrQfRruqFSMtnQHMfMVvf0Ey6rK5Rhsz/4IMjNaTxcw5uTKbF/+0b 6iHnxQW/PjT+6vf97IIJSVb92QAicpfMp6kkSw3dY1XP7oQgda1RMuVeHjoYznImpiRt mvrOwDm7dwF026gj17V6h9zC72m6I/7m5gqU/LCrlCYUwdaqn3wXBJQsQBDeTnM/qtie ia4qzZNaFC5I22qAkaeFcygM2pLNAbr7OXJmOqe458Nk/zUhc1/fMJ10vyRn7t87xZKA wqdA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=7zxxyQeWyO52cuUbwVZ03w65U5373kDpsZI3nhUW28o=; b=fvQTh93LOjxwtbb28fuX0Xb+FXfQtzQ9hB+EVg5aij+ZLWVYPWk6Il0fp8CfsuDMsW PcWDq3Z+Z03UWvsWugd/rZ0bCumsflTbkfeupdz/p9gnJNs8egLGbtHVLgWGU+Ij2Pj9 wvAJuV1jlJAZhBKGdQeBihB1VsSjVuGuAz+HbezptBAGsheodtf6vwbS4KisH+iONmMn KpHHeJAwCi/8OB37OA5Si4Xxlb5y72Xj/YmjVtqxsmAiDJM2/DVgaVXfF6e1ZMJmptIO 3Y4ukva97ZmeyOP8pWQfWHePKrW4bSRbq3+f7OwcDPjFGDIBi/xpG82H+T6LkTiE13DR dP7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=7zxxyQeWyO52cuUbwVZ03w65U5373kDpsZI3nhUW28o=; b=nB9SjAe/RKDyKIR/4fNVhPkgyHa5QciWCHNo+kMjKudpxsj/xQoh0FH/w4wJ4Oa6Pe dSp+wgUFbLCRiE5tWvXeanNWynPo6TU7mIOYfKvvSJ/uYske7QjssXXXihim1sipALWd gk9V5UJArRsGtjZ8Zu8HbBFZq9nt9Q65FJ6m/hQcjDpqgTvD6FV+QGT8oMMT0EwC+u0g YES6WvfufkfErcQUqo52B77CSYtn6KFAArgM4mZ97ZxH4goBRm+ZxCTHb0Erkmh5JEZK BdQaD2i4R/7g8BJk6fXVxILI03uT+sANGFkLIKFA4/FwYha3xuIdT9D/EiYnSFVVLJrQ 7peg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAX26ZmZW+Dpb8Zr+hHFP1uWL5c4QAPyoUvWDvjaxz/O41k3ppnw 6R1OXKgkzauiNh3cys7vQKc= X-Google-Smtp-Source: APXvYqx+kMLcFsKHoswOgPwb1Y+gm8TQ29gI/m1k/1zNjN8jqE9gyNGFuhb6GjF6iLyApLeHZS85QA== X-Received: by 2002:a1c:7519:: with SMTP id o25mr16795918wmc.70.1573415191284; Sun, 10 Nov 2019 11:46:31 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:9d8b:: with SMTP id p11ls16350287wre.7.gmail; Sun, 10 Nov 2019 11:46:30 -0800 (PST) X-Received: by 2002:a5d:6706:: with SMTP id o6mr18205940wru.54.1573415190732; Sun, 10 Nov 2019 11:46:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573415190; cv=none; d=google.com; s=arc-20160816; b=R0OZ7wWBFA4orUFXUjsKNsSWldMf8BXera4UlyHHbtn/xqF2WuOa2DHWcuZgn4BQET xmj2euj0w94Ifpg8cycFWCnOKpEj5f+oy1uwWUNp5+BUMYhSAq7SYnHscM1JR1eSsild AVW2YNhTveOd0RfAyRcStviwgpLoTCTCv0MHvIO5h9sQOMa7l8dzLIq/M+84AUKjd8bH rkdXV7DDfITgD1HrL4H8tu5oS+9yMGxMNKG0LP3NKXvLl22uQavj55YA/k9FdFvkU3xW GmmAtOyJwME/DcPkcKvzfmxXmtX+zASDp9Ui3IIr2CWsSsARmMX20mbEuAv0VNqfJxU0 ptGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=uvksVYQVdcKZCETJsJxeyB2RVsJRpk+QWuyWeCqmYB8=; b=qvt2DISmIHDvnSvGZzn3UgBR0TLopsh4/kgrL03D5Ie2yxNeARCV7182lCIKQgnEIo rHVJn/1/ne31SqjzbWSEEJE5s01h2xwcRhts/WkXn87espRLkqhGf0On+waXX2dYRGC3 OomPXMXXpcrCDuCiy1SsWy8VnK2Pyja5ar8WHUPb3ckry4XsWARtdISVN2O7kvFPrOPW BlbFkVh+OsCSI5HcvM1/xD62uvt7kpVcvuwK8AAWbtTaLSR5YtFYZOSiBbKRb34PZ6xO FlmyvFFSOC6IwNVDdM80YdVHjLFWj7Yg28ZVSaCL9QMZkQaU2cAt2MsVlX0KDOhOI1De jvpw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q128si722209wme.1.2019.11.10.11.46.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Nov 2019 11:46:30 -0800 (PST) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xAAJkUGG005157 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 10 Nov 2019 20:46:30 +0100 Received: from dev.vm6.ccp.siemens.com ([167.87.5.130]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id xAAJkTV4001705; Sun, 10 Nov 2019 20:46:29 +0100 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id E27FE2353A51; Sun, 10 Nov 2019 20:46:28 +0100 (CET) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH v6 1/2] swupdate: back to init system specific packaging Date: Sun, 10 Nov 2019 20:46:24 +0100 Message-Id: <20191110194625.32119-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191110194625.32119-1-adrian.freihofer@siemens.com> References: <20191110194625.32119-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , --- recipes-support/swupdate/swupdate.inc | 58 ++++++++++++++--------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 65df706..9745536 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -16,27 +16,22 @@ PACKAGES =+ " \ ${PN}-client \ ${PN}-lua \ ${PN}-progress \ - ${PN}-progress-sd \ - ${PN}-sd \ - ${PN}-sv \ ${PN}-tools \ ${PN}-tools-hawkbit \ ${PN}-usb \ - ${PN}-usb-sd \ ${PN}-www \ " FILES_${PN}-client = "${bindir}/swupdate-client" FILES_${PN}-lua += "${libdir}/lua/" -FILES_${PN}-progress = "${bindir}/swupdate-progress" -FILES_${PN}-progress-sd = "${systemd_system_unitdir}/swupdate-progress.service" -FILES_${PN}-sd = " \ - ${systemd_system_unitdir}/swupdate.socket \ - ${systemd_system_unitdir}/swupdate.service \ +FILES_${PN}-progress = " \ + ${bindir}/swupdate-progress \ + ${systemd_system_unitdir}/swupdate-progress.service \ +" +FILES_${PN}-usb = " \ + ${sysconfdir}/udev/rules.d/swupdate-usb.rules \ + ${systemd_system_unitdir}/swupdate-usb@.service \ " -FILES_${PN}-sv = "${sysconfdir}/init.d/*" -FILES_${PN}-usb = "${sysconfdir}/udev/rules.d/swupdate-usb.rules" -FILES_${PN}-usb-sd = "${systemd_system_unitdir}/swupdate-usb@.service" FILES_${PN}-tools-hawkbit = " \ ${bindir}/swupdate-hawkbitcfg \ ${bindir}/swupdate-sendtohawkbit \ @@ -44,15 +39,16 @@ FILES_${PN}-tools-hawkbit = " \ FILES_${PN} += " \ ${libdir}/tmpfiles.d \ ${libdir}/swupdate/* \ + ${systemd_system_unitdir}/swupdate.socket \ + ${systemd_system_unitdir}/swupdate.service \ + ${sysconfdir}/init.d/* \ " FILES_${PN}-www = " \ ${libdir}/swupdate/conf.d/*mongoose* \ /www/* \ " -RDEPENDS_${PN}-progress += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'swupdate-progress-sd', '', d)}" -RDEPENDS_${PN}-usb += "${PN}-client ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'swupdate-usb-sd', '', d)}" -RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'swupdate-sd', 'swupdate-sv', d)}" +RDEPENDS_${PN}-usb += "${PN}-client" # The tools package is deprecated, it is an empty meta package for backward compatibility RDEPENDS_${PN}-tools += "${PN}-client ${PN}-progress ${PN}-tools-hawkbit ${PN}-usb" @@ -150,14 +146,14 @@ python () { } do_configure () { - # Always install systemd support and the swupdate.sh shell wrapper. - # This allows to build swupdate packages init manager agnostic and splitt the file to separate packages. - #grep -v 'CONFIG_SYSTEMD' ${WORKDIR}/defconfig > ${S}/.config - #echo "# Global settings from swupdate recipe" >> ${S}/.config - #echo "CONFIG_SYSTEMD=y" >> ${S}/.config - #echo "CONFIG_SYSTEMD_SYSTEM_UNITDIR=\"${systemd_system_unitdir}\"" >> ${S}/.config - - cp ${WORKDIR}/defconfig ${S}/.config + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + grep -v 'CONFIG_SYSTEMD' ${WORKDIR}/defconfig > ${S}/.config + echo "# Global settings from swupdate recipe" >> ${S}/.config + echo "CONFIG_SYSTEMD=y" >> ${S}/.config + echo "CONFIG_SYSTEMD_SYSTEM_UNITDIR=\"${systemd_system_unitdir}\"" >> ${S}/.config + else + cp ${WORKDIR}/defconfig ${S}/.config + fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure } @@ -185,15 +181,7 @@ do_install () { INITSCRIPT_NAME = "swupdate" INITSCRIPT_PARAMS = "defaults 70" -SYSTEMD_PACKAGES_append = " ${PN}-sd ${PN}-progress-sd ${PN}-usb-sd" -SYSTEMD_SERVICE_${PN}-sd = "swupdate.service" -SYSTEMD_SERVICE_${PN}-progress-sd = "swupdate-progress.service" -SYSTEMD_SERVICE_${PN}-usb-sd = "swupdate-usb@.service" - -# Prevents the systemd.bbclass from deleting scripts or service files. -rm_systemd_unitdir () { - return 0 -} -rm_sysvinit_initddir () { - return 0 -} +SYSTEMD_PACKAGES = "${PN} ${PN}-progress ${PN}-usb" +SYSTEMD_SERVICE_${PN} = "swupdate.service" +SYSTEMD_SERVICE_${PN}-progress = "swupdate-progress.service" +SYSTEMD_SERVICE_${PN}-usb = "swupdate-usb@.service"