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" From patchwork Sun Nov 10 19:46:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1192661 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::53d; helo=mail-ed1-x53d.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="Sh48DfBG"; dkim-atps=neutral Received: from mail-ed1-x53d.google.com (mail-ed1-x53d.google.com [IPv6:2a00:1450:4864:20::53d]) (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 47B4JX3GWJz9sPk for ; Mon, 11 Nov 2019 06:46:34 +1100 (AEDT) Received: by mail-ed1-x53d.google.com with SMTP id v4sf8637658edq.22 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=gq3Wixq3Nrvw7z3fy9I4e10s1dsFLSjThdwlv1wolYY+IpajVeEdtZzLC5D8RnHmbV cH51XAGKUNsvdgdUZ5yrzSoXz7mZ2A88jiwE/tGyhT0q9jo8kCpt1Xfz5+EfTFJkyhLo 4FCUSFY3M1O++DfP76twVokluyZCKNoFgRa2caDgFaj7w++7NGign6rP1r4RXRC2PaUi AMTOkpluFuOdIvyugdx7O2ieJPANQKHZeqEW0JH1gfK7hHNF4BNoNW6Cw4QLcW1RlrdV Hsr49qIYM9gQHV9rgdC9OLvrehD9zKJaLpZKLdIB28J7FNxlfF132yV3hg1FO0YvKo4V 24nw== 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=kNIlq+uja/Ck+gvDzFrnymD398n5ScR6KtloxzIJG4A=; b=BZ+N3caOSEv0nUKge8br/5kPDbI+oPz+7puvXtpwL3OS5c1RSXdU+BYMFxB7nQP8Td LZbUK7yxJt3spv5AX32PIYbZ6X59U5Oze/REm2hZNKmH4cOl/w602ILxZ0VeG5FSK8AE jdTmIlADt/ZdhaZhdswNf9r7k0QKiMVf9xsD70C3bMIePHGkQ3SGf7LxHpqgib3wgJkj dXH71ycgwkKZPLl2+vtHorgl+p6hkxS/uVKgM4m+5F8UT84/Z8Nl+5aHX8WyWMM0DV9s EwgwHtov1F8rQFPSPz/bVR7ToFFcUa+kThiIVR7NB/ahCrMjkeNo0OJroC1VUj3S7pk4 xM5A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 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=kNIlq+uja/Ck+gvDzFrnymD398n5ScR6KtloxzIJG4A=; b=Sh48DfBGZtjjTJMHKEgj4Xt75RbnrFhxP6nJC4wMvoqdtRETAFdtMbHJDJ5ikd6+PM D4iUfg6dMNFRtdvHf4az4FuFeXEY7s0mLZbX4XN1aNZKC1mkkecxf6Ir58qEil5VzjO5 XjLM1cv9PBbonJ/I8fKIstRs0Glc5pHd7B/FNWJR0LYRd+RauIfOhm4AqjC6P/IHH0wG 29bm4rUIe6bfepBehtmgxClk8IR6khdiUXnBMpCd8rQBdhR1XXRmKCcsLLhF+7MvLrxC ZbBT/DNhJ+12DWX9VbZrSzRfGbAH2COwgjntqBxFIkdr92n5zXwWv2jwanTum+1Y0Kgt nT7w== 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=kNIlq+uja/Ck+gvDzFrnymD398n5ScR6KtloxzIJG4A=; b=eLt9e3GcLQzFo7emNFYLMlPtvWW7YLRHUP7DlJWpwk//SdKhb6UPzkq630h/3cs5Of RPZB1+HIgHM/gSwYG8CEjjI/O5cSOIzj0uFvZEtNvTUtjIynSNA6ffGL+8XQpO4LyuQi yZG2HLcv8MOfwta4i7AccYSU3Opwmx3gZ/EekMj7BjQqexInF/vy2DOcoTJ6zoe+GPEy 1BXGE4iyeTQZ3/nHCyBcIa/WWoiqU1woyorJcbz2K9OzaRC09tO6QDj3y/hds/GCFMH+ Xwt63+EzhT27gUnL20+dj34rTfYxwLJkrlHjIcJp3Ip/hd6k3w7olQlGztXvERPBLY5y SJ8Q== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAXIZSgUvbphNSX4KjYD0o/SqTMIjGr3FtqArjnu9losOvgzME9F 6DVebfnUu+FrPv3cbRilK7Y= X-Google-Smtp-Source: APXvYqzkv06H0DL3vgMNt5YGYplB1+/+mGNbfiv03yd0o6UbWseHP06tMAF5914nDMhBlc29WAadFw== X-Received: by 2002:a17:906:2786:: with SMTP id j6mr19104651ejc.206.1573415191492; Sun, 10 Nov 2019 11:46:31 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a50:ef07:: with SMTP id m7ls1581620eds.12.gmail; Sun, 10 Nov 2019 11:46:31 -0800 (PST) X-Received: by 2002:aa7:c894:: with SMTP id p20mr23094093eds.145.1573415191017; Sun, 10 Nov 2019 11:46:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573415191; cv=none; d=google.com; s=arc-20160816; b=RzNNOLuIvahE9BTItS8KzdrSWS2L1VNUhQEXqUYqmVqssJ461KszsXHsm4DY1Kiie2 pViewwAWyPhRssxMvKuEhPBn7BOECwPdvGw4XPos5Xy2d0XYEM644FIslVlKWxCMtKIN jjKUJnO/I5MnOFCLfIG1Ru03fvNN50yiIPKPqqlnQOE+YRX2EFhx+uvbGTz+tM39M391 YWTNeUAG3Buqfgp3FDRufhE1H2DNXbXMPiMxyk39zZcoKNnO4pw1dzUV1Q3/IYRvvXjm q3JuviuoV2C3LItx9kwLi3lWwSx7N8epvWTYy9BkbMdQrv6kO3aLnWdG5Rwd+fTv9M4q 0xug== 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=3QbNklxSCBiWcftpvo5dIRaF/phRNdR0FbLSv2BIgdU=; b=DAq5PQA8RENHVNU+TKMdD0L7px5tqAikWnSQ0Vw9lA7pJGrek0wBxjdVPwqEMTf/Ge WIAY360hFhRBHXAngzWc25gu0QTFqBKMRTLC1jIQ4L7xR7Ab6UObsnHU0E3z3EBwXXur DZKllrzcRbWBrGuUohRa8ofUfU249cfV1lkCaLesUfWEiGOLHX5Sh1jLkytQ7RMNXJwx 8O3jnXgNCCldguJU4QPp9RI2f/P+5ert9RI0iMHKevAItFAzNu7ec9zO8QUjExO7sV+t vUvAfVSqPyQNZIlTKu/i5aiRItF/eeKyP8bSP9y1umnoR4NvPG03L/EUw+yCwzwKNtqJ BViA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y21si1051825ejp.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:31 -0800 (PST) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id xAAJkUVt032051 (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 xAAJkTbX001709; 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 EDEB62353A53; 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 2/2] swupdate-rescue: add separate package Date: Sun, 10 Nov 2019 20:46:25 +0100 Message-Id: <20191110194625.32119-3-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.14 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: , --- .../swupdate/{swupdate => files}/swupdate | 0 recipes-support/swupdate/swupdate-rescue/defconfig | 100 +++++++++++++++++++++ recipes-support/swupdate/swupdate-rescue_git.bb | 28 ++++++ recipes-support/swupdate/swupdate_git.bb | 2 + 4 files changed, 130 insertions(+) rename recipes-support/swupdate/{swupdate => files}/swupdate (100%) create mode 100644 recipes-support/swupdate/swupdate-rescue/defconfig create mode 100644 recipes-support/swupdate/swupdate-rescue_git.bb diff --git a/recipes-support/swupdate/swupdate/swupdate b/recipes-support/swupdate/files/swupdate similarity index 100% rename from recipes-support/swupdate/swupdate/swupdate rename to recipes-support/swupdate/files/swupdate diff --git a/recipes-support/swupdate/swupdate-rescue/defconfig b/recipes-support/swupdate/swupdate-rescue/defconfig new file mode 100644 index 0000000..0416d48 --- /dev/null +++ b/recipes-support/swupdate/swupdate-rescue/defconfig @@ -0,0 +1,100 @@ +# +# Automatically generated file; DO NOT EDIT. +# Swupdate Configuration +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Swupdate Settings +# + +# +# General Configuration +# +CONFIG_SCRIPTS=y +CONFIG_HW_COMPATIBILITY=y +CONFIG_HW_COMPATIBILITY_FILE="/etc/hwrevision" +CONFIG_SW_VERSIONS_FILE="/etc/sw-versions" +CONFIG_MTD=y +CONFIG_LUA=y +CONFIG_LUAPKG="lua" +# CONFIG_FEATURE_SYSLOG is not set + +# +# Build Options +# +CONFIG_CROSS_COMPILE="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_WERROR is not set +# CONFIG_NOCLEANUP is not set +# CONFIG_BOOTLOADER is not set +CONFIG_UBOOT=y +CONFIG_UBOOT_NEWAPI=y +CONFIG_UBOOT_DEFAULTENV="/etc/u-boot-initial-env" +# CONFIG_BOOTLOADER_NONE is not set +# CONFIG_BOOTLOADER_GRUB is not set +CONFIG_UBOOT_FWENV="/etc/fw_env.config" +# CONFIG_DOWNLOAD is not set +# CONFIG_HASH_VERIFY is not set +# CONFIG_SIGNED_IMAGES is not set +# CONFIG_ENCRYPTED_IMAGES is not set +# CONFIG_SURICATTA is not set + +# +# Suricatta +# + +# +# Server +# +# CONFIG_SURICATTA_HAWKBIT is not set +CONFIG_SURICATTA_SERVER_NONE=y +CONFIG_WEBSERVER=y + +# +# Webserver Features +# +CONFIG_MONGOOSE=y + +# +# Mongoose Feature +# +CONFIG_MONGOOSELUA=y +CONFIG_MONGOOSEIPV6=y +CONFIG_MONGOOSESSL=y + +# +# Archival Features +# +CONFIG_GUNZIP=y + +# +# Parser Features +# +CONFIG_LIBCONFIG=y +CONFIG_PARSERROOT="" +# CONFIG_JSON is not set +# CONFIG_LUAEXTERNAL is not set +# CONFIG_SETSWDESCRIPTION is not set + +# +# Image Handlers +# +# CONFIG_UBIVOL is not set +CONFIG_CFI=y +# CONFIG_CFIHAMMING1 is not set +CONFIG_RAW=y +CONFIG_LUASCRIPTHANDLER=y +CONFIG_SHELLSCRIPTHANDLER=y +# CONFIG_HANDLER_IN_LUA is not set +# CONFIG_ARCHIVE is not set +# CONFIG_REMOTE_HANDLER is not set +# CONFIG_BOOTLOADERHANDLER is not set diff --git a/recipes-support/swupdate/swupdate-rescue_git.bb b/recipes-support/swupdate/swupdate-rescue_git.bb new file mode 100644 index 0000000..c68d127 --- /dev/null +++ b/recipes-support/swupdate/swupdate-rescue_git.bb @@ -0,0 +1,28 @@ +# This recipe is intended for a special use case. There are devices which have +# a large data partition for the main software and a small one for a rescue +# software. The main system runs with systemd, the rescue system runs with sysv +# init. In this case, swupdate may be installed into the main system and +# swupdate-rescue in the rescue image. + +require swupdate.inc + +DEFAULT_PREFERENCE = "-1" + +SRCREV ?= "045a618a725d0a2fce64161f10101c0004ac5d85" +PV = "2019.04+git${SRCPV}" + + +# Prevents the systemd.bbclass from deleting scripts or service files. +rm_sysvinit_initddir () { + return 0 +} + +do_configure () { + cp ${WORKDIR}/defconfig ${S}/.config + merge_config.sh -m .config ${@" ".join(find_cfgs(d))} + cml1_do_configure +} + +SYSTEMD_PACKAGES = "" + +RCONFLICTS_${PN} += "swupdate" diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 8eef04e..cf9df90 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -8,3 +8,5 @@ PV = "2019.04+git${SRCPV}" SYSTEMD_SERVICE_${PN} += " \ swupdate.socket \ " + +RCONFLICTS_${PN} += "swupdate-rescue"