From patchwork Fri Sep 11 12:40:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 11770435 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAA58618 for ; Fri, 11 Sep 2020 12:40:08 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AACAC221F1 for ; Fri, 11 Sep 2020 12:40:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="CSzbuUj6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AACAC221F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5446+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id H7JFYY4521763xsYSA1sOpcA; Fri, 11 Sep 2020 05:40:08 -0700 X-Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2]) by mx.groups.io with SMTP id smtpd.web10.7059.1599828006730111092 for ; Fri, 11 Sep 2020 05:40:08 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 08BCe42s018482 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 11 Sep 2020 14:40:04 +0200 X-Received: from [167.87.49.221] ([167.87.49.221]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08BCe38j007626; Fri, 11 Sep 2020 14:40:03 +0200 From: "Jan Kiszka" Subject: [cip-dev] [isar-cip-core][PATCH] swupdate: Clean up do_prepare_build To: cip-dev , Quirin Gylstorff Message-ID: Date: Fri, 11 Sep 2020 14:40:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: NPFcewFwqxYtW51tj76lFnATx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1599828008; bh=wWkgdheY0B3Iccwm8Wi+nUi8ci3IoW9dSQrHVAzAIxs=; h=Content-Type:Date:From:Reply-To:Subject:To; b=CSzbuUj6JHm4yDFSdj07FK44klP3076IWBvbFC9sP17oS5lbRy7tYPgb96ZCumW/7hs 4WEDH4oHSFQgo31cfJa/Sxp5eCl6vqXJSsyz95aN0gOIXTdhrkMDFOf2KIuj2Ix5IuR4Q JPaayBXMrZOJdxFrc86RqTWYV21To0qhEA0= From: Jan Kiszka Reformat and drop the unused DEBDIR var (which wouldn't work anyway due to DEBDIR definition in Isar's bitbake.conf) Signed-off-by: Jan Kiszka --- recipes-core/swupdate/swupdate.bb | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb index 95cf73a..dd02cc2 100644 --- a/recipes-core/swupdate/swupdate.bb +++ b/recipes-core/swupdate/swupdate.bb @@ -39,16 +39,14 @@ TEMPLATE_FILES = "debian/changelog.tmpl debian/control.tmpl debian/rules.tmpl" TEMPLATE_VARS += "BUILD_DEB_DEPENDS DEFCONFIG DEBIAN_DEPENDS" do_prepare_build() { - DEBDIR=${S}/debian - cp -R ${WORKDIR}/debian ${S} - - install -m 0644 ${WORKDIR}/${PN}.cfg ${S}/swupdate.cfg - install -m 0644 ${WORKDIR}/${DEFCONFIG}.gen ${S}/configs/${DEFCONFIG} - - if ! grep -q "configs/${DEFCONFIG}" ${S}/.gitignore - then - echo "configs/${DEFCONFIG}" >> ${S}/.gitignore - fi - # luahandler - install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${S} + cp -R ${WORKDIR}/debian ${S} + + install -m 0644 ${WORKDIR}/${PN}.cfg ${S}/swupdate.cfg + install -m 0644 ${WORKDIR}/${DEFCONFIG}.gen ${S}/configs/${DEFCONFIG} + + if ! grep -q "configs/${DEFCONFIG}" ${S}/.gitignore; then + echo "configs/${DEFCONFIG}" >> ${S}/.gitignore + fi + # luahandler + install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${S} }