From patchwork Mon Apr 16 10:15:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Buzarra X-Patchwork-Id: 898555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4001:c06::23e; helo=mail-io0-x23e.google.com; envelope-from=swupdate+bncbdmml4vsximbbxhp2hlakgqeuhh6uoi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=digi.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="MeGeU7al"; dkim-atps=neutral Received: from mail-io0-x23e.google.com (mail-io0-x23e.google.com [IPv6:2607:f8b0:4001:c06::23e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40PkmZ6mlhz9s1l for ; Mon, 16 Apr 2018 20:15:58 +1000 (AEST) Received: by mail-io0-x23e.google.com with SMTP id r8sf315222ioa.20 for ; Mon, 16 Apr 2018 03:15:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1523873756; cv=pass; d=google.com; s=arc-20160816; b=L/qosGZTgTAQDqzklFFJ2avZhTAFKudLeJVWJkmsuzCXL9pWB7Et+9f3tFy5vmwsOY brPkQU6IXRKXbEaLeX8CqwPudnftgTMSORnjTjKKXuUelhdhHWDxqFXH4GYh9BVo3OaF dwOT258tL25cuNWvkbeHD/xyNpE/O8AZsJivH4B7APXDZLb/Jcf6K4WPOGWmQBC5XcRB QHPrYYpnfo5BZ+dc90D/G72Z7IBSPhCyyni6d1JI1tvI1JInc++BOU5NjlWj04p/XCPh 3bP1d0+vfsMvegLFWVX4ML7m86imvO7m4AsMaEqFNgmzlLhFZx0uRmsauou0MmrGJzTL JkNA== 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:mime-version:message-id:date :subject:to:from:arc-authentication-results:arc-message-signature :sender:dkim-signature:arc-authentication-results; bh=v3oZCLMCs+ssi8mwMW08m5lhyUN1QISI9B0rcsrkCF8=; b=bDwRYhzc9xmLphFJNexXnCOIar8JzcB7nMlFLouH+2zIqGYp/iSSgV1cTglFqb6EX9 TgM9eQIUzR3QGLuiwLNk6M7hEaC+PEdUiHclbSix/Voa7OyKMfTju6f8uIH/zIfGBn9W GUOlkwkAoy9NndKW/fw864DFcLBJXrSm5i8WXbTcTGXaRIGWKOSXtmM30P7JCh7Iexzb Pw7xrFXrp4N9+UmEk0cszEa22ulVAHjpElbHcWj5eIhbtFFIo+63t7zL5LFqmbF3BKZd fNQy/2XrvyeeeXOleGZ/QafKfV5rl8wQ5sGxJ9LoZ6ISI0c/CtPUP5Hd0VPnw+XhRoyM WvDA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.243.209 as permitted sender) smtp.mailfrom=Arturo.Buzarra@digi.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=v3oZCLMCs+ssi8mwMW08m5lhyUN1QISI9B0rcsrkCF8=; b=MeGeU7alYTNShXN1WEnqDJFEgFezbD3ltl2L3g3pklmQ/HitG+zHbMuaXbRxRwHqMp 50hEbg2HCrKWIgbtpDN1H4vT4KRW0KJCFrfPGIDX5MW/6PeMV3tQlwl5P2RAw9uJ8DQ3 qqp50RVW90oGQNpKZQ3itB8I+puV1bGRdgR+BwKB+ScAVXxyFWyZWW5UOqPMAy8W6+re TG66bjDm2VpZPzKXhuFyT54Ol5OStQIXDqXOzm7dOWKLeLIXi69rq/WhMHB999hu6tsD /3aqmqmDSaNJlA5FopNk8LH3FgbMcr6SXSBXeBpCEEVrMxotx4EzlZDe+41QoA+a9JuG aE9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :mime-version: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=v3oZCLMCs+ssi8mwMW08m5lhyUN1QISI9B0rcsrkCF8=; b=oZCXZSAHHE8DxI3kOOWOQRQJov14nd8heNvmWCkEVc7XwvCj+3C9n/DgKRk/Jm0Mbj cAhK/Qd/jEVI98LOs/VzBC2cEbNtGamyZDvUPmSgLCz62PMTSO5YOzZ4G7jqeLY4Iwqr 1d6efTiX9oecc/ZAnet9FNM4mAhjMuZ2gXmndDAgbh6AGxtEkufZIOUIo8jDIujkjzI9 5NBhuOKrZKsy2ZI7tSrd7ozv5o8BxeDZPas01P1/a52mACWUWemt1YO2w2dxJj1wPUat 45CUfToV+Wd0WvKUxvV29/dCTETZQHec+w6yLnOAq94jnHzIbH21Ts59Gvc3LPZMfcKj xS2Q== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tDKzmUUjyiUJg7W45yDl2BD/aCvi7ue7gYhCLSntpxQrk6HcIsv +aD8ru8ofiITCjbIN4q88bg= X-Google-Smtp-Source: AIpwx4/phjEcQ0bATzWFiwpv7GVhz4dcsGbCHKuajUPmMttEecXK0oS1ov/i5nIDVbloNjrhrWw7Nw== X-Received: by 2002:a24:1b45:: with SMTP id 66-v6mr125164its.6.1523873756260; Mon, 16 Apr 2018 03:15:56 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 10.107.53.223 with SMTP id k92ls2228507ioo.8.gmail; Mon, 16 Apr 2018 03:15:55 -0700 (PDT) X-Received: by 10.107.37.206 with SMTP id l197mr4792231iol.79.1523873755834; Mon, 16 Apr 2018 03:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523873755; cv=none; d=google.com; s=arc-20160816; b=Oqv839NVuFgJPn4M4R2dfTJgDGqcV5zSu0UT0ebjnLoc461AL8ln1a9yYrxLGisV8k QGIHjRGjXFbjhjcqIh6z241qwFULGEqXfcsc2QFCHdnmc2ZtVrXWzpLRv3bomtKwN580 1s88tRWO2Qoir/2IP39o6jYND4J7PR5Y82P2TL29DcbfdpeBJpYXsPUJMht3Mc58Tm8z 1qKP8JIXNe87YPlAmCgfyxRl3J8kE5+ut48mr2ApSnoP6aSCxWac9f/Kmx8macUyltGc c95gSlLI/JUkEX/FxbxKe9UHNPTiZ53y+RHTRXI+bH6jrB0hO9fb3tnRYOa4/zLLhtjb 2e7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:to:from :arc-authentication-results; bh=EB3FqcM+qUOTWjLrRg6j8g7GqPOAY6Il++vtXxA3kb8=; b=gKPsXOqEHmBsvj8szcVmNdaozgDUVD/BN1JBXRTgS36PGhxUYpwoqseB4MTHywrFWZ MhB9D0EMVJ2Xfd5L+bY3PinFimbyP8BsXBpeh6hzhT2f26/0gQWHzO85M8uo6BdEbs+a wowFM+qxuC0/Q72zw0smK7lwFuEDhgJaIyxKx2Aou/3BWIsUCuNVuzBMfumrfwjzsaaD E/YwevkZ5kJzLScXkekqXnD1VA/IoOliUV6h029Yvu4AAu+Sc9gfuc8TKWUApr0WiQXo uMge1fYRy6pIU3HVNLuEjCy8H3SYOsHspZHf6pUkPF9IzpAI1sxnbLCCQ5LP9NXZhlKL gMEA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.243.209 as permitted sender) smtp.mailfrom=Arturo.Buzarra@digi.com Received: from mail1.bemta8.messagelabs.com (mail1.bemta8.messagelabs.com. [216.82.243.209]) by gmr-mx.google.com with ESMTPS id e132-v6si914840ite.4.2018.04.16.03.15.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 03:15:55 -0700 (PDT) Received-SPF: pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.243.209 as permitted sender) client-ip=216.82.243.209; Received: from [216.82.241.132] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-17.bemta-8.messagelabs.com id D8/08-05522-BD774DA5; Mon, 16 Apr 2018 10:15:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsXi5LtOQPd2+ZU og7adzBbTd/5gdWD02DPxJFsAYxRrZl5SfkUCa8a3x2IFC/kqZrddZ25gvM/TxcjFISSwilHi 4Nl/rBDORkaJzsY9zF2MnBxsAnoS377MArNFBOQljk6fwgZiCwtYShw7vo8JxGYRUJV48O4am M0rYC3R9f0kC4gtAVT/bPo8doi4oMTJmU/A4swCEhIHX7wAmskBtExF4vkTW4hyBYlr7xezT2 DkmYWkYxaSjgWMTKsYNYpTi8pSi3QNzfWSijLTM0pyEzNzdA0NLPRyU4uLE9NTcxKTivWS83M 3MQKDpJ6BgXEH44aPkYcYJTmYlER5RcKuRAnxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4GUBBp2Q YFFqempFWmYOMFxh0hIcPEoivD1lQGne4oLE3OLMdIjUKUZFKXFea5A+AZBERmkeXBssRi4xy koJ8zIyMDAI8RSkFuVmlqDKv2IU52BUEua9BjKeJzOvBG76K6DFTECLrxmDLS5JREhJNTDKcD 0Qsts/WaVInDPox/x1FZM9Gvi/y3Eqn1p949q/S1Hzgy2dbjZPTvBduLJ4vfV3U4N/OxS2RT2 VVSkVCkx6VZK1sY2xyfV7bo/ijG1OrNM1Eo6cvzbfYOGR6w2tu3PqF99YGcVfsblys1TW0qM/ DqyffHqbsVVc5xrZ17fmV//ZZTVh/fszSizFGYmGWsxFxYkAeG8ExYwCAAA= X-Env-Sender: Arturo.Buzarra@digi.com X-Msg-Ref: server-13.tower-45.messagelabs.com!1523873754!73774776!1 X-Originating-IP: [66.77.174.16] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.9.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28202 invoked from network); 16 Apr 2018 10:15:55 -0000 Received: from owa.digi.com (HELO MCL-VMS-XCH01.digi.com) (66.77.174.16) by server-13.tower-45.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Apr 2018 10:15:55 -0000 Received: from DOR-SMS-XCH01.digi.com (10.49.8.99) by MCL-VMS-XCH01.digi.com (10.5.8.49) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 16 Apr 2018 05:15:54 -0500 Received: from LOG-CLN-ABUZARRA2.digi.com (10.101.2.112) by dor-sms-xch01.digi.com (10.49.8.99) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 16 Apr 2018 12:15:51 +0200 From: Arturo Buzarra To: Subject: [swupdate] [PATCH] swupdate: fix build for non-git versions Date: Mon, 16 Apr 2018 12:15:29 +0200 Message-ID: <20180416101529.6957-1-arturo.buzarra@digi.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-Originating-IP: [10.101.2.112] X-Original-Sender: Arturo.Buzarra@digi.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.243.209 as permitted sender) smtp.mailfrom=Arturo.Buzarra@digi.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: , After the commit 9cc528711ad38ba2fee06746b7dd80260d9767ce the build is broken for non-git versions. Signed-off-by: Arturo Buzarra Acked-by: Stefano Babic --- recipes-support/swupdate/swupdate.inc | 6 ------ recipes-support/swupdate/swupdate_git.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 031e433..27dcf86 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -123,12 +123,6 @@ do_install () { install -d ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/swupdate.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ - fi } INITSCRIPT_NAME = "swupdate" diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 4a9131f..0ddd418 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -15,3 +15,12 @@ do_compile_append() { oe_runmake unset LDFLAGS } + +do_install_append () { + install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ + fi +}