From 53d1cbd6feab0799d48ffe1c0293a6459e5c5d42 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 24 May 2016 15:28:13 -0700 Subject: [PATCH 1/2] sys-apps/systemd: re-enable compat libs for docker 1.10.3 journald support --- .../{docker-1.10.3-r3.ebuild => docker-1.10.3-r4.ebuild} | 0 .../{systemd-229-r105.ebuild => systemd-229-r106.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 6 ++++++ 3 files changed, 6 insertions(+) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.10.3-r3.ebuild => docker-1.10.3-r4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-229-r105.ebuild => systemd-229-r106.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-229-r105.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-229-r106.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-229-r105.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-229-r106.ebuild 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 f3c2cda76c..141d1b015d 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 @@ -323,6 +323,12 @@ multilib_src_install() { emake "${mymakeopts[@]}" fi + + # install compat pkg-config files + # Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped. + local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) + emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ + pkgconfiglib_DATA="${pcfiles[*]}" } multilib_src_install_all() { From a839a4370e7a85687a9713f986f2c890425fefdb Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 24 May 2016 15:29:43 -0700 Subject: [PATCH 2/2] app-emulation/docker: set journald build tag for read log support --- .../{docker-1.10.3-r4.ebuild => docker-1.10.3-r5.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.10.3-r4.ebuild => docker-1.10.3-r5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 857c1705df..d8e7d57641 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -23,7 +23,8 @@ DESCRIPTION="Docker complements kernel namespacing with a high-level API which o HOMEPAGE="https://dockerproject.org" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp +selinux vim-syntax zsh-completion" +IUSE="apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp + +selinux vim-syntax zsh-completion +journald" # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies CDEPEND=" @@ -34,6 +35,9 @@ CDEPEND=" seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) + journald? ( + >=sys-apps/systemd-225 + ) " #dev-go/go-md2man @@ -228,6 +232,9 @@ src_compile() { if use apparmor; then DOCKER_BUILDTAGS+=' apparmor' fi + if use journald; then + DOCKER_BUILDTAGS+=' journald' + fi if has_version '