From patchwork Tue Apr 28 08:23:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Vickberg X-Patchwork-Id: 1278346 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=2607:f8b0:4864:20::b40; helo=mail-yb1-xb40.google.com; envelope-from=swupdate+bncbd32bl7xsegrbfoqt72qkgqedg3uoaq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=D3nHe5N8; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pek4ML+l; dkim-atps=neutral Received: from mail-yb1-xb40.google.com (mail-yb1-xb40.google.com [IPv6:2607:f8b0:4864:20::b40]) (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 49BF6M3ZgCz9sPF for ; Tue, 28 Apr 2020 18:23:53 +1000 (AEST) Received: by mail-yb1-xb40.google.com with SMTP id k14sf7037347ybp.23 for ; Tue, 28 Apr 2020 01:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:date:from:to:message-id:subject:mime-version :x-original-sender:precedence:mailing-list:list-id:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=NYeQ2b9+oFBO0ZSkgw3XVBqpHSq6mRG53Ts+spBNqbA=; b=D3nHe5N8JRulwqczzWckp/zv/reYnStAOykAAiqiMceKxi0Sxqnw0t1Ndp35DprFR0 7LmLtSwtWL3TrhGtNVNXEE5jts3SPa/xZhjdHxhctcvVOKr/H3F6upthGlWTcaoYt3im 9lRd1uPAOr2dSP3YvzaPZebkip+aHK5fjyjfekGCCbgVr5Iii1wTyMpXo5YfDjAzu1Ow /6tWL5xJ/wTi+5c4YycV6CJTJufAJK0WXtShPLm8IrBANqAuROFSYcoZUOVBpMuvV0Eh oQ5dd4p4N9JaN3VpgGzTGrMWShhSYJd/S2wd8W00rdEkhPfVz0KxV10EAKw03ernPHOo L1XQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:message-id:subject:mime-version:x-original-sender :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=NYeQ2b9+oFBO0ZSkgw3XVBqpHSq6mRG53Ts+spBNqbA=; b=pek4ML+ltQuGuXg4PB97HVeUQwnWRxwrIzIp4K8tf4haVRI6o6cy7cRFW/C/79piIX VPoy3ks9qCTsLG45OwnMQmj46MkSHGe7DBGn09Kmc+IK9FQL0TmI9FKuq8NaJuPST4JA wVV8qyCjiwUYlnl6Vu5H1XITEpKq/L3IDOk2H3yHcboAqSDZ/c71vTshbN4xypnBhMoJ 95wxmUqRqJrWFEJyyKd7YUb/ZIio4UELQSsfuIcx+jK5RdmERviApZ+/yaBXugViF0/C ux6vF/Pw0GdOi1KLhKrAhSXe8WpoynVK5gt2i8uP9PNHcKwYHDgwtSnB93HxYJa3NvB4 VTKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:date:from:to:message-id:subject :mime-version:x-original-sender:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=NYeQ2b9+oFBO0ZSkgw3XVBqpHSq6mRG53Ts+spBNqbA=; b=ZReVClKqVVPWeQ5h9qvXhFmLAJz5aYeqiwQqgBdVhyCOUnXbt+IC+OmHh+KhAvgKdp iYhphv4mVoeYeKXcJ+6PxyYtSvSO4+hJsnSvjHg1l8O8dTpTkv/hfuHXUEHlu5/1HYsk t2khFthufaBNoNyjZsM52wGwRVbT4i0WwfXPcrN2f7CK/qMJ3uYPEWG7LxaDhq1IaWGz 2TFr6Wm6fGQhiYxzHBNLwuA1zE7c1U607nfsH2BtqrXJU+twX3lz9YcPtuynCN/kcdn3 /OonDqDuoHp9j3mjZdNKjSA6VwTIfG6ADSNZu11K1hWHNwgR/Ukt+rvQDf2u6tWIdVDU nzYQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AGi0PuZ/Tp1Iei84RtN0Tfl2ZSu7R5EdIXk9Li8+rX10+s+RQ5ctcBSe f2KzovTQBJsda1u6Akjp2EE= X-Google-Smtp-Source: APiQypJnLhaMVS2HIVh8KnkaGnjnSwwFHAuYcy/HDcGcVPnRZ4mVdMABr+z6ypiQXh0nOS7b2Kbq9A== X-Received: by 2002:a25:b88a:: with SMTP id w10mr45799959ybj.471.1588062230415; Tue, 28 Apr 2020 01:23:50 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a25:29c1:: with SMTP id p184ls7994850ybp.3.gmail; Tue, 28 Apr 2020 01:23:49 -0700 (PDT) X-Received: by 2002:a25:2143:: with SMTP id h64mr42532878ybh.276.1588062229476; Tue, 28 Apr 2020 01:23:49 -0700 (PDT) Date: Tue, 28 Apr 2020 01:23:48 -0700 (PDT) From: Alexander Vickberg To: swupdate Message-Id: <27850e14-392e-4953-8711-913d95ab5227@googlegroups.com> Subject: [swupdate] [meta-swupdate][PATCH 1/2] Clean up building and setting of DEPENDS variable MIME-Version: 1.0 X-Original-Sender: wickbergster@gmail.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: , Since recipe for 2019.04 was dropped the check for dependency on OpenSSl is simplified. Signed-off-by: Alexander Vickberg Reviewed-by: Stefano Babic --- recipes-support/swupdate/swupdate.inc | 66 ++++++++++----------------- 1 file changed, 24 insertions(+), 42 deletions(-) + d.setVar('DEPENDS', depends) if 'CONFIG_MONGOOSE=y\n' in features: d.setVar('SWUPDATE_MONGOOSE', 'true') @@ -156,14 +146,6 @@ python () { if 'CONFIG_MONGOOSE_WEB_API_V2=y\n' in features: d.setVar('SWUPDATE_WWW', 'webapp') - if 'CONFIG_BOOTLOADER_EBG=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' efibootguard') - - if 'CONFIG_ZSTD=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' zstd') - # Values not used here might be used in a bbappend d.setVar('SWUPDATE_SOCKET_CTRL_PATH', '/tmp/sockinstctrl') d.setVar('SWUPDATE_SOCKET_PROGRESS_PATH', '/tmp/swupdateprog') diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 21de272..6dd0c91 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -92,61 +92,51 @@ python () { features = configfile.readlines() configfile.close() + depends = d.getVar('DEPENDS', False) + if 'CONFIG_REMOTE_HANDLER=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' zeromq') + depends += ' zeromq' - if 'CONFIG_ENCRYPTED_IMAGES=y\n' in features or 'CONFIG_MONGOOSESSL=y\n' in features or 'CONFIG_HASH_VERIFY=y\n' in features or 'CONFIG_SURICATTA_SSL=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' openssl') + if 'CONFIG_SSL_IMPL_OPENSSL=y\n' in features: + depends += ' openssl' if 'CONFIG_JSON=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' json-c') + depends += ' json-c' if 'CONFIG_SYSTEMD=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' systemd') + depends += ' systemd' if 'CONFIG_ARCHIVE=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' libarchive') + depends += ' libarchive' if 'CONFIG_LUA=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' lua') + depends += ' lua' if 'CONFIG_UBOOT=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' libubootenv') + depends += ' libubootenv' if 'CONFIG_DOWNLOAD=y\n' in features or 'CONFIG_SURICATTA=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' curl') - - if 'CONFIG_MTD=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' mtd-utils') - - if 'CONFIG_CFI=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' mtd-utils') + depends += ' curl' - if 'CONFIG_UBIVOL=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' mtd-utils') + if 'CONFIG_MTD=y\n' in features or 'CONFIG_CFI=y\n' in features or 'CONFIG_UBIVOL=y\n' in features: + depends += ' mtd-utils' if 'CONFIG_UCFWHANDLER=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' libgpiod') + depends += ' libgpiod' if 'CONFIG_SWUFORWARDER_HANDLER=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' curl libwebsockets uriparser') + depends += ' curl libwebsockets uriparser' if 'CONFIG_RDIFFHANDLER=y\n' in features: - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' librsync') + depends += ' librsync' + + if 'CONFIG_BOOTLOADER_EBG=y\n' in features: + depends += ' efibootguard' + + if 'CONFIG_ZSTD=y\n' in features: + depends += ' zstd' +