From 286c67947e76c7b5328ee750862943b91b708879 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 6 Feb 2018 15:22:39 -0500 Subject: [PATCH 1/2] sys-apps/systemd: Sync and bump to systemd 237 --- ...stemd-236-r1.ebuild => systemd-237.ebuild} | 0 .../sys-apps/systemd/systemd-9999.ebuild | 25 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-236-r1.ebuild => systemd-237.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-236-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-237.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-236-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-237.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 dc4a8d8ccf..9ca074818f 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,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then # Use ~arch instead of empty keywords for compatibility with cros-workon KEYWORDS="~amd64 ~arm64 ~arm ~x86" else - CROS_WORKON_COMMIT="304f1c73839be13fd942f39eadf226ba01f4a289" # v236-coreos + CROS_WORKON_COMMIT="7f263845a99b0b194aefb94547c90d2ab529b060" # v237-coreos KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi @@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test usrmerge vanilla xkb" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -62,17 +62,17 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) + pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) - sysv-utils? ( - !sys-apps/systemd-sysv-utils - !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" RDEPEND="${COMMON_DEPEND} + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] @@ -114,7 +114,7 @@ pkg_pretend() { ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~UNIX ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH - ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED + ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" @@ -198,6 +198,8 @@ multilib_src_configure() { -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Dsysvinit-path= -Dsysvrcnd-path= + # Avoid infinite exec recursion, bug 642724 + -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps -Defi=$(meson_multilib) -Dima=true @@ -221,6 +223,7 @@ multilib_src_configure() { -Dxz=$(meson_use lzma) -Dlibiptc=$(meson_multilib_native_use nat) -Dpam=$(meson_use pam) + -Dpcre2=$(meson_multilib_native_use pcre) -Dpolkit=$(meson_multilib_native_use policykit) -Dqrencode=$(meson_multilib_native_use qrcode) -Dseccomp=$(meson_multilib_native_use seccomp) @@ -258,9 +261,6 @@ multilib_src_configure() { ### CoreOS options - # Point to a bad path, or telinit in the SDK re-execs itself - -Dtelinit-path=/lib/sysvinit/telinit - # Specify this, or meson breaks due to no /etc/login.defs -Dsystem-gid-max=999 -Dsystem-uid-max=999 @@ -330,9 +330,9 @@ multilib_src_install_all() { if use sysv-utils; then local app for app in halt poweroff reboot runlevel shutdown telinit; do - dosym ../bin/systemctl $(usex usrmerge /usr '')/sbin/${app} + dosym ../bin/systemctl /sbin/${app} done - dosym ../lib/systemd/systemd $(usex usrmerge /usr '')/sbin/init + dosym ../lib/systemd/systemd /sbin/init else # we just keep sysvinit tools, so no need for the mans rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ @@ -466,6 +466,7 @@ pkg_postinst() { enewgroup input enewgroup kvm 78 + enewgroup render enewgroup systemd-journal newusergroup systemd-coredump newusergroup systemd-journal-remote From 47408c90f5208f20d9c254430e22d1b40bba9e5a Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 6 Feb 2018 15:23:07 -0500 Subject: [PATCH 2/2] profiles: Enable a libpcre2 ebuild on arm64 --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index cc0e25e389..fd823159ca 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -19,6 +19,7 @@ =dev-libs/libpcre-8.41 ~arm64 =dev-libs/libxml2-2.9.4-r3 ~arm64 =dev-libs/nss-3.29.5 ~arm64 +=dev-libs/libpcre2-10.30 ~arm64 =dev-libs/userspace-rcu-0.9.1 ** =dev-util/meson-0.43.0 ~arm64 =dev-util/ninja-1.8.2 ~arm64