From patchwork Mon Apr 16 09:50:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Buzarra X-Patchwork-Id: 898551 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:c0b::237; helo=mail-it0-x237.google.com; envelope-from=swupdate+bncbdmml4vsximbb7pd2hlakgqe4nzlpzq@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="Cg2Guzb5"; dkim-atps=neutral Received: from mail-it0-x237.google.com (mail-it0-x237.google.com [IPv6:2607:f8b0:4001:c0b::237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40PkCj2FWRz9s0t for ; Mon, 16 Apr 2018 19:50:57 +1000 (AEST) Received: by mail-it0-x237.google.com with SMTP id e22-v6sf8698755ita.0 for ; Mon, 16 Apr 2018 02:50:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1523872253; cv=pass; d=google.com; s=arc-20160816; b=rKo72OI705XHMPN7pwLGBzVoAZIx/V8TuU9kSPtNLoGdVD4KX64E45fh9PwRjvUfyQ qHBeXyH3aDvgwwz8wq9qPmcTVRBdj5bKv1Io1M4/M9b6lHcUnmef/Zff4xfMRhdRi7sl lBjfjZ+qVxIOmTssST/Xnim0ovL3a+xs/vn6jrUjaokD84Ts7RgC/IsTFnbmMifGph9Z 0QMnuOxH9f+PwFWeM4rUzs+WhvUmbAu6qpSWWXNjYCpZaez3URbWPxi/VuNFZR7WFiun dJqdVgOzMgV49wU0i/32fLyUQMGJfvh9BYThMKNdygtqp+beCSeb4ljhy5Zbz63KnWAm H2qw== 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:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :to:from:arc-authentication-results:arc-message-signature:sender :dkim-signature:arc-authentication-results; bh=UEDGYR3J8p5eoDqSR420ai1xFTY2IXyeSIako/NuT/w=; b=vD1PdJJ2U7emUF+t1+MBrl50McVZgTzcFuGmH1dUSOwAAV2KQaTz2cB+Un1O9R+5hv owWYZDI3awplaDrmW9pAvZXOj29K+SknhIsq3OavP3hI+i475HEL7XbizukYFuEW8ywR +HWQV1sZB2jR/fd58VmTsgK/byPQGvDv8YPr+d9UoW75v7Sgn0LJXvMhLV3lElRET3RX nZIL9dtZWbi+ySx8y0MCXXq71qA6zbNKqayluEy/aOPu1y6KRH8n00J1Czd78OXCVQKV x0KmcEW1tYr1LoG1t4SFjz2r+IYm3fjb56FellB/c5p65PEP+MirbRU+GuVGJXPZORgu haxw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.251.3 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:thread-topic:thread-index:date:message-id :accept-language:content-language: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=UEDGYR3J8p5eoDqSR420ai1xFTY2IXyeSIako/NuT/w=; b=Cg2Guzb5xUzFgPH45jp4537cjv4GDCPOTzaq7T2E3y2Wy+qFfcaMdVtKXuaAasgmpZ D4+3b+RFsCXPGb40T62H206JWgmvS2agn2HMUlBPLFRl8Ojd6GePs3+xY3Qqp1+DKZQI uGCHNTMcdJPwOQ/adWA7P0WPJBLS8H3RwHq1M6MVCj2ewDTPt+oNdj4THQcncP2U4PcW pZz1FFHhJDiCe0ahEqnFi6D6tc23gAk+uwAGjohS0vhXffrll45IzRRumRHIKc8TsqyS B0TMFod8ErXhzDAl7UATr2N/nMno5l7e0YH12HpdCNy4h85UVrBH1LRxPICZHmoNQDd2 /4Xw== 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:thread-topic:thread-index :date:message-id:accept-language:content-language: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=UEDGYR3J8p5eoDqSR420ai1xFTY2IXyeSIako/NuT/w=; b=OmdGDGpqOFG4MQuGEGzWA/IfIQxWUpsfEOn37CHaX3Dw0WYIYQv7hNoLU3OYms4ySK QiY2rG8GL2WUmMFt91kIFCnJ/KjKVbodWdZ7hYc5ZAgvgPvFHdwoxT+ilSNhss15aMAy mBFwE6SsR93bK46Vy0Yoc+76cm+LsoTQet3npGl3/IXhwrgiVwR5Rla3lAKd8MrpIs9Q R8aVZH59n1ZjADOx2SKK/+g3Qm/CGS3uuznRL1jOkcS5M1BAOE9Lr6fszfQejqCbuE15 WY6s/hrPfwiwOEQpORaFLBs6Ls+l6TMoR6GRQ42CHmcgSgLrn8UxGPC+Q8GfE3YnbL1p qE4w== Sender: swupdate@googlegroups.com X-Gm-Message-State: ALQs6tAJ8jcvfAmmE3ZUk1AID+auE0/WYpZ8uo679P0E6a3bDkeHdAIv iNSxxMTwOsgr3NUdcDXXEx4= X-Google-Smtp-Source: AIpwx49d1tIpa67TBAnxRDIewPqoqysieMRpU6I62qeFIMYfAhI10kxHpjN2mn/8XkkNBd1r/t84lA== X-Received: by 2002:a24:ca41:: with SMTP id k62-v6mr120635itg.6.1523872253798; Mon, 16 Apr 2018 02:50:53 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:902:b83:: with SMTP id 3-v6ls4932446plr.9.gmail; Mon, 16 Apr 2018 02:50:53 -0700 (PDT) X-Received: by 2002:a17:902:147:: with SMTP id 65-v6mr1524464plb.41.1523872253158; Mon, 16 Apr 2018 02:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523872253; cv=none; d=google.com; s=arc-20160816; b=zM2CuuMvP2URepYaCSrPwdeJiQo/S4l0+RfhNFYXpuRqSUff/wfC7roq9xjcpb5RrJ ptVSn5M/98Gntueawsye/qInD+WYb8PoGj4ydQrmR0PIZvB3c1h2TaJmAv+RiyxX2NQx uBgvMTdaID3R/tDlxkUGU9UTb9AIkAwejIv3azY8yKL/i7U8Fix6dkl9vm9Vg+jVUal0 NA94LIhkneLYTo4rhLvuFIAl5pBwfjF+HCi0fWkV8iBKOxijms+recthL+N4MSf8E205 SgJfWnv2HRuvmjtnotsF0OBgl5UWDDh2zPgH+BTT18FXlIXwytZbHJduvn71lsJ+/8KR y13Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :to:from:arc-authentication-results; bh=LP9ueV+XurUgFGx9vY9IPEcrOapdPjR9ub2vokFD8J4=; b=DSgRp5lDgm8Gc4MoH3Atn/AIwjEeFipwMqECC0QDV+AjVwThIWT8MSFCi7ahFrOJw9 k5+sWHu1PGHA47D8LZiOujnDuCFgTxwpnySHi2l3eXtHNzOIrLI+jP+R5Mmy7br7YGJ3 iIfshSkE7SZ3IzyXrggRhcCYm0+nejGPuIicIAB6gJZ/3JoYWLO1xsW1DhtphuCMdKHv ZpxRk0Wc+pg7yYzwD741wcQcwsMGplNf/+avwzmBTi8DWGg1WzlndwmSIhpl2DZvgP1r o7NcP9LxCTIJV5mL8lJ9KdQsLN7/Miv8z3+AYT2fiFfT3Sx/Ijme2wR7nl1FS40xODx3 U11w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.251.3 as permitted sender) smtp.mailfrom=Arturo.Buzarra@digi.com Received: from mail1.bemta12.messagelabs.com (mail1.bemta12.messagelabs.com. [216.82.251.3]) by gmr-mx.google.com with ESMTPS id m63si153353pgm.1.2018.04.16.02.50.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 02:50:53 -0700 (PDT) Received-SPF: pass (google.com: domain of arturo.buzarra@digi.com designates 216.82.251.3 as permitted sender) client-ip=216.82.251.3; Received: from [216.82.249.131] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-3.bemta-12.messagelabs.com id 37/20-07170-BF174DA5; Mon, 16 Apr 2018 09:50:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEIsWRWlGSWpSXmKPExsXi5LtOQPd34ZU og583NS2m7/zB6sDosWfiSbYAxijWzLyk/IoE1oyGGetZCn4KVcz83M3ewPhRoIuRk0NIYDWj xIsdZl2MXED2GiB761VmCGcvo8T2oyvYQarYBAwlPvbOZAGxRQRsJb5tWwUWFxYIkJhxp50JI h4q0fR0MlSNnkRbfzsbiM0ioCox7cNXsHpeAV+JtTsXs3YxcnAwCqhITNhfDBJmFhCXuPVkPt gYCQEBiSV7zjND2KISLx//Y4WwFSSWLjrGClGvI7Fg9yc2CFtbYtnC18wQ4wUlTs58wgLxmIr E8+fL2ScwCs9CsmIWkvZZSNpnIWlfwMiyilGjOLWoLLVI19BYL6koMz2jJDcxM0fX0NBILze1 uDgxPTUnMalYLzk/dxMjMPzrGRgYdzAeP+1yiFGSg0lJlFck7EqUEF9SfkplRmJxRnxRaU5q8 SFGGQ4OJQnetwVAOcGi1PTUirTMHGAkwqQlOHiURHhVgdEoxFtckJhbnJkOkTrFqMvxbfvvHm Yhlrz8vFQpcd4jIDMEQIoySvPgRsCSwiVGWSlhXkYGBgYhnoLUotzMElT5V4ziHIxKwrw/Qab wZOaVwG16BXQEE9AR14zBjihJREhJNTD2cJVudSp7HSicFCi6+9Gpwr9zvrQwTxfZekeiYcHs G40NFTwMuyQ/87R+0XCaE8azRIyj+XK1wryJrPah71oWTDloWv22xNO0ccGHt0ZHLDguG5hse LzfkdPi9m+GZt7VH2IXuy8MuOPTu0L49puPb9YdOMdttmOTSuKR+XZ7r9ikRIYstE1XYinOSD TUYi4qTgQA2f5XnQUDAAA= X-Env-Sender: Arturo.Buzarra@digi.com X-Msg-Ref: server-10.tower-28.messagelabs.com!1523872250!78334187!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 10320 invoked from network); 16 Apr 2018 09:50:51 -0000 Received: from owa.digi.com (HELO MCL-VMS-XCH01.digi.com) (66.77.174.16) by server-10.tower-28.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Apr 2018 09:50:51 -0000 Received: from MTK-SMS-XCH04.digi.com (10.10.8.198) by MCL-VMS-XCH01.digi.com (10.5.8.49) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 16 Apr 2018 04:50:50 -0500 Received: from DOR-VMS-XCH01.digi.com (10.49.8.98) by MTK-SMS-XCH04.digi.com (10.10.8.198) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 16 Apr 2018 04:50:50 -0500 Received: from DOR-SMS-XCH01.digi.com ([fe80::894b:3bdc:74ae:6efc]) by DOR-VMS-XCH01.digi.com ([fe80::c47f:be41:1dc7:5ab8%11]) with mapi id 14.03.0389.001; Mon, 16 Apr 2018 11:50:48 +0200 From: "Buzarra, Arturo" To: "'swupdate@googlegroups.com'" Subject: [swupdate] [meta-swupdate][morty][PATCH] swupdate: fix build for non-git versions Thread-Topic: [meta-swupdate][morty][PATCH] swupdate: fix build for non-git versions Thread-Index: AdPVZ5iOenHVW6h3QaWuw/7I5A+CVA== Date: Mon, 16 Apr 2018 09:50:48 +0000 Message-ID: <1F1C12BB7E7BAA40ACCAD76309F0BEC3018513AB@dor-sms-xch01.digi.com> Accept-Language: es-ES, es-ES, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.101.2.111] MIME-Version: 1.0 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.251.3 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: , Hi, After the lasts patch in the morty branch the build for non-git versions is broken. Attached you can find a patch to install the new files only for the git version and fix the build for the rest. ------------------------------------------------------------------------------------------------------------------------------------------- From: Arturo Buzarra Date: Mon, 16 Apr 2018 11:38:52 +0200 Subject: [PATCH] swupdate: fix build for non-git versions After the commit 9cc528711ad38ba2fee06746b7dd80260d9767ce the build is broken for non-git versions. Signed-off-by: Arturo Buzarra --- recipes-support/swupdate/swupdate.inc | 3 --- recipes-support/swupdate/swupdate_git.bb | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 031e433..a6b151e 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -123,11 +123,8 @@ 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 } diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 4a9131f..964b1e3 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -15,3 +15,11 @@ 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 -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ + fi +}