From 07d7b41010786b61ddd385693ef113ef6b54b0b4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 8 May 2014 12:03:56 -0700 Subject: [PATCH 1/3] bump(coreos-base/coreos-init): Remove old coreos-startup target --- ...s-init-0.0.1-r81.ebuild => coreos-init-0.0.1-r82.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r81.ebuild => coreos-init-0.0.1-r82.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r81.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r82.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r81.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r82.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 a5d9a2055d..bf597b22cd 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="8ccfc852d2aa974f2efa75e0f676013066970138" + CROS_WORKON_COMMIT="f395357a5f28043c9ed8c50bdf6391cad4421552" KEYWORDS="amd64 arm x86" fi @@ -46,8 +46,9 @@ src_install() { emake DESTDIR="${D}" install # Basic system startup - systemd_enable_service basic.target coreos-startup.target systemd_enable_service local-fs.target remount-root.service + systemd_enable_service local-fs.target media.mount + systemd_enable_service local-fs.target usr-share-oem.mount systemd_enable_service default.target resize-btrfs.service systemd_enable_service default.target ldsocache.service @@ -56,5 +57,6 @@ src_install() { systemd_enable_service default.target sshd.socket systemd_enable_service default.target ssh-key-proc-cmdline.service systemd_enable_service sockets.target docker.socket + systemd_enable_service default.target issuegen.service systemd_enable_service default.target motdgen.service } From 5895a79d7d90b4eab8697036f9e2679a3cb46add Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 8 May 2014 12:05:05 -0700 Subject: [PATCH 2/3] bump(coreos-base/update_engine): remove reference to reboot manager --- .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index ca0db3cf2d..dabe17fffb 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="ee3e9a2c0f101717ab3fb824acfb4433a95cedbd" + CROS_WORKON_COMMIT="d81fa01ca4101375e8168d9245e7950109a0efa2" KEYWORDS="amd64 arm x86" fi From cfe885b60bb3fd7ff2f67d930606261714d65e3d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 8 May 2014 12:06:50 -0700 Subject: [PATCH 3/3] bump(app-admin/locksmith): Disable locksmith on systems that don't update --- .../{locksmith-0.1.0-r5.ebuild => locksmith-0.1.0-r6.ebuild} | 0 .../coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/{locksmith-0.1.0-r5.ebuild => locksmith-0.1.0-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.0-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild index 24893885fe..51f7025aec 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="2d286e81688ad5acdd3d7c706a4d9edb15269eb2" + CROS_WORKON_COMMIT="6d766b8b6aa5c1fd1ec3a0862ca398577a61ad0d" KEYWORDS="amd64" fi