[yocto] [PATCH] Rebase patch for xattr workaround against pseudo.

Igor Stoppa igor.stoppa at intel.com
Tue May 10 08:02:09 PDT 2016


The original patch was not applying cleanly anymore,
due to changes in the list of included headers.
This is a trivial cleanup.

Signed-off-by: Igor Stoppa <igor.stoppa at intel.com>
---
 .../fullfiles.c-work-around-pseudo-bug.patch       | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 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 91e1493..07ec30d 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 0fd9bf8d2cf8e2edf9ea178c4b93ad8eebdffa38 Mon Sep 17 00:00:00 2001
 From: Patrick Ohly <patrick.ohly at intel.com>
 Date: Wed, 30 Mar 2016 13:14:42 +0200
 Subject: [PATCH] fullfiles.c: work around pseudo bug
@@ -9,23 +9,25 @@ We work around that here by explicitly copying the xattrs.
 Upstream-Status: Inappropriate [workaround]
 
 Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
+
+Re-based-by: Igor Stoppa <igor.stoppa at intel.com>
 ---
  src/fullfiles.c | 30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
 
-Index: git/src/fullfiles.c
-===================================================================
---- git.orig/src/fullfiles.c
-+++ git/src/fullfiles.c
-@@ -31,6 +31,7 @@
- #include <stdlib.h>
- #include <string.h>
+diff --git a/src/fullfiles.c b/src/fullfiles.c
+index cf77e74..827eabf 100644
+--- a/src/fullfiles.c
++++ b/src/fullfiles.c
+@@ -29,6 +29,7 @@
+ #include <assert.h>
+ #include <sys/types.h>
  #include <sys/stat.h>
 +#include <sys/xattr.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-@@ -141,6 +142,35 @@ static void create_fullfile(struct file
+ #include <stdint.h>
+ #include <errno.h>
+ #include <libgen.h>
+@@ -144,6 +145,35 @@ static void create_fullfile(struct file *file)
  			}
  		}
  
@@ -61,3 +63,6 @@ Index: git/src/fullfiles.c
  		/* step 2a: tar it with each compression type  */
  		// lzma
  		string_or_die(&tarcommand, TAR_COMMAND " --directory=%s " TAR_PERM_ATTR_ARGS " -Jcf %s/%i/files/%s.tar.xz %s",
+-- 
+2.1.4
+
-- 
2.1.4




More information about the yocto mailing list