diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2019-07-02 11:19:35 +1200 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2019-07-02 14:34:21 +1200 |
commit | 92af034e880026ec17f9b05f886e38ebfe0d5526 (patch) | |
tree | ed882b665818dbe16afcf003fab928e4ea3abc69 | |
parent | 1f8a73261c7a134821c40845da27d8edbb0763b6 (diff) | |
download | openembedded-core-contrib-paule/libcap-ng-symlink-fix.tar.gz |
libcap-ng: do not use symlink to share files with libcap-ng-pythonpaule/libcap-ng-symlink-fix
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@linux.intel.com>
l--------- | meta/recipes-support/libcap-ng/libcap-ng | 1 | ||||
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng-python_0.7.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng/python.patch (renamed from meta/recipes-support/libcap-ng/libcap-ng-python/python.patch) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-support/libcap-ng/libcap-ng b/meta/recipes-support/libcap-ng/libcap-ng deleted file mode 120000 index fb7744d293..0000000000 --- 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 e49b445f57..43f76dc561 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 index d60a0a39b6..d60a0a39b6 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng-python/python.patch +++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch |