diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r64.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r65.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r64.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r65.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild index 9d3660a2bf..f3b886d870 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild @@ -128,6 +128,10 @@ src_install() { # Insert glibc's nsswitch.conf since that is installed weirdly doins "${FILESDIR}"/nsswitch.conf + # Insert a mini vimrc to avoid driving everyone insane + insinto /etc/vim + doins "${FILESDIR}"/vimrc + # Symlink /etc/localtime to something on the stateful partition, which we # can then change around at runtime. dosym /var/lib/timezone/localtime /etc/localtime || die diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc new file mode 100644 index 0000000000..dd436fcb36 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/vimrc @@ -0,0 +1,18 @@ +" Minimal configuration file for Vim on CoreOS +" +" The vim package is installed with USE=minimal to avoid installing lots of +" extra files but that doesn't mean we like vim acting as if it were vi. + +" General settings from Gentoo's default vimrc: +set nocompatible " Use Vim defaults (much better!) +set bs=2 " Allow backspacing over everything in insert mode +set ruler " Show the cursor position all the time +set nomodeline " We don't allow modelines by default + +" Read vimrc from the state partition if it exists. +if filereadable("/media/state/etc/vim/vimrc") + source /etc/vim/vimrc +endif +if filereadable("/media/state/etc/vim/vimrc.local") + source /etc/vim/vimrc.local +endif diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r15.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r13.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r15.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index 7adf9af103..fa32fb7b2a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="38505c2cd170420f0623564794063769a4147aa5" +CROS_WORKON_COMMIT="4146847b48b7d692f6b8ce50be07c886e7a85fc9" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" @@ -16,13 +16,16 @@ SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm x86" -IUSE="nfs" +IUSE="test" # Daemons we enable here must installed during build/install in addition to # during runtime so the systemd unit enable step works. DEPEND=" net-misc/dhcpcd net-misc/openssh + ! /dev/null); [ $? -ne 0 ]; - do sleep .5; done diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n deleted file mode 100755 index 0c91b65d1c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/coreos-c10n +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -VIRT=$(coreos-detect-virt) - -if [ "${VIRT}" != "ec2" ]; then - # all of this is currently dependent on ec2, we'll refactor as we add more images - exit 0 -fi - -C10N_ENDPOINT=https://core-api.appspot.com/v1/c10n/group -META_URL="http://169.254.169.254/latest" - -ETCD_BOOTSTRAP="/var/run/etcd/bootstrap.config" - -/usr/bin/block-until-url $C10N_ENDPOINT -/usr/bin/block-until-url $META_URL - -USER_DATA=$(curl -s --fail $META_URL/user-data) -if [ $? -eq 0 ] && [ ! -z "$USER_DATA" ]; then - URL=$USER_DATA - - echo $URL | grep -q '^https://' || (echo Coordination URL requires valid SSL; exit 1) - - TMP=`mktemp` - - curl -s "$USER_DATA/raw" > $TMP - - # validate ssh key - ssh-keygen -l -f $TMP > /dev/null 2>&1 - if [ $? -eq 0 ]; then - cat $TMP >> /home/core/.ssh/authorized_keys - echo "SSH key updated" - chown -R core: /home/core/.ssh/ - else - echo "Not a valid ssh key" - fi -fi - -IP=$(curl -s $META_URL/meta-data/local-ipv4) -curl -s $C10N_ENDPOINT -d "c10n_url=$URL" -d"ip_list=$IP" > $ETCD_BOOTSTRAP diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap index a1a5f7d1ee..49f0c1c276 100755 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap @@ -10,8 +10,6 @@ if [ "${VIRT}" != "ec2" ]; then exec /usr/bin/etcd -v -d $STATE fi -/usr/bin/coreos-c10n - META_URL="http://169.254.169.254/latest" MY_IP=$(curl -s $META_URL/meta-data/local-ipv4) BOOTSTRAP="/var/run/etcd/bootstrap.config" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service index 728b8609fd..6a65b7eed1 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service @@ -1,3 +1,8 @@ +[Unit] +Description=etcd +Wants=coreos-c10n.service +After=coreos-c10n.service + [Service] User=etcd PermissionsStartOnly=true diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig index d8dc877248..dc47feb2a2 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig @@ -552,6 +552,7 @@ CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y # CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y CONFIG_PCIE_ECRC=y # CONFIG_PCIEAER_INJECT is not set @@ -576,7 +577,11 @@ CONFIG_PCI_LABEL=y CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y # CONFIG_PCCARD is not set -# CONFIG_HOTPLUG_PCI is not set +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_RAPIDIO is not set # @@ -1008,7 +1013,9 @@ CONFIG_FIB_RULES=y # CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set # CONFIG_NFC is not set @@ -2538,6 +2545,8 @@ CONFIG_SUNRPC_DEBUG=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set +CONFIG_9P_FS=m +CONFIG_9P_FS_POSIX_ACL=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use index 8fe6e5994b..f896ae9c45 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use @@ -36,7 +36,7 @@ net-misc/dhcpcd -crash # this comment was here: # build kvm with X and sdl so we have an option of running it with local # display without VNC -app-emulation/qemu aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net vnc qemu_softmmu_targets_arm qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 +app-emulation/qemu aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net virtfs vnc xattr qemu_softmmu_targets_x86_64 dev-libs/libaio static-libs cross-armv7a-cros-linux-gnueabi/gcc hardfp cross-armv6j-cros-linux-gnueabi/gcc hardfp -thumb diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild index f1d2db86e1..26e8e0c371 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5-r2.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ EAPI=4 -CROS_WORKON_COMMIT="42e65fc40aa591e7a4446a6953e73eecbfbfb954" +CROS_WORKON_COMMIT="690868ea535f744ddc7bce065b2d566726a3e1c3" CROS_WORKON_REPO="git://github.com" CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_LOCALNAME="linux"