diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-04-06 10:07:19 +0100 |
|---|---|---|
| committer | Joshua Lock <joshua.g.lock@intel.com> | 2016-04-06 22:08:04 +0100 |
| commit | 69e5703e54fbcf19b0dfdae62cb5eefa181b685c (patch) | |
| tree | b58020f3b9890fa0ce78a0cc2995847f3f566a43 | |
| parent | e414a5d2017220ef156dd28803b7580bf9c4c2d0 (diff) | |
| download | meta-swupd-69e5703e54fbcf19b0dfdae62cb5eefa181b685c.tar.gz meta-swupd-69e5703e54fbcf19b0dfdae62cb5eefa181b685c.tar.bz2 meta-swupd-69e5703e54fbcf19b0dfdae62cb5eefa181b685c.zip | |
swupd-client: better align 3.3.0 recipe with 2.87 recipe
Switch 3.3.0 recipe to using bsdtar, align DEPENDS, RDEPENDS and
EXTRA_OECONF settings.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
| -rw-r--r-- | recipes-core/swupd-client/swupd-client_2.87.bb | 5 | ||||
| -rw-r--r-- | recipes-core/swupd-client/swupd-client_git.bb | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/recipes-core/swupd-client/swupd-client_2.87.bb b/recipes-core/swupd-client/swupd-client_2.87.bb index 3356ae6..011d238 100644 --- a/recipes-core/swupd-client/swupd-client_2.87.bb +++ b/recipes-core/swupd-client/swupd-client_2.87.bb @@ -17,9 +17,8 @@ SRC_URI = "\ SRC_URI[md5sum] = "5d272c62edb8a9c576005ac5e1182ea3" SRC_URI[sha256sum] = "45df259a7dc2fed985ee9961e112120fc46670dd75476c3262fc6804b1c66fb8" -DEPENDS = "glib-2.0 curl zlib bzip2 xz openssl" -RDEPENDS_${PN} = "gzip bzip2 xz" -RDEPENDS_${PN}_class-target = "oe-swupd-helpers bsdtar" +DEPENDS = "glib-2.0 curl openssl libarchive" +RDEPENDS_${PN}_append_class-target = " oe-swupd-helpers bsdtar" # We check /etc/os-release for the current OS version number RRECOMMENDS_${PN}_class-target = "os-release" diff --git a/recipes-core/swupd-client/swupd-client_git.bb b/recipes-core/swupd-client/swupd-client_git.bb index 1553593..c645aa1 100644 --- a/recipes-core/swupd-client/swupd-client_git.bb +++ b/recipes-core/swupd-client/swupd-client_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/clearlinux/swupd-client" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f8d90fb802930e30e49c39c8126a959e" -DEPENDS = "glib-2.0 curl zlib bzip2 xz openssl bsdiff" +DEPENDS = "glib-2.0 curl openssl libarchive bsdiff" PV = "3.3.0+git${SRCPV}" SRC_URI = "\ @@ -14,8 +14,7 @@ SRCREV = "e4b2a32448d9fd9ab494f861f1bb143468659c75" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "gzip bzip2 tar xz" -RDEPENDS_${PN}_class-target = "oe-swupd-helpers" +RDEPENDS_${PN}_append_class-target = " oe-swupd-helpers bsdtar" # We check /etc/os-release for the current OS version number RRECOMMENDS_${PN}_class-target = "os-release" @@ -23,11 +22,12 @@ inherit pkgconfig autotools systemd EXTRA_OECONF = "\ --with-systemdsystemunitdir=${systemd_system_unitdir} \ + --enable-bsdtar \ " do_install_append () { # TODO: This should be a less os-specific directory and not hard-code datadir - install -d ${D}${datadir}/${DISTRO}/bundles + install -d ${D}${datadir}/clear/bundles } FILES_${PN} += "\ |