[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 150/246] bitbake: fetch: copy files with -H

[Emmanuele Bassi <ebassi src gnome org>]

commit 0aedf304e5045cf113f3cfb2e1b09e63be049a1e
Author: Enrico Scholz <enrico scholz sigma-chemnitz de>
Date:   Thu May 26 02:08:06 2016 +0200

    bitbake: fetch: copy files with -H
    
    When using a PREMIRROR with plain (non-unpack) files, a SRC_URI like
    
    SRC_URI = "file://devmem2.c"
    
    will cause devmem2.c to be a symlink in the WORKDIR pointing to the
    local PREMIRROR.
    
    Trying to apply a patch on this file will either modify the file on
    the PREMIRROR or will fail due to sanity checks:
    
    ERROR: devmem2-1.0-r7 do_patch: Command Error: 'quilt --quiltrc 
/cache/build-ubuntu/sysroots/x86_64-oe-linux/etc/quiltrc push' exited with 1  Output:
    Applying patch devmem2-fixups-2.patch
    File devmem2.c is not a regular file -- refusing to patch
    
    (Bitbake rev: e82862ba8fedb2c5cd478c731b3d259d16c6e3d8)
    
    Signed-off-by: Enrico Scholz <enrico scholz sigma-chemnitz de>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 6ef0c6f..7773c16 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1424,7 +1424,7 @@ class FetchMethod(object):
                     if urlpath.find("/") != -1:
                         destdir = urlpath.rsplit("/", 1)[0] + '/'
                         bb.utils.mkdirhier("%s/%s" % (unpackdir, destdir))
-                cmd = 'cp -fpPR %s %s' % (file, destdir)
+                cmd = 'cp -fpPRH %s %s' % (file, destdir)
 
         if not cmd:
             return