diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2016-05-26 02:08:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:10:35 +0100 |
commit | 0c3ce684100546cf628d96c0f64a635242a10e16 (patch) | |
tree | 449ea03a844286dd1d79e7183e69e6641ae8e547 | |
parent | 7f6b6b2ab907cbf3c2811740bf9ad562e02dccaa (diff) | |
download | poky-0c3ce684100546cf628d96c0f64a635242a10e16.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: cfd481fe9799e7a4c6bfac32e56cc91cfcd81088)
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__.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 a27512cc87..e2ceca0d86 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1431,7 +1431,7 @@ class FetchMethod(object): | |||
1431 | if urlpath.find("/") != -1: | 1431 | if urlpath.find("/") != -1: |
1432 | destdir = urlpath.rsplit("/", 1)[0] + '/' | 1432 | destdir = urlpath.rsplit("/", 1)[0] + '/' |
1433 | bb.utils.mkdirhier("%s/%s" % (unpackdir, destdir)) | 1433 | bb.utils.mkdirhier("%s/%s" % (unpackdir, destdir)) |
1434 | cmd = 'cp -fpPR %s %s' % (file, destdir) | 1434 | cmd = 'cp -fpPRH %s %s' % (file, destdir) |
1435 | 1435 | ||
1436 | if not cmd: | 1436 | if not cmd: |
1437 | return | 1437 | return |