From patchwork Wed Nov 13 16:51:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1194394 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::139; helo=mail-lf1-x139.google.com; envelope-from=swupdate+bncbaabbgxjwdxakgqebcul7rq@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="Bc2KU7qh"; dkim-atps=neutral Received: from mail-lf1-x139.google.com (mail-lf1-x139.google.com [IPv6:2a00:1450:4864:20::139]) (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 47CrHN5yQ0z9sPk for ; Thu, 14 Nov 2019 03:51:43 +1100 (AEDT) Received: by mail-lf1-x139.google.com with SMTP id t6sf917806lfd.13 for ; Wed, 13 Nov 2019 08:51:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1573663899; cv=pass; d=google.com; s=arc-20160816; b=h3H8dosAQAg+Js8qVphAOwWcAuxzWrNkYZ0e4GM08FjnpU9i5z8xJURbos7iSnJVw3 35xy5xe7a9Hu1iZjEz6FSFGd/MwSVV+59qJLj+CuluFGy0MB7zCMp/+rp+P6d1uRJKoJ nIj7fHTca283TpyKsnINg4Ka4xWV+VtFPUQZ78xwOWMOTnvCMXYcj/DdR2HigJEkFrk9 TsvxWLeqhCHS/GSXNXZPxPXj7EpUNPRPdZ8oLyoqEmER57cxFqKSbcpm4gWhfgdLbea0 bXySQqP7nGOpU1RMDAe9uq4amXO+vFIk7qwGXy+fOmY/ebCSeWbdcz29Gpj7wxDkCGPD rrLA== 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=G/yo1pdI5Ufd0ehoatqNK2lPwF4jWZRzU42aAlSMngk=; b=HCHicI/O6L59lypYecD22mLfm1bJTv0W/Y6a19CzVWBOICVKVxoSb6rfeG+ILT+gel hHJc8uvpynFQz6veWshWRc3L8fxJdqTcDqkpF65brrd6vg1N2fdlMRS+jCnhsQMSHXXY HRBtffZGTnAdpG+r6nqgl4DHKyZZYBiZ9dr4Ub/6OtNUBiEgTmFXUgMzMa0czbZdTpgt o8SVsWqsOFfTR8u2uPqXKN60iV8FLGxSCOTASEkMDOsaaIqaaFbW5R8J/XEY6CrcKznl BOr2TLQil8UAn9lkNVZzAadu5vSo94xTItMgNNTpmbD5UDiKux8HE6AB9kLPopIfTcfv 7ehA== 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=G/yo1pdI5Ufd0ehoatqNK2lPwF4jWZRzU42aAlSMngk=; b=Bc2KU7qhKu00006i1CaB9eCiwNO9zQQYMe588NkDxnPRlFsNha+HK88LTGYhZFy0yQ 9b4PqBB52IJaZ/UrGxFZSC0q4YNI291QtsCzC+WfB7SuZLkKsWPj7AWJ0JPK7/ygOnmJ C+mqJa9VrbTPHnpgDrN6vQU4l1YY2KK5jg1AA+QR8D66dVQZio1P1MyAJm28Rlg9GgdM HUACVmnqFiB6nPhH+ncTbj6mtHAx9rs7vJRrABaDb23i6a3wiKHRs0MMtNSsGFW/Z8VH BymEMR4ex5STltoUaQ3T7RqowH5CefCy+zXijAFDoq8kYHf/2AQvh14JC07NXo58SXFh A/1w== 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=G/yo1pdI5Ufd0ehoatqNK2lPwF4jWZRzU42aAlSMngk=; b=e1ecnUF79Pu6yl/tADr4eRPZXpdcifFxfqmyPStFBEwcTJ0Uy7K3XCAnfLv27bKm3M 1TO83iVal0uY1DdbyvD9oB10BkSealGl8qVyZQaB0zDUrztFtBXNbNL3opgt69jDh9sl /R3G7d6Sh6fllhpG+G6bsQywRTJtRY8MSJGg1mqbSC2jrK+S4zvGr9LY6sw13PBMRxcB uaMfoQWnFyc5U60hSDMab5jKh6lNbB/CXtnh9d9HwA5J3uU0Nn/HnbQZhUgDBPjc4IDa xwf0yFyuyIbrKv5BwBQMjJgfvjtoohroiXPCVE9tfzkfgnsfb/ADD2TzbSeyFZn5S13g ezqg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAVPqPJ1sQMT/pJFP/orhKJXCc7uSW1zBjmYmyywMz74wmTHxTAi tEYn65y4XHbqsCMsLJdPkB0= X-Google-Smtp-Source: APXvYqwUpgldgsxhi80QTA99Qg51MeWfLARfv7Pp071Rnb2D7mu6Yh/nYyiItm46F3oou77VM198/Q== X-Received: by 2002:ac2:5216:: with SMTP id a22mr3419987lfl.169.1573663898800; Wed, 13 Nov 2019 08:51:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:b161:: with SMTP id a1ls505367ljm.15.gmail; Wed, 13 Nov 2019 08:51:38 -0800 (PST) X-Received: by 2002:a05:651c:1196:: with SMTP id w22mr3391790ljo.217.1573663898190; Wed, 13 Nov 2019 08:51:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573663898; cv=none; d=google.com; s=arc-20160816; b=cBaXV9mf7TZraHpXJz4QrDXrTFPCeMJvviEmFTcywDqfdoNwtefl2O986pqWOnPmqU o1vjtem4HaIw9cxcnxMNu3njiKlw2akDbBk51cN2W/HTBB16Vk5DF6Wa0RpY6pxo8vCP cfh78kMCe71Q9tiM9sBYZ3jtFQlY4jM5ABDhiwxrcSJIpE8OKYL1fWf8bYujX8WJYnek Y98ayrquVqEEGY+GWXt7aIWGan3pV/6zBC9NBkE6GmAQUQodRHeRvdrHORFw0+j39mBG m2b33Tmu/MTHmxiCUgpPxciwz/bRks7wFDSxiHVD6JNQyfMmFirewIdUWVNYYxdFtbu1 TkKA== 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=8F4Ybw5j1JNHsLfWPC3oYJBaI3pFrPh52WId/ugXJmI=; b=ItevpAv9OKn7AastboUte7BhWAtJmBZWeA+ckyfU5HM7JvF8LtPRZbQRNEsx+YQkby MOIRN0faVCpTon89uZ61Del2jIaQknh7KAwCG77j9GT/9Q0XBPZci4bm7N5Zrs42bNds st5/IlDsADoKKf/k5DOVyS/tY3lABZBGOld3zLkn7qWafiWw2NKCWXd1RsnQ+bOGBQLy kUxvlcJr9dH/ZIrjkpAr5vDAMIW4fFz/OLWNig90MgPOtgY3BjKQe+ivFsbAEOyrNZHr PVSzNAJX3XuaLlpPzPndc7k0Eh/lH3fqgpwGCjIBWO78XYnwBHEKMSeXbM27SKfl5+HN FxZg== 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 f1si88372ljg.2.2019.11.13.08.51.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2019 08:51:38 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xADGpbLA000601 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Nov 2019 17:51:37 +0100 Received: from dev.vm6.ccp.siemens.com (md1w1dqc.ad001.siemens.net [139.16.116.76]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id xADGpaBv009133; Wed, 13 Nov 2019 17:51:36 +0100 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 0EBDA2353A51; Wed, 13 Nov 2019 17:51:36 +0100 (CET) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH v7 1/2] swupdate: back to init system specific packaging Date: Wed, 13 Nov 2019 17:51:32 +0100 Message-Id: <20191113165133.16998-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191113165133.16998-1-adrian.freihofer@siemens.com> References: <20191113165133.16998-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: , Splitting the init scripts and service files into separate packages does not work. There are other build dependencies on systemd even if a DISTRO with sysv init system is built. Signed-off-by: Adrian Freihofer --- recipes-support/swupdate/swupdate.inc | 49 +++++++++++------------------------ 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 65df706..ad18ed2 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,13 +146,6 @@ 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 merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure @@ -185,15 +174,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"