diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index e52ecd1608..b4939ca83a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -36,8 +36,8 @@ net-analyzer/nmap ncat -lua # removes mta dependencies app-admin/sudo -sendmail -# avoid pulling in gnutls, disable gentoo-only bits, enable journal upload -sys-apps/systemd -ssl curl vanilla -lz4 lzma gcrypt +# use lzma which is the default on non-gentoo systems +sys-apps/systemd curl gcrypt lzma -lz4 # disable kernel config detection and module building net-firewall/ipset -modules diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 01d0adc2b4..b8ed7f9a87 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -22,8 +22,8 @@ sys-libs/ncurses minimal sys-libs/pam -berkdb sys-libs/gdbm berkdb - -sys-apps/systemd http +# enable journal gateway and container features, avoid pulling in gnutls +sys-apps/systemd importd http nat -ssl net-libs/libmicrohttpd -ssl sys-boot/syslinux -custom-cflags diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-220-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-222.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-220-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-222.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 e8d6c2ef48..6980b24378 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 @@ -1,17 +1,20 @@ # Copyright 1999-2015 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.169 2015/05/30 13:58:45 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.174 2015/06/27 18:00:47 floppym Exp $ EAPI=5 +AUTOTOOLS_AUTORECONF=yes +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) CROS_WORKON_PROJECT="coreos/systemd" CROS_WORKON_REPO="git://github.com" -if [[ "${PV}" == 9999 ]]; then +if [[ ${PV} == 9999 ]]; then # Use ~arch instead of empty keywords for compatibility with cros-workon KEYWORDS="~amd64 ~arm64 ~arm ~x86" else - CROS_WORKON_COMMIT="9b174479806a66ff3a220a89291a38f8a4fed701" + CROS_WORKON_COMMIT="015325350548732458e61c193f5fab6f139f47fc" KEYWORDS="amd64 arm64 ~arm ~x86" fi @@ -20,9 +23,6 @@ fi # the later eclass's version to win. Only need src_unpack from workon. inherit cros-workon -AUTOTOOLS_AUTORECONF=yes -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit autotools-utils bash-completion-r1 linux-info multilib \ multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ user @@ -32,18 +32,19 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http - idn +importd introspection kdbus +kmod +lz4 lzma +nat pam policykit python +IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http + idn importd +kdbus +kmod +lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" # CoreOS specific use flags IUSE+=" man symlink-usr" -REQUIRED_USE="importd? ( curl gcrypt lzma )" +REQUIRED_USE="importd? ( curl gcrypt lzma ) + python? ( ${PYTHON_REQUIRED_USE} )" MINKV="3.8" -COMMON_DEPEND=">=sys-apps/util-linux-2.25:0= +COMMON_DEPEND=">=sys-apps/util-linux-2.26:0= sys-libs/libcap:0= !=sys-apps/util-linux-2.25:0= app-arch/bzip2:0= sys-libs/zlib:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) @@ -107,21 +106,25 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-${MINKV} ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.18 ) gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) python? ( dev-python/lxml[${PYTHON_USEDEP}] ) terminal? ( media-fonts/unifont[utils(+)] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 )" # Not required when building from unpatched tarballs, but we build from git. -DEPEND="${DEPEND} +DEPEND+=" man? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 ) - dev-libs/gobject-introspection + dev-libs/libxslt:0 + ${PYTHON_DEPS} ) + terminal? ( ${PYTHON_DEPS} ) >=dev-libs/libgcrypt-1.4.5:0" +REQUIRED_USE+=" + man? ( ${PYTHON_REQUIRED_USE} ) + terminal? ( ${PYTHON_REQUIRED_USE} )" + pkg_pretend() { local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE @@ -161,16 +164,10 @@ pkg_pretend() { } pkg_setup() { - use python && python-single-r1_pkg_setup + : } src_prepare() { - if use doc; then - gtkdocize --docdir docs/ || die - else - echo 'EXTRA_DIST =' > docs/gtk-doc.make - fi - # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die @@ -183,6 +180,8 @@ src_configure() { # Fix systems broken by bug #509454. [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev + python_setup + multilib-minimal_src_configure } @@ -216,18 +215,15 @@ multilib_src_configure() { $(multilib_native_use_enable audit) $(multilib_native_use_enable cryptsetup libcryptsetup) $(multilib_native_use_enable curl libcurl) - $(multilib_native_use_enable doc gtk-doc) $(multilib_native_use_enable elfutils) $(use_enable gcrypt) $(multilib_native_use_enable gnuefi) - $(use_enable gudev) $(multilib_native_use_enable http microhttpd) $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) $(multilib_native_use_enable idn libidn) $(multilib_native_use_enable importd) $(multilib_native_use_enable importd bzip2) $(multilib_native_use_enable importd zlib) - $(multilib_native_use_enable introspection) $(use_enable kdbus) $(multilib_native_use_enable kmod) $(use_enable lz4) @@ -246,9 +242,6 @@ multilib_src_configure() { $(multilib_native_use_enable test dbus) $(multilib_native_use_enable xkb xkbcommon) - # not supported (avoid automagic deps in the future) - --disable-chkconfig - # hardcode a few paths to spare some deps QUOTAON=/usr/sbin/quotaon QUOTACHECK=/usr/sbin/quotacheck @@ -295,9 +288,6 @@ multilib_src_compile() { if multilib_is_native_abi; then emake "${mymakeopts[@]}" else - # prerequisites for gudev - use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h} - echo 'gentoo: $(BUILT_SOURCES)' | \ emake "${mymakeopts[@]}" -f Makefile -f - gentoo echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ @@ -330,7 +320,6 @@ multilib_src_install() { install-pkgconfiglibDATA install-includeHEADERS # safe to call unconditionally, 'installs' empty list - install-libgudev_includeHEADERS install-pkgincludeHEADERS )