diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2019-07-02 14:35:55 +1200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-03 17:00:57 +0100 |
| commit | 4aef95e8d4fb7747408b3a29e6ec491b393b893e (patch) | |
| tree | d84759a26e226256d7bd32a7d6880744e880b36f /meta/recipes-support | |
| parent | 1c6b1f926c600a61dbccf9653591084357a2e740 (diff) | |
| download | openembedded-core-contrib-4aef95e8d4fb7747408b3a29e6ec491b393b893e.tar.gz | |
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.
(From OE-Core rev: 9ddf0597b4ea40b4c2be2eb0f01f833b5ec23030)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| 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 |