From patchwork Tue May 5 14:24:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Vickberg X-Patchwork-Id: 1283669 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::53b; helo=mail-ed1-x53b.google.com; envelope-from=swupdate+bncbd32bl7xsegrbuxoyx2qkgqer5feb2q@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=ksRwAZse; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AUCxDnCi; dkim-atps=neutral Received: from mail-ed1-x53b.google.com (mail-ed1-x53b.google.com [IPv6:2a00:1450:4864:20::53b]) (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 49GhpK0BPFz9sVH for ; Wed, 6 May 2020 00:25:28 +1000 (AEST) Received: by mail-ed1-x53b.google.com with SMTP id a10sf1014910edm.3 for ; Tue, 05 May 2020 07:25:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1588688723; cv=pass; d=google.com; s=arc-20160816; b=CK9llt+hYTTU58VpUC6/Gd4oUDARuY/jTGtGZJWyNLy1VajIZt1ECGekvQ52WbNnio vRwTB4dIITcJVysQ+RwEK6mKKwV5cchvfytOemfodKcqFkhVpUvrYVh93D7vUDU2HP+h cf9FNctAIhF1frspu0fccUMytxjIV54QkXWjJ9oCRXD1+/fC+4bCNoL497MshUR6+ULV 5hB03T3IdaL9S8p6oZz5iGBzmggdBIliOOyryAWZBlOZdOMib0vFinE6fz/oAapAcnHq tuj8pa+SgJflYe3vmQTYCaj92GIQn3EM/ZVcciCRm7o7uTmPrOF0JDdmAsTWMbZ4IF9D uRSw== 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:cc:to:from:sender:dkim-signature:dkim-signature; bh=ruQzNzeuwQpsCowTMYyB6Qb16WDsoin66jzNvkfSTbc=; b=vW+Ybd+6ZqhpUZSQqWeNlPNyD3H/zb8aj1pplC8Gqm4N7b9p3c1J4z79tDxcriNd9E iPVmX/oOlD+efWAvPOTeVTjw1MFCY2VPHCErbN/D8hIWErIjAmkJtca/HRX20uReR+Ii r53xZLstNwRHrwcSTcFiqPZW1b5gyr+JeP/7BKOmlTJIwZisfcVlUgBgGrPz40KgiDCk V4IPvzAQuzv5L4KQEo9WK64F6p4m3Ym0B17XreffLqbvv0VvLpB2rw86l976YMjaiM3C 5qAc28Ssqqkj4Jk4g6PBRONlrBIvHzmS0eXNWmp6lEOfmpvdx9kbn4GhqF2ciU80+tem sHKg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ilVu+265; spf=pass (google.com: domain of wickbergster@gmail.com designates 2a00:1450:4864:20::243 as permitted sender) smtp.mailfrom=wickbergster@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc: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=ruQzNzeuwQpsCowTMYyB6Qb16WDsoin66jzNvkfSTbc=; b=ksRwAZseQ4i0ZiMHtI3YeV+PD0D/4Vr9fzkiCJXv2SkXxBFcV1E09jo6k3lRSmRxwL OdoQIWevnw0/iv9GUnSDp2WdmSgipNDtQl3rryOpZ/+o1h7bdpd5f5DjwAFcUzqmt8dS QZw3AeCN+/perDTLMsmEqgJ3fBLsep5pNHqnEhIGrEfTgwHJ+LnBSfKpu/Tv/DVxGRWp wKBH6kuCAoh7O3Q1XoDu+F2F5ztYyrVH9cr82x4e4J+0raAcEITXwIjn8VP3dBtt8SLH uagNbx/gCppdOTPSpmI+K2WgzSeaewk2bQdZvFdBXH2JX0GKIJIic+9hiNCWQp3+8Rly +REg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc: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=ruQzNzeuwQpsCowTMYyB6Qb16WDsoin66jzNvkfSTbc=; b=AUCxDnCiclP4qipcNb5f6fR3xcUJrrud1dj7Mx9BwN1ts8qH2YYQYxzKWG8Y0Pj2+i ZDM3FjYwrbZ/EEk+HfbFgIFyZvy6Kfg4wI54e/HviZBj66N5k9+ApL0ktH1LDY6hKR/t pC2CA4pvGwLwhSmSDbl5sOfNjiGLMuarjLEEZCncFks9qSlfyUlomKr9R7RAggVbnQVj Hu7RV0b4KcmS+vpomcc4eonVt/h6ZFRp0RhTjCdYDXARd24H0J6Rbrt7IpDbVOQUv0dO hZrhbNfKM9aGUH07E7ebrdWBOCtNnoQWb+TSsXcWtGhLv601bD+jovi67PNkR1u3bczn w0/Q== 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:cc: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=ruQzNzeuwQpsCowTMYyB6Qb16WDsoin66jzNvkfSTbc=; b=ZbA7hzCqGMLWjvi8qXExu2S8cNhyWhovwEFc6pbXwYy/EjAvC4LCe/gEbdKGcY9u2c t7YOnFRHClQzZQ1Fa9Cmic9j9iBnCI1uqiRZnDnK2DGgwcB91iFZdcGlz9Vha4DjxbHr iLYTawAFpURFhM/sJKoRA69c2b5ggPzEg/pOOiof3x5kkFeNiErUXPAfVRIBz4s1/028 0MfO2N4s9Ej8vh0HtzOB2JwfAoWMTeeb8aMKH230PFKny7cdMzJaDbNUxhEhDVBptkY4 JWecgLtr7ZuHfzLqifp7+83ljEhWlL34r1DViQpuzzNEpSJgXZNjFf8BH5NmGICKw8U7 QhmA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AGi0PuZ/VfOIInUDvArqNrP78RnC5M2GITsMw6NFa5Lp+foyr545KGX+ ZV+7242oIHGj+FjYY/wMB7o= X-Google-Smtp-Source: APiQypLSqSmuK80ef8zbRmj7yzKFdoBTC3eq5ezQGnFv6hZiDk1hIUUtraSyF7PPajVpLotU/qQJGQ== X-Received: by 2002:aa7:d3d1:: with SMTP id o17mr3006367edr.200.1588688722929; Tue, 05 May 2020 07:25:22 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:aa7:db4a:: with SMTP id n10ls1335199edt.4.gmail; Tue, 05 May 2020 07:25:22 -0700 (PDT) X-Received: by 2002:a05:6402:22cd:: with SMTP id dm13mr2992309edb.56.1588688722319; Tue, 05 May 2020 07:25:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588688722; cv=none; d=google.com; s=arc-20160816; b=QMR8yujMoM0iGjHWQtyEOtiNYupzmmjB6zgXkJ88qxUJMqZf37ZOvptCm8UPYw8S+1 EkG1NVvakmkwgbQPYHwnZbxuKg/8Ini36V4NcgEMG3gpIHSImtHknkPaEjFtNV9LJoaE zZCUEQxCWxvfEmG6kEDzYGscvqM1PzlG/dKZkPz/RTnnxlrYO+MfUW/MhicGjagqGpXd AgnNdRPlF5u+7sflsFYDCTTyXdJ2MHJEm5m04dJpaG0uuzxfyuU3u1Siq9Hksp3inlRa XtyjMGq5PdMNtlEONJbnCBaW39qtLcjG5093mvO5xeQDN4J2uHSLg40wKZZKwJOqbbMo CQAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=wsEofEMg9gxFyfuPwm4K25FLarxP7UhyeSThoztSZxA=; b=Qc9iHl0nLUZjGlHmfo/m357KICaDgwt4UZ2NbapniuJl4wqCxiLbzQJB+AWg3NCp2r OA5OLO8EJPz+Q4vSU1coXMMWeGiefg0CXwVKUnP1dUl0geNWOzklIPcRhNIKzS8YXJYo MtPAQw0uioUC29GU6YwBvZJory8rueo7QOJKJ7P4JTSrJGEvd4bdAv0Xgjj2o2dgMgrz /VFniurlz5L4DOeGPYvMzPPYBIpETNEAmVBfhR1vLz+ZPPtkED3CvrLDKgHxKJ6lcWH+ nc7JGrDQ6VF7ejrta98SNNT/29Uu6e0qcfMA5WenOmAQb6wKF70wkjaPI6m6DMKT0Vyr E52g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ilVu+265; spf=pass (google.com: domain of wickbergster@gmail.com designates 2a00:1450:4864:20::243 as permitted sender) smtp.mailfrom=wickbergster@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com. [2a00:1450:4864:20::243]) by gmr-mx.google.com with ESMTPS id o23si151815edz.4.2020.05.05.07.25.22 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 May 2020 07:25:22 -0700 (PDT) Received-SPF: pass (google.com: domain of wickbergster@gmail.com designates 2a00:1450:4864:20::243 as permitted sender) client-ip=2a00:1450:4864:20::243; Received: by mail-lj1-x243.google.com with SMTP id h4so1803412ljg.12 for ; Tue, 05 May 2020 07:25:22 -0700 (PDT) X-Received: by 2002:a2e:b249:: with SMTP id n9mr2039982ljm.221.1588688721628; Tue, 05 May 2020 07:25:21 -0700 (PDT) Received: from localhost.localdomain (dyn-13-cust157.netit.se. [85.89.70.157]) by smtp.gmail.com with ESMTPSA id e25sm1979586lfb.89.2020.05.05.07.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2020 07:25:20 -0700 (PDT) From: Alexander Vickberg To: swupdate@googlegroups.com Cc: Alexander Vickberg Subject: [swupdate] [meta-swupdate][PATCH v2 1/2] Clean up building and setting of DEPENDS variable Date: Tue, 5 May 2020 16:24:34 +0200 Message-Id: <20200505142434.2475028-1-wickbergster@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: wickbergster@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ilVu+265; spf=pass (google.com: domain of wickbergster@gmail.com designates 2a00:1450:4864:20::243 as permitted sender) smtp.mailfrom=wickbergster@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=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 --- Changes in v2: No changes. Resend with git send-email. recipes-support/swupdate/swupdate.inc | 66 ++++++++++----------------- 1 file changed, 24 insertions(+), 42 deletions(-) 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' + + 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')