From 7e5e785ed4587a1757b965a088f7fcd41435a8bb Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 19:32:18 -0700 Subject: [PATCH 1/5] fix(sys-apps/baselayout): Replace cros-tmpfiles with systemd-tmpfiles --- ....0.0-r8.ebuild => baselayout-3.0.0-r9.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 16 ++++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0-r8.ebuild => baselayout-3.0.0-r9.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r9.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 338b9364c4..bfff362158 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -13,7 +13,7 @@ else KEYWORDS="amd64 arm x86" fi -inherit cros-workon cros-tmpfiles eutils multilib systemd +inherit cros-workon eutils multilib systemd DESCRIPTION="Filesystem baselayout for CoreOS" HOMEPAGE="http://www.coreos.com/" @@ -24,7 +24,8 @@ SLOT="0" IUSE="cros_host symlink-usr" # This version of baselayout replaces coreos-base -DEPEND="!coreos-base/coreos-base +DEPEND="sys-apps/systemd + !coreos-base/coreos-base ! Date: Tue, 18 Mar 2014 19:41:56 -0700 Subject: [PATCH 2/5] fix(app-misc/ca-certificates): Replace cros-tmpfiles with systemd-tmpfiles --- .../ca-certificates/ca-certificates-3.15.5-r1.ebuild | 1 + .../app-misc/ca-certificates/ca-certificates-3.15.5.ebuild | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5-r1.ebuild new file mode 120000 index 0000000000..223435a0af --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5-r1.ebuild @@ -0,0 +1 @@ +ca-certificates-3.15.5.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5.ebuild index 3b78ac4b7a..a8bc9357c9 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.15.5.ebuild @@ -3,7 +3,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit cros-tmpfiles python-any-r1 systemd +inherit python-any-r1 systemd RTM_NAME="NSS_${PV//./_}_RTM" MY_PN="nss" @@ -21,7 +21,8 @@ KEYWORDS="amd64" IUSE="" RDEPEND="dev-libs/openssl - sys-apps/findutils" + sys-apps/findutils + sys-apps/systemd" DEPEND="${RDEPEND} ${PYTHON_DEPS}" @@ -53,6 +54,6 @@ src_install() { # Setup initial links in /etc dodir /etc/ssl/certs - tmpfiles_create + systemd-tmpfiles --root="${D}" --create bash "${FILESDIR}/update-ca-certificates" "${D}/etc/ssl/certs" || die } From 62cbeb9645097b5b96c4588f59c07560f1d7fe55 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 19:42:55 -0700 Subject: [PATCH 3/5] remove(cros-tmpfiles.eclass): Replaced by new systemd-tmpfiles --- .../eclass/cros-tmpfiles.eclass | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/cros-tmpfiles.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-tmpfiles.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-tmpfiles.eclass deleted file mode 100644 index 3f180e1f29..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-tmpfiles.eclass +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2014 The CoreOS Authors -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: cros-tmpfiles -# @AUTHOR: marineam -# @BLURB: A basic systemd-tmpfiles --create implementation for ebuilds. -# @DESCRIPTION: -# Any location that is outside of /usr must be initialized during the build -# and (re)created during boot if it is missing. To avoid duplicating -# definitions of these directories/symlinks in ebuilds and tmpfiles configs -# packages can instead only install a tmpfiles config and use this eclass to -# create teh paths in an ebuild friendly way. -# -# Note: in the future if we add a --root option to systemd-tmpfiles we can -# switch to calling that instead of using this simplified implementation. - -# Enforce use of recent EAPIs for the sake of consistancy/sanity -case "${EAPI:-0}" in - 0|1|2|3) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - 4|5) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; -esac - -# Since bash doesn't have a slick syntax for subsituting default values -# for anything other than blank vs. non-blank variables this helps. -# Usage: _tmpfiles_set_defaults mode uid gid age arg -_tmpfiles_do_file() { - [[ ${tmode} == - ]] && tmode=0644 - if [[ "${ttype}" == F ]]; then - rm -rf "${ED}/${tpath}" - elif [[ -e "${ED}/${tpath}" ]]; then - return 0 - fi - if [[ "${targ}" != - ]]; then - echo "${targ}" > "${ED}/${tpath}" || return 1 - else - echo -n > "${ED}/${tpath}" || return 1 - fi - chmod "${tmode}" "${ED}/${tpath}" || return 1 - chown "${tuid}:${tgid}" "${ED}/${tpath}" || return 1 -} - -_tmpfiles_do_dir() { - [[ ${tmode} == - ]] && tmode=0755 - if [[ "${ttype}" == d && -e "${ED}/${tpath}" ]]; then - return 0 - else - rm -rf "${ED}/${tpath}" - fi - mkdir -m "${tmode}" "${ED}/${tpath}" || return 1 - chown "${tuid}:${tgid}" "${ED}/${tpath}" || return 1 -} - -_tmpfiles_do_link() { - if [[ -e "${ED}/${tpath}" || -h "${ED}/${tpath}" ]]; then - return 0 - fi - ln -s "${targ}" "${ED}/${tpath}" || return 1 -} - -_tmpfiles_do_create() { - local ttype tpath tmode tuid tgid tage targ trule - while read ttype tpath tmode tuid tgid tage targ; do - trule="$ttype $tpath $tmode $tuid $tgid $tage $targ" - [[ "${tuid}" == - ]] && tuid=root - [[ "${tgid}" == - ]] && tgid=root - case "${ttype}" in - f|F) _tmpfiles_do_file;; - d|D) _tmpfiles_do_dir;; - L) _tmpfiles_do_link;; - *) ewarn "Skipping tmpfiles rule: ${trule}";; - esac - if [[ $? -ne 0 ]]; then - eerror "Bad tmpfiles rule: ${trule}" - return 1 - fi - done -} - -tmpfiles_create() { - if [[ $# -eq 0 ]]; then - set -- "${ED}"/usr/lib*/tmpfiles.d/*.conf - fi - local conf - for conf in "$@"; do - _tmpfiles_do_create < "${conf}" || die "Bad tmpfiles config: ${conf}" - done -} From ca186261af07bd979d4889a7b98a467b639c608c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 19:48:18 -0700 Subject: [PATCH 4/5] fix(sys-kernel/bootengine): Add explicit sub-slot This allows coreos-kernel to use a slot depend operator to force a kernel rebuild every time the bootengine version changes even if bootengine got build in a different emerge job. --- .../src/third_party/coreos-overlay/eclass/cros-kernel2.eclass | 2 +- ...ootengine-0.0.1-r28.ebuild => bootengine-0.0.1-r29.ebuild} | 0 .../sys-kernel/bootengine/bootengine-9999.ebuild | 4 ++-- ...kernel-3.13.6-r2.ebuild => coreos-kernel-3.13.6-r3.ebuild} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.1-r28.ebuild => bootengine-0.0.1-r29.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.13.6-r2.ebuild => coreos-kernel-3.13.6-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass index b9905d285b..d7f771c080 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass @@ -11,7 +11,7 @@ SLOT="0/${PVR}" DEPEND="sys-apps/debianutils sys-devel/bc - sys-kernel/bootengine + sys-kernel/bootengine:= " IUSE="-source symlink-usr" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r28.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r29.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r28.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r29.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index c38d5aa636..9042735562 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=5 CROS_WORKON_PROJECT="coreos/bootengine" CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_OUTOFTREE_BUILD=1 @@ -20,7 +20,7 @@ DESCRIPTION="CoreOS Bootengine" SRC_URI="" LICENSE="BSD" -SLOT="0" +SLOT="0/${PVR}" DEPEND=" app-arch/gzip diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r3.ebuild From fb3a1eb6d2d063921699d455e8a0cbcf9d08cbaa Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 20:06:56 -0700 Subject: [PATCH 5/5] bump(sys-kernel/bootengine): Fix fs initialization --- ...{bootengine-0.0.1-r29.ebuild => bootengine-0.0.1-r30.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.1-r29.ebuild => bootengine-0.0.1-r30.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r29.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r30.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r29.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r30.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 9042735562..e5dae872b4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="a9975b9e125c722a0f9f534b1649104c79413d01" + CROS_WORKON_COMMIT="35a0a6963b6958c2a5b370b765d772b0576fd875" KEYWORDS="amd64 arm x86" fi