[oe-commits] [openembedded-core] 02/15: libcap-ng: do not use symlink to share files with libcap-ng-python
git at git.openembedded.org
git at git.openembedded.org
Tue Jul 2 21:01:50 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit cb6f8e7cb4f18f7914bc665eaba058bc337fcee5
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Jul 2 14:35:55 2019 +1200
libcap-ng: do not use symlink to share files with libcap-ng-python
I'm not sure what's going on but having this symlink present is causing
git problems rebasing just by being present; deleting it and checking it
out again does not fix it. In any event this is not the standard way of
sharing files between recipes in the same directory - extending
FILESEXTRAPATHS is, so use that method instead.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-support/libcap-ng/libcap-ng | 1 -
meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb | 2 ++
.../libcap-ng/{libcap-ng-python => libcap-ng}/python.patch | 0
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/libcap-ng/libcap-ng b/meta/recipes-support/libcap-ng/libcap-ng
deleted file mode 120000
index fb7744d..0000000
--- a/meta/recipes-support/libcap-ng/libcap-ng
+++ /dev/null
@@ -1 +0,0 @@
-libcap-ng-python
\ No newline at end of file
diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb
index e49b445..43f76dc 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb
+++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb
@@ -1,5 +1,7 @@
require libcap-ng.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:"
+
SUMMARY .= " - python"
inherit lib_package autotools python3native
diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng-python/python.patch
rename to meta/recipes-support/libcap-ng/libcap-ng/python.patch
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list