Преглед изворни кода

Clean up building and setting of DEPENDS variable

Since recipe for 2019.04 was dropped the check for dependency on
OpenSSl is simplified.

Signed-off-by: Alexander Vickberg <wickbergster@gmail.com>
Alexander Vickberg пре 5 година
родитељ
комит
293f273d12
1 измењених фајлова са 24 додато и 42 уклоњено
  1. 24 42
      recipes-support/swupdate/swupdate.inc

+ 24 - 42
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')