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 new file mode 100644 index 0000000000..b6abe29b8f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/209-pkg-config-compat-libs-always.patch @@ -0,0 +1,51 @@ +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-209-r1.ebuild new file mode 100644 index 0000000000..ecae457081 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209-r1.ebuild @@ -0,0 +1,429 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.86 2014/02/21 15:40:01 zx2c4 Exp $ + +EAPI=5 + +if [[ ${PV} == 9999 ]]; then +AUTOTOOLS_AUTORECONF=yes +EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN} + http://cgit.freedesktop.org/${PN}/${PN}/" + +inherit git-r3 +fi + +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +PYTHON_COMPAT=( python{2_7,3_2,3_3} ) +inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \ + multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ + user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/1" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection + kdbus +kmod networkd lzma pam policykit python qrcode +seccomp selinux tcpd + test vanilla xattr openrc" + +MINKV="3.0" + +COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= + sys-libs/libcap:0= + acl? ( sys-apps/acl:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) + gudev? ( dev-libs/glib:2=[${MULTILIB_USEDEP}] ) + http? ( net-libs/libmicrohttpd:0= ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) + kmod? ( >=sys-apps/kmod-15:0= ) + lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] ) + pam? ( virtual/pam:= ) + python? ( ${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.1:0= ) + selinux? ( sys-libs/libselinux:0= ) + tcpd? ( sys-apps/tcp-wrappers:0= ) + xattr? ( sys-apps/attr:0= ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + || ( + >=sys-apps/util-linux-2.22 + "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +pkg_postinst() { + enewgroup systemd-journal + if use http; then + enewgroup systemd-journal-gateway + enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway + fi + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${ROOT%/}" + fi + + udev_reload || FAIL=1 + + # Bug 468876 + fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi + + if [[ ! -L "${ROOT}"/etc/mtab ]]; then + ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." + ewarn "Not having it is not supported by upstream and will cause tools like 'df'" + ewarn "and 'mount' to not work properly. Please run:" + ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn + fi + + if ! has_version sys-apps/systemd-ui; then + elog "To get additional features, a number of optional runtime dependencies may" + elog "be installed:" + elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209.ebuild deleted file mode 120000 index ef5bd04453..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-209.ebuild +++ /dev/null @@ -1 +0,0 @@ -systemd-9999-r1.ebuild \ No newline at end of file