From e02d6120cd85510463ab6b5ff7c5aca650cc6084 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 26 Feb 2014 20:30:37 -0800 Subject: [PATCH] bump(sys-apps/systemd) bump to 210 release Fixes first boot and journald issues for me. --- .../209-pkg-config-compat-libs-always.patch | 51 ------------------- ...stemd-209-r1.ebuild => systemd-210.ebuild} | 2 - 2 files changed, 53 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/209-pkg-config-compat-libs-always.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-209-r1.ebuild => systemd-210.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/209-pkg-config-compat-libs-always.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/209-pkg-config-compat-libs-always.patch deleted file mode 100644 index b6abe29b8f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/209-pkg-config-compat-libs-always.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ru systemd-209/Makefile.am systemd-209-modified/Makefile.am ---- systemd-209/Makefile.am 2014-02-20 00:55:28.982451923 +0100 -+++ systemd-209-modified/Makefile.am 2014-02-20 19:23:53.715184928 +0100 -@@ -4429,13 +4429,6 @@ - libsystemd-login.la \ - libsystemd-id128.la \ - libsystemd-daemon.la -- --pkgconfiglib_DATA += \ -- src/compat-libs/libsystemd-journal.pc \ -- src/compat-libs/libsystemd-login.pc \ -- src/compat-libs/libsystemd-id128.pc \ -- src/compat-libs/libsystemd-daemon.pc -- - # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed - compat-lib-install-hook: - libname=libsystemd-login.so && $(move-to-rootlibdir) -@@ -4452,6 +4445,13 @@ - - endif - -+pkgconfiglib_DATA += \ -+ src/compat-libs/libsystemd-journal.pc \ -+ src/compat-libs/libsystemd-login.pc \ -+ src/compat-libs/libsystemd-id128.pc \ -+ src/compat-libs/libsystemd-daemon.pc -+ -+ - EXTRA_DIST += \ - src/compat-libs/libsystemd-journal.pc.in \ - src/compat-libs/libsystemd-login.pc.in \ -diff -ru systemd-209/Makefile.in systemd-209-modified/Makefile.in ---- systemd-209/Makefile.in 2014-02-20 02:09:23.640888214 +0100 -+++ systemd-209-modified/Makefile.in 2014-02-20 19:23:11.890184699 +0100 -@@ -1068,11 +1068,11 @@ - @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-id128.la \ - @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.la - --@ENABLE_COMPAT_LIBS_TRUE@am__append_236 = \ --@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-journal.pc \ --@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-login.pc \ --@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-id128.pc \ --@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-daemon.pc -+am__append_236 = \ -+ src/compat-libs/libsystemd-journal.pc \ -+ src/compat-libs/libsystemd-login.pc \ -+ src/compat-libs/libsystemd-id128.pc \ -+ src/compat-libs/libsystemd-daemon.pc - - @ENABLE_COMPAT_LIBS_TRUE@am__append_237 = compat-lib-install-hook - @ENABLE_COMPAT_LIBS_TRUE@am__append_238 = compat-lib-uninstall-hook diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild index ecae457081..426ff0ab0f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild @@ -97,8 +97,6 @@ KEYWORDS= fi src_prepare() { - epatch "${FILESDIR}"/209-pkg-config-compat-libs-always.patch - if use doc; then gtkdocize --docdir docs/ || die else