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 <[email protected]> --- 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(-) delete mode 120000 meta/recipes-support/libcap-ng/libcap-ng rename meta/recipes-support/libcap-ng/{libcap-ng-python => libcap-ng}/python.patch (100%) diff --git a/meta/recipes-support/libcap-ng/libcap-ng b/meta/recipes-support/libcap-ng/libcap-ng deleted file mode 120000 index fb7744d2932..00000000000 --- 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 e49b445f570..43f76dc561a 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 -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
