diff options
Diffstat (limited to 'recipes-core/swupd-server/swupd-server/fullfiles.c-work-around-pseudo-bug.patch')
| -rw-r--r-- | recipes-core/swupd-server/swupd-server/fullfiles.c-work-around-pseudo-bug.patch | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/recipes-core/swupd-server/swupd-server/fullfiles.c-work-around-pseudo-bug.patch b/recipes-core/swupd-server/swupd-server/fullfiles.c-work-around-pseudo-bug.patch index aa03054..0c74b5d 100644 --- a/recipes-core/swupd-server/swupd-server/fullfiles.c-work-around-pseudo-bug.patch +++ b/recipes-core/swupd-server/swupd-server/fullfiles.c-work-around-pseudo-bug.patch @@ -1,4 +1,4 @@ -From 939a50bf2fec9463fb721fa9188f98e991dfddc9 Mon Sep 17 00:00:00 2001 +From 724f10e4946708160bd8b47cc539cefa2d0cce54 Mon Sep 17 00:00:00 2001 From: Patrick Ohly <patrick.ohly@intel.com> Date: Wed, 30 Mar 2016 13:14:42 +0200 Subject: [PATCH] fullfiles.c: work around pseudo bug @@ -9,23 +9,24 @@ We work around that here by explicitly copying the xattrs. Upstream-Status: Inappropriate [workaround] Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> +Rebased-by: Igor Stoppa <igor.stoppa@intel.com> --- src/fullfiles.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) -diff --git a/src/fullfiles.c b/src/fullfiles.c -index fa78293..949d8f0 100644 ---- a/src/fullfiles.c -+++ b/src/fullfiles.c -@@ -29,6 +29,7 @@ - #include <assert.h> - #include <sys/types.h> +Index: git/src/fullfiles.c +=================================================================== +--- git.orig/src/fullfiles.c ++++ git/src/fullfiles.c +@@ -32,6 +32,7 @@ + #include <string.h> #include <sys/stat.h> + #include <sys/types.h> +#include <sys/xattr.h> - #include <stdint.h> - #include <errno.h> - #include <libgen.h> -@@ -144,6 +145,35 @@ static void create_fullfile(struct file *file) + #include <unistd.h> + + #include "swupd.h" +@@ -142,6 +143,35 @@ static void create_fullfile(struct file } } @@ -60,7 +61,4 @@ index fa78293..949d8f0 100644 + /* step 2a: tar it with each compression type */ // lzma - string_or_die(&tarcommand, "tar --directory=%s " TAR_PERM_ATTR_ARGS " -Jcf %s/%i/files/%s.tar.xz %s", --- -2.1.4 - + string_or_die(&tarcommand, TAR_COMMAND " --directory=%s " TAR_PERM_ATTR_ARGS " -Jcf %s/%i/files/%s.tar.xz %s", |