| Message ID | 27850e14-392e-4953-8711-913d95ab5227@googlegroups.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [meta-swupdate,1/2] Clean up building and setting of DEPENDS variable | expand |
Hi Alexander, On 28.04.20 10:23, Alexander Vickberg wrote: > Since recipe for 2019.04 was dropped the check for dependency on > OpenSSl is simplified. The commit message seems related to patch 2/2 and not to this one. > > Signed-off-by: Alexander Vickberg <wickbergster@gmail.com> > --- > 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') else it looks fine to me. Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
Hello Stefano, Thanks for the review. Den tisdag 28 april 2020 kl. 10:38:52 UTC+2 skrev Stefano Babic: > > Hi Alexander, > > On 28.04.20 10:23, Alexander Vickberg wrote: > > Since recipe for 2019.04 was dropped the check for dependency on > > OpenSSl is simplified. > > The commit message seems related to patch 2/2 and not to this one. > I did change '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:' to 'if 'CONFIG_SSL_IMPL_OPENSSL=y\n' in features:' as a part of the cleanup. That simplification is possible due to dropping of 2019.04 so I mentioned it in the message. Do you want it in the second patch? > > > Signed-off-by: Alexander Vickberg <wickbe...@gmail.com <javascript:>> > > --- > > 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') > > else it looks fine to me. > > Reviewed-by: Stefano Babic <sba...@denx.de <javascript:>> > > Best regards, > Stefano Babic > > -- > ===================================================================== > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de > <javascript:> > ===================================================================== > Thanks Alexander Vickberg
On 28.04.20 10:49, Alexander Vickberg wrote: > Hello Stefano, > > Thanks for the review. > > Den tisdag 28 april 2020 kl. 10:38:52 UTC+2 skrev Stefano Babic: > > Hi Alexander, > > On 28.04.20 10:23, Alexander Vickberg wrote: > > Since recipe for 2019.04 was dropped the check for dependency on > > OpenSSl is simplified. > > The commit message seems related to patch 2/2 and not to this one. > > > I did change > > '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:' > > to > > 'if 'CONFIG_SSL_IMPL_OPENSSL=y\n' in features:' > > as a part of the cleanup. That simplification is possible due to > dropping of 2019.04 so I mentioned it in the message. Do you want it in > the second patch? No, that's okay Regards, Stefano > > > > > Signed-off-by: Alexander Vickberg <wickbe...@gmail.com <javascript:>> > > --- > > 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') > > else it looks fine to me. > > Reviewed-by: Stefano Babic <sba...@denx.de <javascript:>> > > Best regards, > Stefano Babic > > -- > ===================================================================== > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: > sba...@denx.de <javascript:> > ===================================================================== > > > Thanks > Alexander Vickberg > > -- > You received this message because you are subscribed to the Google > Groups "swupdate" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to swupdate+unsubscribe@googlegroups.com > <mailto:swupdate+unsubscribe@googlegroups.com>. > To view this discussion on the web visit > https://groups.google.com/d/msgid/swupdate/cd1bb6df-e25a-41ab-bc88-ec33291b39ab%40googlegroups.com > <https://groups.google.com/d/msgid/swupdate/cd1bb6df-e25a-41ab-bc88-ec33291b39ab%40googlegroups.com?utm_medium=email&utm_source=footer>.
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' +
Since recipe for 2019.04 was dropped the check for dependency on OpenSSl is simplified. Signed-off-by: Alexander Vickberg <wickbergster@gmail.com> --- 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')