From e0b84a498162518f5b15f316e80a4a2c3305d08f Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Tue, 21 Jan 2014 18:55:01 -0800 Subject: [PATCH] usr(systemd-dbus): point dbus related configs to /usr/share --- .../coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild | 2 +- .../coreos-overlay/sys-apps/systemd/systemd-207.ebuild | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild index e346c5f6ea..49b78c417d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild @@ -77,6 +77,7 @@ src_configure() { # libaudit is *only* used in DBus wrt SELinux support, so disable it, if # not on an SELinux profile. myconf=( + --sysconfdir=/usr/share --disable-silent-rules --localstatedir="${EPREFIX}/var" --docdir="${EPREFIX}/usr/share/doc/${PF}" @@ -155,7 +156,6 @@ src_install() { # needs to exist for dbus sessions to launch keepdir /usr/share/dbus-1/services - keepdir /etc/dbus-1/{session,system}.d # machine-id symlink from pkg_postinst() keepdir /var/lib/dbus diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild index 6530952611..dda8c75afd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild @@ -115,6 +115,8 @@ pkg_setup() { multilib_src_configure() { local myeconfargs=( + --with-pamconfdir=/usr/share/pam.d + --with-dbuspolicydir=/usr/share/dbus-1/system.d --localstatedir=/var --with-pamlibdir=$(getpam_mod_dir) # avoid bash-completion dep @@ -191,7 +193,6 @@ multilib_src_configure() { --disable-python-devel ) fi - # Work around bug 463846. tc-export CC