From f3e6563df0b0590a48dd565c985709af8e15deb0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 6 May 2014 11:55:43 -0700 Subject: [PATCH] fix(sys-apps/systemd): Stabilize linux headers 3.13 for systemd The currently systemd git only compiles against 3.10 headers or later. Looks like upstream Gentoo is going to stabilize 3.13 so go ahead and do jump ahead on that to make testing systemd easier. --- .../profiles/coreos/base/package.accept_keywords | 5 +++++ .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 80138ee0ec..3eafb47dbb 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -97,3 +97,8 @@ dev-util/checkbashisms # Includes fix for checking mount status of loop devices =sys-fs/btrfs-progs-3.14_pre20140414 + +# Current systemd git requires >= 3.10 to build, +# use 3.13 since Gentoo is starting to stabilize that one: +# https://bugs.gentoo.org/show_bug.cgi?id=507096 +=sys-kernel/linux-headers-3.13 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 2b1bc6cd20..b6ade5c8ca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -78,15 +78,13 @@ PDEPEND=">=sys-apps/dbus-1.6.8-r1:0 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" -# Newer linux-headers needed by ia64, bug #480218 DEPEND="${COMMON_DEPEND} app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 - >=sys-kernel/linux-headers-${MINKV} - ia64? ( >=sys-kernel/linux-headers-3.9 ) + >=sys-kernel/linux-headers-3.13 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[${PYTHON_USEDEP}] )