aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/swupd-server
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-04-06 10:05:56 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-04-06 22:08:04 +0100
commite414a5d2017220ef156dd28803b7580bf9c4c2d0 (patch)
treec575df8af2d07b83e50e30bb3a9c0b143704bdee /recipes-core/swupd-server
parentb6f078e453bade6954467ae5e8a8d2fdcc811417 (diff)
downloadmeta-swupd-e414a5d2017220ef156dd28803b7580bf9c4c2d0.tar.gz
meta-swupd-e414a5d2017220ef156dd28803b7580bf9c4c2d0.tar.bz2
meta-swupd-e414a5d2017220ef156dd28803b7580bf9c4c2d0.zip
swupd-server: better align 3.1.2 recipe with 2.53 recipe
Switch 3.1.2 recipe to using bsdtar and include the patch to work around hardlink extended attribute issues when running under pseudo. Move 2.53 specific patches to the swupd-server-2.53 directory. Unify DEPENDS, RDEPENDS and EXTRA_OECONF settings. Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'recipes-core/swupd-server')
-rw-r--r--recipes-core/swupd-server/swupd-server-2.53/0006-Always-use-xattrs-when.patch (renamed from recipes-core/swupd-server/swupd-server/0006-Always-use-xattrs-when.patch)0
-rw-r--r--recipes-core/swupd-server/swupd-server-2.53/0007-Clean-up-tar-options-drop-a-for-the-extract-mode.patch (renamed from recipes-core/swupd-server/swupd-server/0007-Clean-up-tar-options-drop-a-for-the-extract-mode.patch)0
-rw-r--r--recipes-core/swupd-server/swupd-server-2.53/0008-Clean-up-tar-commands-always-put-files-after-options.patch (renamed from recipes-core/swupd-server/swupd-server/0008-Clean-up-tar-commands-always-put-files-after-options.patch)0
-rw-r--r--recipes-core/swupd-server/swupd-server-2.53/0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch (renamed from recipes-core/swupd-server/swupd-server/0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch)0
-rw-r--r--recipes-core/swupd-server/swupd-server_2.53.bb2
-rw-r--r--recipes-core/swupd-server/swupd-server_git.bb8
6 files changed, 6 insertions, 4 deletions
diff --git a/recipes-core/swupd-server/swupd-server/0006-Always-use-xattrs-when.patch b/recipes-core/swupd-server/swupd-server-2.53/0006-Always-use-xattrs-when.patch
index ddc8603..ddc8603 100644
--- a/recipes-core/swupd-server/swupd-server/0006-Always-use-xattrs-when.patch
+++ b/recipes-core/swupd-server/swupd-server-2.53/0006-Always-use-xattrs-when.patch
diff --git a/recipes-core/swupd-server/swupd-server/0007-Clean-up-tar-options-drop-a-for-the-extract-mode.patch b/recipes-core/swupd-server/swupd-server-2.53/0007-Clean-up-tar-options-drop-a-for-the-extract-mode.patch
index 2f933d0..2f933d0 100644
--- a/recipes-core/swupd-server/swupd-server/0007-Clean-up-tar-options-drop-a-for-the-extract-mode.patch
+++ b/recipes-core/swupd-server/swupd-server-2.53/0007-Clean-up-tar-options-drop-a-for-the-extract-mode.patch
diff --git a/recipes-core/swupd-server/swupd-server/0008-Clean-up-tar-commands-always-put-files-after-options.patch b/recipes-core/swupd-server/swupd-server-2.53/0008-Clean-up-tar-commands-always-put-files-after-options.patch
index 3dabcc8..3dabcc8 100644
--- a/recipes-core/swupd-server/swupd-server/0008-Clean-up-tar-commands-always-put-files-after-options.patch
+++ b/recipes-core/swupd-server/swupd-server-2.53/0008-Clean-up-tar-commands-always-put-files-after-options.patch
diff --git a/recipes-core/swupd-server/swupd-server/0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch b/recipes-core/swupd-server/swupd-server-2.53/0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch
index 7821938..7821938 100644
--- a/recipes-core/swupd-server/swupd-server/0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch
+++ b/recipes-core/swupd-server/swupd-server-2.53/0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch
diff --git a/recipes-core/swupd-server/swupd-server_2.53.bb b/recipes-core/swupd-server/swupd-server_2.53.bb
index 3f8a4e2..6457731 100644
--- a/recipes-core/swupd-server/swupd-server_2.53.bb
+++ b/recipes-core/swupd-server/swupd-server_2.53.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=04d0b48662817042d80393e7511fa41b \
file://bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a"
-DEPENDS = "file xz glib-2.0 zlib bzip2 tar rsync openssl"
+DEPENDS = "file glib-2.0 rsync openssl libarchive"
SRC_URI = "\
https://download.clearlinux.org/releases/5940/clear/source/SRPMS/${BPN}-${PV}-4.src.rpm;extract=${BP}.tar.gz \
diff --git a/recipes-core/swupd-server/swupd-server_git.bb b/recipes-core/swupd-server/swupd-server_git.bb
index e185a7d..a39573a 100644
--- a/recipes-core/swupd-server/swupd-server_git.bb
+++ b/recipes-core/swupd-server/swupd-server_git.bb
@@ -3,11 +3,12 @@ HOMEPAGE = "https://github.com/clearlinux/swupd-server"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=f8d90fb802930e30e49c39c8126a959e"
-DEPENDS = "file xz glib-2.0 zlib bzip2 tar rsync openssl bsdiff"
+DEPENDS = "file glib-2.0 rsync openssl libarchive bsdiff"
PV = "3.1.2+git${SRCPV}"
SRC_URI = "\
git://github.com/clearlinux/swupd-server.git;protocol=https \
+ file://fullfiles.c-work-around-pseudo-bug.patch \
"
SRCREV = "51c0bf200792b19593782bf819bbc3d239ec0b50"
@@ -15,11 +16,12 @@ S = "${WORKDIR}/git"
inherit autotools
-EXTRA_OECONF = "--enable-bzip2 --enable-lzma --disable-stateless --disable-tests"
+EXTRA_OECONF = "--enable-bzip2 --enable-lzma --disable-stateless --disable-tests --enable-bsdtar"
# safer-calls-to-system-utilities.patch uses for loop initial declaration
CFLAGS_append = " -std=c99"
-RDEPENDS_${PN} = "tar rsync"
+RDEPENDS_${PN} = "rsync"
+RDEPENDS_${PN}_class-target = " bsdtar"
BBCLASSEXTEND = "native"