[oe-commits] [openembedded-core] 04/04: Revert "base.bbclass wipe ${S} before unpacking source"
git at git.openembedded.org
git at git.openembedded.org
Tue Jul 12 22:11:28 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 76fb9f9048308cdc08120caa4176f4999863b46e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sun Jul 10 08:37:14 2016 +0100
Revert "base.bbclass wipe ${S} before unpacking source"
This reverts commit 7f25d8a35da0e2ee6a8011740bc4ad96bddc1761.
---
meta/classes/base.bbclass | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 9946db2..b90e9ce 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -136,15 +136,23 @@ python base_do_fetch() {
addtask unpack after do_fetch
do_unpack[dirs] = "${WORKDIR}"
-do_unpack[cleandirs] = "${@d.getVar('S', True) if d.getVar('S', True) != d.getVar('WORKDIR', True) else os.path.join(d.getVar('S', True), 'patches')}"
python base_do_unpack() {
src_uri = (d.getVar('SRC_URI', True) or "").split()
if len(src_uri) == 0:
return
+ rootdir = d.getVar('WORKDIR', True)
+
+ # Ensure that we cleanup ${S}/patches
+ # TODO: Investigate if we can remove
+ # the entire ${S} in this case.
+ s_dir = d.getVar('S', True)
+ p_dir = os.path.join(s_dir, 'patches')
+ bb.utils.remove(p_dir, True)
+
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
- fetcher.unpack(d.getVar('WORKDIR', True))
+ fetcher.unpack(rootdir)
except bb.fetch2.BBFetchException as e:
raise bb.build.FuncFailed(e)
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list