From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/2] attr/acl: add SSTATEPOSTINSTFUNC
Date: Sat, 24 Sep 2011 11:56:47 -0700 [thread overview]
Message-ID: <62e9da86a45eef3dd374bd8c7e110f619f620f80.1316890497.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1316890497.git.sgw@linux.intel.com>
In-Reply-To: <cover.1316890497.git.sgw@linux.intel.com>
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 <sgw@linux.intel.com>
---
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(-)
diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 18aac7c..40ba5f1 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 @@
require acl.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
SRC_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 fe8ab79..85c35d0 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 @@
require attr.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 2ef1389..22d7848 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -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"
--
1.7.6
next prev parent reply other threads:[~2011-09-24 19:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-24 18:56 [PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix Saul Wold
2011-09-24 18:56 ` Saul Wold [this message]
2011-10-04 15:36 ` [PATCH 1/2] attr/acl: add SSTATEPOSTINSTFUNC Phil Blundell
2011-10-05 17:45 ` Saul Wold
2011-10-05 18:32 ` Phil Blundell
2011-09-24 18:56 ` [PATCH 2/2] qemuimage-testlib: set a default geometry for xterm Saul Wold
2011-09-25 14:29 ` [PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix Richard Purdie
2011-09-25 17:07 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62e9da86a45eef3dd374bd8c7e110f619f620f80.1316890497.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox