Merge pull request #741 from marineam/systemd

Fixes for systemd 215
This commit is contained in:
Michael Marineau 2014-07-14 16:42:14 -07:00
commit 29938ad7b9
8 changed files with 2 additions and 6 deletions

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="41ac91ba0a1fecf915a464927919380bd4694200"
CROS_WORKON_COMMIT="36ec76f699616de505c1c6c12be228b9d662f995"
KEYWORDS="amd64 arm x86"
fi

View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="fb3ab27fd28ebd8d8fb9515443d9f21d9e4b2249"
CROS_WORKON_COMMIT="5d78024bbbe619aaecdf6c568409bcaaa461f65f"
KEYWORDS="amd64 arm x86"
fi

View File

@ -6,4 +6,3 @@ d /etc/systemd/network - - - - -
d /etc/systemd/system - - - - -
d /etc/systemd/user - - - - -
d /etc/tmpfiles.d - - - - -
d /var/lib/systemd - - - - -

View File

@ -1 +0,0 @@
L /etc/resolv.conf - - - - /run/systemd/resolve/resolv.conf

View File

@ -361,7 +361,6 @@ multilib_src_install_all() {
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
# Don't default to graphical.target
rm "${D}"/usr/lib/systemd/system/default.target || die

View File

@ -352,7 +352,6 @@ multilib_src_install_all() {
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
# Don't default to graphical.target
rm "${D}"/usr/lib/systemd/system/default.target || die