From patchwork Thu Nov 14 17:26:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1194999 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::539; helo=mail-ed1-x539.google.com; envelope-from=swupdate+bncbaabbv44w3xakgqebaec2qy@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="oiR0eAtO"; dkim-atps=neutral Received: from mail-ed1-x539.google.com (mail-ed1-x539.google.com [IPv6:2a00:1450:4864:20::539]) (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 47DT1T5DX1z9s7T for ; Fri, 15 Nov 2019 04:26:52 +1100 (AEDT) Received: by mail-ed1-x539.google.com with SMTP id f8sf4625443edm.11 for ; Thu, 14 Nov 2019 09:26:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1573752407; cv=pass; d=google.com; s=arc-20160816; b=RdG2dFrkrpmhP23smF6Y8Z4SPUqzzdS95/dKzEqz2cEhiHMPmIvSf9xdncLlkX5qNv oTYyhQNIEDpL3WRvbvjVLJ7firfnhqIaC36LR/scJ9AhHwWIV4QvLPv+0SoDFAt1RhaE IxzfCFlVvUar13sNIlLjp1RzaIH0tTlqiIH+SU6V2WQ/9lqBJkBoeWIlLfNjlqi4fnPv PibWO+rit7bof1pYiK3SETbjYPV7jMaoe+JX69h75bsaSGPNHt0pmzAiZMib7+uiygQE lZEzr4Hei9CIyrLsRQv3maktCmvmVYph7jeBVn/qw95goZyLgwEc5FppsDPntVGfLP1t UBtg== 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=eMV/lRj8JeNjiWnJRmUoNU1HDquNicn/h2LJuVVMn8U=; b=OgEYiOe41spAKTagxBKkdmqZZfWY54URH5EZwesULeIQUQCZ6Lq7rlxaku5c0EfGKp IxJob4gn8bfvo6Cha1fMdEJLpb4pUph/MQkvm9RB8oLduLfzap8yV1cqXqTsPkgEZ2/O n6tE31xew3NmTz/GKHajXPsHHvnNBFznNDUYHJKyvNdl7qfAjy4M3N3V+c+wvSoRT71Y RpGK00kqWVlV12fK8OqKHtMIG4PaIZSJl5gb3b7yxTUrezVSLp4PTWWLiidYCl29h0zj mCBA1S/aFf3TtjrzeUcRlDpp8hwRZpcFyhNDr6S6hFtgfpaZ1qkhSkyU7x9AZbKynLZa mSAg== 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=eMV/lRj8JeNjiWnJRmUoNU1HDquNicn/h2LJuVVMn8U=; b=oiR0eAtOYMxJQ3eKHtFtxezNlDz5XJqqw0GNh125+bfXljhffePc+wpY0xc8PcO7Xh nojA4iaN7UifwRxmUGHmUtSj/sH5l9CirEP3S2BvlVN09fC3IQKlSYNDL7ZYKZsMLJ9Q +P+VQnV89Ht4nYS5WkxwYaqMi0Q5wJ1CPyDs8YXPMwJUYcLh9FO23Er3ziWR+Vcx2Qq5 q3ltVLfQqx3mED4Gb1ZW79rCwbhozglk941dY+gVVn2DlcylALcSowbX5gE593VkfCoQ iLrZlRHMo8WlVGT9MCWnrCMA58bS/kzdOdCMM8HrlZOXR2XGtXt3GXMEobJot3vAdtfO meeQ== 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=eMV/lRj8JeNjiWnJRmUoNU1HDquNicn/h2LJuVVMn8U=; b=R190cX7S5QwhFr9+xs9wQs/jI9EGQyepiTYdvfA+st/pxRz+Qj+GVBfo8dpaO/03m6 EEnfo0PompsBA/TrWEW2aHmCO8I4YfO1QDA5ihLhJNpp8wmDPzuJTRYTZxYzMYltloUj PhKP1SkloQv2XojIPr9A0wwsbPQwtqptT9V4M++1vbeMEvhN+DkuIlVYWHN0Lls+ABZ1 zbxS2HP2PtdCPVFameA/GlSH3/b3mUpiX9hIlFM3EWlqo9uvA31VXrUbEbvAp6gO1pg0 7aHWISYGSLwGptRHEZFW+C9fxv9XYAtTguwYZTlcBxYXPicVXbPj7OZY0EtvFqQgYJNK p3ng== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAUhHPFez6NEXdROkseA+HR4drbOiTVS9gENFMWS8PN2o2IBAKVH GKmoWZRO+YVr7rc6bpZeICc= X-Google-Smtp-Source: APXvYqwTvxZ96bphxSr2uog5P6dM5AdhH7FsiBNkvPqZh+IoH1lpgQOcL9ukand2KfLl+550MiLI4A== X-Received: by 2002:a17:906:8548:: with SMTP id h8mr9444712ejy.290.1573752407688; Thu, 14 Nov 2019 09:26:47 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:aa7:db0b:: with SMTP id t11ls1861176eds.1.gmail; Thu, 14 Nov 2019 09:26:47 -0800 (PST) X-Received: by 2002:a05:600c:254:: with SMTP id 20mr9479384wmj.6.1573752407206; Thu, 14 Nov 2019 09:26:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573752407; cv=none; d=google.com; s=arc-20160816; b=CXBxPSlnUeuimqxj6z9S6N8KasTS6tn7Fmcili8zT5CZA/fHoIrx6uw47m+fa6iL5M fheAFJJ/ilmIWJz+C/MTGzyyKDXa1VAUbJ06PhKzCEDb+XzeJJ/Ds2MXRxRNCsa2Dq6T FIGsaBuGtpge4ORWBzv0PAQue4Z7ij+3HcI3MqF39cAWsOom9An/gT04togjBNAcblJ9 cE1N1JsLcLGMV/Ozn5MA4/Mo1Dfu28NaLWEFiZtjFjJzAXrnyo0FRMibOkWALSNROScj lV4EX5OlTQx2NS2/fJd1ZZ4iRhT6UzxTRoajnkAjNSfWFjD690w4gZPINmb9kIIpZh1z +KQA== 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=UQvMv5Fs8T+1lv4L5ksWwk8jO9eeJl9IkOEM5X5Raew=; b=G5PyU06QiOVpauKN3w16BWIPwvZGNx3FhyZCrOWBr+PxVjiJp8w/4F8ivuQmMFmIpE yWdySUqEHvAsn6k5UlamznxEIXMpjvg+/eAyPGat+46iRLaj2Ea7UDwbJySRkty/Xqdd QOWNeWxQGzXDChmw9qfa3GPc3hlLXwGOouI8UCvZO15LFbBr81Ny36Po/TWgOX37K5LE y+GP6+R5PsHyu2wvKo0B8lchbRbHYOA6zn6Y2tcGmT38By1PFRHMzq0NzX1QRmIy52Tz rHhJFosd+V/Mp2sjCaW0wDX5ht9nB3BTnwVsboW5HTuiUreGNTjg6YmFGxkAwjf3oUk8 6gVg== 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 y140si376495wmd.0.2019.11.14.09.26.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 09:26:47 -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 xAEHQkf6002205 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 14 Nov 2019 18:26:46 +0100 Received: from dev.vm6.ccp.siemens.com ([167.87.1.77]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id xAEHQiG4009015; Thu, 14 Nov 2019 18:26:45 +0100 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id C41242353A51; Thu, 14 Nov 2019 18:26:43 +0100 (CET) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH v8 1/2] swupdate: back to init system specific packaging Date: Thu, 14 Nov 2019 18:26:37 +0100 Message-Id: <20191114172638.19875-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191114172638.19875-1-adrian.freihofer@siemens.com> References: <20191114172638.19875-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 | 52 ++++++++++++----------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 65df706..9f40881 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -16,27 +16,25 @@ 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 \ " +# tools is now an empty meta package for backward compatibility +ALLOW_EMPTY_${PN}-tools = "1" + 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 +42,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 +149,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 +177,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"