From 9ddf0597b4ea40b4c2be2eb0f01f833b5ec23030 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 2 Jul 2019 14:35:55 +1200 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- 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 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 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.40.1