summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-09-24 11:56:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-25 15:27:38 +0100
commit118da1708c5168a82be0a0724a2db6243eb61ba1 (patch)
tree4354a849d5110ba930c62fe5daec50a52cb96306 /meta
parente377f2bc5fd1f03556da10973fb6945de34c7e9a (diff)
downloadpoky-118da1708c5168a82be0a0724a2db6243eb61ba1.tar.gz
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. (From OE-Core rev: 8ab7b681cdb43c6c21c187b8cd01faa39727824a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/attr/acl_2.2.51.bb2
-rw-r--r--meta/recipes-support/attr/attr_2.4.46.bb2
-rw-r--r--meta/recipes-support/attr/ea-acl.inc17
3 files changed, 19 insertions, 2 deletions
diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 18aac7c3e7..40ba5f119f 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@
1require acl.inc 1require acl.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267" 5SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
6SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225" 6SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index fe8ab791f8..85c35d0c33 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@
1require attr.inc 1require attr.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010" 5SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
6SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f" 6SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 2ef138957e..22d7848fbf 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -35,3 +35,20 @@ BBCLASSEXTEND = "native"
35# Only append ldflags for target recipe and if USE_NLS is enabled 35# Only append ldflags for target recipe and if USE_NLS is enabled
36LDFLAGS_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')]}" 36LDFLAGS_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')]}"
37EXTRA_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')]}" 37EXTRA_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')]}"
38
39fix_symlink () {
40 # Remove bad symlinks & create the correct symlinks
41 if test -L ${libdir}/lib${BPN}.so ; then
42 rm -rf ${libdir}/lib${BPN}.so
43 ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
44 fi
45 if test -L ${base_libdir}/lib${BPN}.a ; then
46 rm -rf ${base_libdir}/lib${BPN}.a
47 ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
48 fi
49 if test -L ${base_libdir}/lib${BPN}.la ; then
50 rm -rf ${base_libdir}/lib${BPN}.la
51 ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
52 fi
53}
54SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink"