From f3674d3f4b692604c0042426a4403ec9bbbcff68 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 16 Apr 2014 14:00:02 -0700 Subject: [PATCH 1/2] feat(coreos-base/coreos-init): Added ldsocache.service This one-shot service is responsible for generating the ld.so cache --- ...reos-init-0.0.1-r75.ebuild => coreos-init-0.0.1-r76.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r75.ebuild => coreos-init-0.0.1-r76.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r75.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r76.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r75.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r76.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 0301c36870..9b582007f7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -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 From ee16b5f8ec819ca13ff2a303a864952927654441 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 16 Apr 2014 16:07:20 -0700 Subject: [PATCH 2/2] feat(sys-apps/baselayout): Adding new LD_PATH to env.d --- ...aselayout-3.0.0-r12.ebuild => baselayout-3.0.0-r13.ebuild} | 0 .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0-r12.ebuild => baselayout-3.0.0-r13.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r13.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r12.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r13.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 1c9c77ced3..995b6572b5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -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