summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2016-05-26 00:08:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-08 23:47:15 (GMT)
commit0aedf304e5045cf113f3cfb2e1b09e63be049a1e (patch)
tree4c95f7b5e37c591e7991d778cdded293830bc91f
parentf0f6acac039e75171b8f4c89eff7d1c2d3ddba5b (diff)
downloadpoky-0aedf304e5045cf113f3cfb2e1b09e63be049a1e.tar.gz
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>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
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):
1424 if urlpath.find("/") != -1: 1424 if urlpath.find("/") != -1:
1425 destdir = urlpath.rsplit("/", 1)[0] + '/' 1425 destdir = urlpath.rsplit("/", 1)[0] + '/'
1426 bb.utils.mkdirhier("%s/%s" % (unpackdir, destdir)) 1426 bb.utils.mkdirhier("%s/%s" % (unpackdir, destdir))
1427 cmd = 'cp -fpPR %s %s' % (file, destdir) 1427 cmd = 'cp -fpPRH %s %s' % (file, destdir)
1428 1428
1429 if not cmd: 1429 if not cmd:
1430 return 1430 return