Merge pull request #553 from crawford/ld.so

feat(ld.so): Moving ld.so configs to /usr
This commit is contained in:
Alex Crawford 2014-04-17 12:04:11 -07:00
commit a67e24ecc0
4 changed files with 5 additions and 2 deletions

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="953ceb97775dcd6ad500b4a47462afeec10e5b86"
CROS_WORKON_COMMIT="f9d7d2b10defb4669d6785d1e1791cbdda6249fd"
KEYWORDS="amd64 arm x86"
fi
@ -45,6 +45,7 @@ src_install() {
emake DESTDIR="${D}" install-usr
systemd_enable_service local-fs.target remount-root.service
systemd_enable_service default.target resize-btrfs.service
systemd_enable_service default.target ldsocache.service
else
emake DESTDIR="${D}" install
fi

View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="5ae4bccc0ebb6cc7c572ddfd5a647f146c24cabe"
CROS_WORKON_COMMIT="1f378ad0040e2f6f269a503df9c47f1966ed180d"
KEYWORDS="amd64 arm x86"
fi
@ -125,6 +125,8 @@ src_install() {
# Fill in all other paths defined in tmpfiles configs
tmpfiles_create
doenvd "env.d/99coreos_ldpath"
# handle multilib paths. do it here because we want this behavior
# regardless of the C library that you're using. we do explicitly
# list paths which the native ldconfig searches, but this isn't