[PATCH 0/1] libcap-ng: do not use symlink to share files with libcap-ng-python

[PATCH 0/1] libcap-ng: do not use symlink to share files with libcap-ng-python

[Paul Eggleton]

The following changes since commit 1f8a73261c7a134821c40845da27d8edbb0763b6:

  Revert "pigz: Add debug for autobuilder errors" (2019-06-30 23:33:12 +0100)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/libcap-ng-symlink-fix
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/libcap-ng-symlink-fix

Paul Eggleton (1):
  libcap-ng: do not use symlink to share files with libcap-ng-python

 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%)

-- 
2.20.1

[PATCH 1/1] libcap-ng: do not use symlink to share files with libcap-ng-python

[Paul Eggleton]

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>
---
 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