From cb3d2044648db76e4d361bcf1e5a52a4220fa3c9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 25 Aug 2013 01:28:33 -0400 Subject: [PATCH 1/2] fix(sys-apps/util-linux): Do not exclude the unshare utility. It is required to run cros_sdk. --- .../coreos-overlay/coreos/config/env/sys-apps/util-linux | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/util-linux b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/util-linux index cfe4f9605d..201cfb9643 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/util-linux +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/util-linux @@ -27,9 +27,5 @@ util_linux_mask+=" /usr/sbin/tunelp " -if [[ $(cros_target) != "cros_host" ]] ; then - util_linux_mask+=" /usr/bin/unshare" -fi - PKG_INSTALL_MASK+=" ${util_linux_mask}" INSTALL_MASK+=" ${util_linux_mask}" From 4acf09c5aac60550930b8a2e180615f2aacd2b7e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 25 Aug 2013 16:44:34 -0400 Subject: [PATCH 2/2] fix(coreos-base/coreos-dev): Remove tpm-tools and opencryptoki from dev. opencryptoki sometimes fails to build by trying to install something to /var/lock which is a symlink to /run but the SDK makes no promise that /run is mounted and populated. Instead of fixing the ebuild just drop it and tpm-tools which depends on it since we don't actually need them. --- ...{coreos-dev-0.1.0-r64.ebuild => coreos-dev-0.1.0-r65.ebuild} | 0 .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 1 - .../coreos-overlay/profiles/targets/coreos/package.use | 2 -- 3 files changed, 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r64.ebuild => coreos-dev-0.1.0-r65.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r64.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r65.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r64.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r65.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index 0ed5be82ce..4424042449 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -37,7 +37,6 @@ RDEPEND="${RDEPEND} app-arch/gzip app-arch/tar dev-libs/nss - app-crypt/tpm-tools app-editors/vim app-misc/evtest app-shells/bash diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use index a302e2e791..e4f55a738c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use @@ -3,7 +3,6 @@ app-admin/rsyslog -ssl app-benchmarks/i7z -X -app-crypt/tpm-tools pkcs11 app-i18n/zinnia -perl app-editors/qemacs -X app-editors/vim minimal @@ -13,7 +12,6 @@ dev-libs/dbus-glib tools dev-libs/elfutils -utils dev-libs/glib -doc dev-libs/nss -utils -dev-libs/opencryptoki tpmtok dev-libs/opensc ssl -pcsc-lite dev-libs/openssl pkcs11 dev-libs/protobuf python