From 6b37a812fbbd7aef123089ddee2182037154fc32 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Mar 2014 11:58:48 -0700 Subject: [PATCH] bump(coreos-base/update_engine): Support for /usr images --- .../update_engine-0.0.1-r381.ebuild | 1 - .../update_engine-0.0.1-r382.ebuild | 1 + .../update_engine/update_engine-0.0.1.ebuild | 109 ------------------ .../update_engine/update_engine-9999.ebuild | 22 +++- 4 files changed, 19 insertions(+), 114 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r381.ebuild create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r382.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r381.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r381.ebuild deleted file mode 120000 index 1fbe8cd87b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r381.ebuild +++ /dev/null @@ -1 +0,0 @@ -update_engine-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r382.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r382.ebuild new file mode 120000 index 0000000000..a0bfb1ef67 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r382.ebuild @@ -0,0 +1 @@ +update_engine-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild deleted file mode 100644 index 358c91dad1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="388aff6fdb0f8c58a31eb6b00ac3810d11046c27" -CROS_WORKON_PROJECT="coreos/update_engine" -CROS_WORKON_REPO="git://github.com" - -inherit toolchain-funcs cros-debug cros-workon scons-utils systemd - -DESCRIPTION="Chrome OS Update Engine" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="cros_host -delta_generator" - -LIBCHROME_VERS="180609" - -RDEPEND="app-arch/bzip2 - coreos-base/coreos-ca-certificates - coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - coreos-base/libchromeos - coreos-base/metrics - coreos-base/verity - dev-cpp/gflags - dev-libs/dbus-glib - dev-libs/glib - dev-libs/libpcre - dev-libs/libxml2 - dev-libs/openssl - dev-libs/protobuf - dev-util/bsdiff - net-misc/curl - sys-apps/rootdev - sys-fs/e2fsprogs - virtual/udev" -DEPEND="coreos-base/system_api - dev-cpp/gmock - dev-cpp/gtest - cros_host? ( dev-util/scons ) - ${RDEPEND}" - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - export CCFLAGS="$CFLAGS" - export BASE_VER=${LIBCHROME_VERS} - - escons -} - -src_test() { - UNITTESTS_BINARY=update_engine_unittests - TARGETS="${UNITTESTS_BINARY} test_http_server delta_generator" - escons ${TARGETS} - - if ! use x86 && ! use amd64 ; then - einfo "Skipping tests on non-x86 platform..." - else - # We need to set PATH so that the `openssl` in the target - # sysroot gets executed instead of the host one (which is - # compiled differently). http://crosbug.com/27683 - PATH="$SYSROOT/usr/bin:$PATH" \ - "./${UNITTESTS_BINARY}" --gtest_filter='-*.RunAsRoot*' \ - && einfo "./${UNITTESTS_BINARY} (unprivileged) succeeded" \ - || die "./${UNITTESTS_BINARY} (unprivileged) failed, retval=$?" - sudo LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="$SYSROOT/usr/bin:$PATH" \ - "./${UNITTESTS_BINARY}" --gtest_filter='*.RunAsRoot*' \ - && einfo "./${UNITTESTS_BINARY} (root) succeeded" \ - || die "./${UNITTESTS_BINARY} (root) failed, retval=$?" - fi -} - -src_install() { - dosbin "${FILESDIR}"/update_engine_reboot_manager - systemd_dounit "${FILESDIR}"/update-engine-reboot-manager.service - systemd_enable_service multi-user.target update-engine-reboot-manager.service - - dosbin update_engine - dobin update_engine_client - - use delta_generator && dobin delta_generator - - systemd_dounit "${FILESDIR}"/update-engine.service - systemd_enable_service multi-user.target update-engine.service - - insinto /usr/share/dbus-1/services - doins org.chromium.UpdateEngine.service - - insinto /usr/share/dbus-1/system.d - doins UpdateEngine.conf - - insinto /lib/udev/rules.d - doins 99-gpio-dutflag.rules - - insinto /usr/include/chromeos/update_engine - doins update_engine.dbusserver.h - doins update_engine.dbusclient.h - - # PXE - exeinto /usr/lib/coreos/ - doexe "${S}"/pxe/pxe_update_engine - systemd_dounit "${S}"/pxe/pxe-update-engine.service - systemd_dounit "${S}"/pxe/pxe-update-engine.timer - systemd_enable_service default.target pxe-update-engine.timer -} 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 e08d63b7ce..6bbf8e6f50 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 @@ -5,6 +5,13 @@ EAPI="4" CROS_WORKON_PROJECT="coreos/update_engine" CROS_WORKON_REPO="git://github.com" +if [[ "${PV}" == 9999 ]]; then + KEYWORDS="~amd64 ~arm ~x86" +else + CROS_WORKON_COMMIT="751a28659ea1f4fcbcdc3da5b17d6fa805c1eec6" + KEYWORDS="amd64 arm x86" +fi + inherit toolchain-funcs cros-debug cros-workon scons-utils systemd DESCRIPTION="Chrome OS Update Engine" @@ -13,12 +20,12 @@ SRC_URI="" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cros_host -delta_generator" +IUSE="cros_host -delta_generator symlink-usr" LIBCHROME_VERS="180609" -RDEPEND="app-arch/bzip2 +RDEPEND="!coreos-base/coreos-installer + app-arch/bzip2 coreos-base/coreos-ca-certificates coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] coreos-base/libchromeos @@ -33,7 +40,6 @@ RDEPEND="app-arch/bzip2 dev-libs/protobuf dev-util/bsdiff net-misc/curl - sys-apps/rootdev sys-fs/e2fsprogs virtual/udev" DEPEND="coreos-base/system_api @@ -81,6 +87,14 @@ src_install() { dosbin update_engine dobin update_engine_client + dosbin coreos-postinst + dosbin coreos-setgoodroot + if use symlink-usr; then + dosym sbin/coreos-postinst /usr/postinst + else + dosym usr/sbin/coreos-postinst /postinst + fi + use delta_generator && dobin delta_generator systemd_dounit "${FILESDIR}"/update-engine.service