V2: Fix for bad links in sstate

PATCH New Saul Wold 1 participant 2 messages Sep 24, 2011

lore

Share & tools

lore

Saul Wold

author

2011-09-24 06:16 UTC #0 lore raw

cover V2: Fix for bad links in sstate

This fixes a problem found on the AB when sstate from one machine is used on by another machine.

Added test for file existense.

Sau!

The following changes since commit 368b150416688654e35229a63b87177b52e83d02:

populate_sdk_rpm: add pkgconfig(pkg-config) to the list (2011-09-23 19:55:43 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix

Saul Wold (1):
attr/acl: add SSTATEPOSTINSTFUNC

 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |   17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-24 06:16 UTC #1 lore raw

PATCH 1/1 attr/acl: add SSTATEPOSTINSTFUNC

Added a native sstate post install function to fix the links created between /lib and /usr/lib for the library files. These links could point to an invalid build area when using shared state.

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |   17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

meta/recipes-support/attr/acl_2.2.51.bb +1 -1

index 18aac7c..40ba5f1 100644
@@ -1,6 +1,6 @@
 require acl.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"

meta/recipes-support/attr/attr_2.4.46.bb +1 -1

index fe8ab79..85c35d0 100644
@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"

meta/recipes-support/attr/ea-acl.inc +17 -0

index 2ef1389..22d7848 100644
@@ -35,3 +35,20 @@ BBCLASSEXTEND = "native"
 # Only append ldflags for target recipe and if USE_NLS is enabled
 LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
 EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}"
+
+fix_symlink () {
+	# Remove bad symlinks & create the correct symlinks
+	if test -L ${libdir}/lib${BPN}.so ; then
+		rm -rf ${libdir}/lib${BPN}.so
+		ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
+	fi
+	if test -L ${base_libdir}/lib${BPN}.a ; then
+		rm -rf ${base_libdir}/lib${BPN}.a
+		ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
+	fi
+	if test -L  ${base_libdir}/lib${BPN}.la ; then
+		rm -rf ${base_libdir}/lib${BPN}.la
+		ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
+	fi
+}
+SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink"

Signature · 1 line

1.7.6