From 8c7d5121301370178fd0e253c7e643b700d66c8d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Jun 2013 14:59:29 -0400 Subject: [PATCH 1/4] fix(coreos-base/*): Replace sys-fs/udev with virtual/udev In preparation for systemd 204 which provides udev itself we need to stop depending directly on the stand-alone udev package. --- .../coreos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild | 2 +- .../coreos-base/autotest-deps/autotest-deps-0.0.1-r3550.ebuild | 2 +- .../coreos-base/autotest-deps/autotest-deps-9999.ebuild | 2 +- .../autotest-tests/autotest-tests-0.0.1-r3634.ebuild | 2 +- .../autotest-tests/autotest-tests-0.0.1-r3635.ebuild | 2 +- .../coreos-base/autotest-tests/autotest-tests-9999.ebuild | 2 +- .../chromeos-installshim/chromeos-installshim-0.0.1.ebuild | 2 +- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- .../coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild | 2 +- .../coreos-base/cros-disks/cros-disks-9999.ebuild | 2 +- .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- .../coreos-base/update_engine/update_engine-0.0.1-r367.ebuild | 2 +- .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild index 7279dd9e13..af5e0503ad 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3549.ebuild @@ -59,7 +59,7 @@ RDEPEND="${RDEPEND} # deps/fakegudev RDEPEND="${RDEPEND} - sys-fs/udev[gudev] + virtual/udev[gudev] " # deps/fakemodem diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3550.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3550.ebuild index 92b8125641..963eae454e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3550.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-0.0.1-r3550.ebuild @@ -59,7 +59,7 @@ RDEPEND="${RDEPEND} # deps/fakegudev RDEPEND="${RDEPEND} - sys-fs/udev[gudev] + virtual/udev[gudev] " # deps/fakemodem diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-9999.ebuild index 27494d9032..5faea49e9b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps/autotest-deps-9999.ebuild @@ -57,7 +57,7 @@ RDEPEND="${RDEPEND} # deps/fakegudev RDEPEND="${RDEPEND} - sys-fs/udev[gudev] + virtual/udev[gudev] " # deps/fakemodem diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3634.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3634.ebuild index d5290e7b23..1c2e8e9c8e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3634.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3634.ebuild @@ -58,7 +58,7 @@ RDEPEND=" RDEPEND="${RDEPEND} tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) - tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) + tests_platform_RootPartitionsNotMounted? ( virtual/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) " diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3635.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3635.ebuild index a8c85931c3..7fdf165b2a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3635.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-0.0.1-r3635.ebuild @@ -58,7 +58,7 @@ RDEPEND=" RDEPEND="${RDEPEND} tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) - tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) + tests_platform_RootPartitionsNotMounted? ( virtual/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) " diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-9999.ebuild index 3c24466e58..6f26fcf864 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-tests/autotest-tests-9999.ebuild @@ -56,7 +56,7 @@ RDEPEND=" RDEPEND="${RDEPEND} tests_platform_RootPartitionsNotMounted? ( sys-apps/rootdev ) - tests_platform_RootPartitionsNotMounted? ( sys-fs/udev ) + tests_platform_RootPartitionsNotMounted? ( virtual/udev ) tests_hardware_TPMFirmware? ( chromeos-base/tpm_lite ) " diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild index d7b9095777..0b67f8244f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/chromeos-installshim/chromeos-installshim-0.0.1.ebuild @@ -52,10 +52,10 @@ RDEPEND=" sys-apps/which sys-auth/pam_pwdfile sys-fs/e2fsprogs - sys-fs/udev sys-process/lsof sys-process/procps virtual/chromeos-bsp + virtual/udev " S=${WORKDIR} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index e36a8c0bb3..8d9ae0923b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -157,12 +157,12 @@ RDEPEND="${RDEPEND} sys-apps/util-linux sys-auth/pam_pwdfile sys-fs/e2fsprogs - sys-fs/udev sys-libs/timezone-data sys-process/lsof sys-process/procps app-emulation/docker app-misc/ca-certificates + virtual/udev " # TODO(dianders): diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild index a9689d0662..12fa2a955a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-0.0.1-r156.ebuild @@ -34,7 +34,7 @@ RDEPEND=" sys-fs/avfs sys-fs/fuse-exfat sys-fs/ntfs3g - sys-fs/udev + virtual/udev " DEPEND="${RDEPEND} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild index f63ffd79ff..6710e9678e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-disks/cros-disks-9999.ebuild @@ -32,7 +32,7 @@ RDEPEND=" sys-fs/avfs sys-fs/fuse-exfat sys-fs/ntfs3g - sys-fs/udev + virtual/udev " DEPEND="${RDEPEND} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index ad34864743..6ef379fb64 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -101,9 +101,9 @@ RDEPEND="${RDEPEND} =sys-devel/automake-1.10* sys-devel/clang sys-fs/sshfs-fuse - sys-fs/udev sys-libs/libnih sys-power/iasl + virtual/udev " # Host dependencies that create usernames/groups we need to pull over to target. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild index 7dcf65d102..c9c9e9c873 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild @@ -37,7 +37,7 @@ RDEPEND="app-arch/bzip2 net-misc/curl sys-apps/rootdev sys-fs/e2fsprogs - sys-fs/udev" + virtual/udev" DEPEND="dev-cpp/gmock dev-cpp/gtest cros_host? ( dev-util/scons ) 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 cd6e9085ef..a4bad85dc9 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 @@ -35,7 +35,7 @@ RDEPEND="app-arch/bzip2 net-misc/curl sys-apps/rootdev sys-fs/e2fsprogs - sys-fs/udev" + virtual/udev" DEPEND="coreos-base/system_api dev-cpp/gmock dev-cpp/gtest From a6bf9c69682482cc1f5361c456a947f8cc938672 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Jun 2013 15:08:46 -0400 Subject: [PATCH 2/4] fix(coreos-base/coreos-base): Install systemd in SDK Adding systemd to base means it will be installed in the SDK in addition to built images. This should avoid potential confusion that may be caused by leaving sys-fs/udev in the SDK while it is removed from built images in favor of systemd 204. --- .../{coreos-base-0-r56.ebuild => coreos-base-0-r57.ebuild} | 0 .../coreos-base/coreos-base/coreos-base-0.ebuild | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r56.ebuild => coreos-base-0-r57.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r56.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r57.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r56.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r57.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 0fd3e13803..ceaa4f00e3 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 @@ -27,7 +27,9 @@ DEPEND="sys-apps/baselayout sys-libs/timezone-data !sys-apps/gawk )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + sys-apps/systemd + " # Remove entry from /etc/group # From bb918f040f6af29247c204f4c1faeadbc9387bd6 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Jun 2013 15:37:00 -0400 Subject: [PATCH 3/4] hack(sys-apps/openrc): Mark as provided in the SDK We don't need openrc in the SDK either so move the package.provided entry to the default profile instead of just the coreos target. --- .../coreos-overlay/profiles/default/linux/package.provided | 4 ++++ .../coreos-overlay/profiles/targets/coreos/package.provided | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided index 7e87b34be8..9cb0c2094b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided @@ -5,3 +5,7 @@ # even a simple mta (like ssmtp). http://crosbug.com/5777 mail-mta/ssmtp-2.64 net-mail/mailbase-1 + +# Ideally baselayout should have a use flag to select between openrc +# and systemd but this works in the mean time. +sys-apps/openrc-9999 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.provided index 48304fb61a..c6c0cd8179 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.provided @@ -81,4 +81,3 @@ media-fonts/encodings-1.0.3 # Our chromeos-base package takes care of this. app-misc/editor-wrapper-4 -sys-apps/openrc-0.11.8 From 66092129ba2d98b5b32374f669dd86b7eaade6fa Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Jun 2013 19:05:57 -0400 Subject: [PATCH 4/4] bump(sys-apps/systemd): unmask systemd-204 Booted! Ship it! --- .../profiles/default/linux/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords index a72d6a1963..c4277dac2d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords @@ -67,6 +67,7 @@ # Accept the unstable nature of systemd =sys-apps/systemd-197-r1 ~amd64 +=sys-apps/systemd-204 ~amd64 =sys-apps/systemd-sysv-utils-194 ~amd64 =sys-apps/dbus-1.6.8-r1 ~amd64