mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3050 from dm0-/systemd

Browse Source 
Upgrade to systemd 237
This commit is contained in:
David Michael 2018-02-07 08:28:32 -05:00 committed by GitHub
commit 25f6f8cb2a
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords vendored
View File

@ -19,6 +19,7 @@
=dev-libs/libpcre-8.41 ~arm64 =dev-libs/libpcre-8.41 ~arm64
=dev-libs/libxml2-2.9.4-r3 ~arm64 =dev-libs/libxml2-2.9.4-r3 ~arm64
=dev-libs/nss-3.29.5 ~arm64 =dev-libs/nss-3.29.5 ~arm64
=dev-libs/libpcre2-10.30 ~arm64
=dev-libs/userspace-rcu-0.9.1 ** =dev-libs/userspace-rcu-0.9.1 **
=dev-util/meson-0.43.0 ~arm64 =dev-util/meson-0.43.0 ~arm64
=dev-util/ninja-1.8.2 ~arm64 =dev-util/ninja-1.8.2 ~arm64

0
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-236-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-237.ebuild vendored
View File

25
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -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 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6
@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
# Use ~arch instead of empty keywords for compatibility with cros-workon # Use ~arch instead of empty keywords for compatibility with cros-workon
KEYWORDS="~amd64 ~arm64 ~arm ~x86" KEYWORDS="~amd64 ~arm64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="304f1c73839be13fd942f39eadf226ba01f4a289" # v236-coreos CROS_WORKON_COMMIT="7f263845a99b0b194aefb94547c90d2ab529b060" # v237-coreos
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi fi
@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2" 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 )" REQUIRED_USE="importd? ( curl gcrypt lzma )"
RESTRICT="!test? ( test )" 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}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
nat? ( net-firewall/iptables:0= ) nat? ( net-firewall/iptables:0= )
pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
pcre? ( dev-libs/libpcre2 )
qrcode? ( media-gfx/qrencode:0= ) qrcode? ( media-gfx/qrencode:0= )
seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
selinux? ( sys-libs/libselinux:0= ) selinux? ( sys-libs/libselinux:0= )
sysv-utils? (
!sys-apps/systemd-sysv-utils
!sys-apps/sysvinit )
xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
RDEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}
sysv-utils? ( !sys-apps/sysvinit )
!sysv-utils? ( sys-apps/sysvinit )
!build? ( || ( !build? ( || (
sys-apps/util-linux[kill(-)] sys-apps/util-linux[kill(-)]
sys-process/procps[kill(+)] sys-process/procps[kill(+)]
@ -114,7 +114,7 @@ pkg_pretend() {
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
~TIMERFD ~TMPFS_XATTR ~UNIX ~TIMERFD ~TMPFS_XATTR ~UNIX
~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH ~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" ~!SYSFS_DEPRECATED_V2"
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
@ -198,6 +198,8 @@ multilib_src_configure() {
-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" -Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
-Dsysvinit-path= -Dsysvinit-path=
-Dsysvrcnd-path= -Dsysvrcnd-path=
# Avoid infinite exec recursion, bug 642724
-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
# no deps # no deps
-Defi=$(meson_multilib) -Defi=$(meson_multilib)
-Dima=true -Dima=true
@ -221,6 +223,7 @@ multilib_src_configure() {
-Dxz=$(meson_use lzma) -Dxz=$(meson_use lzma)
-Dlibiptc=$(meson_multilib_native_use nat) -Dlibiptc=$(meson_multilib_native_use nat)
-Dpam=$(meson_use pam) -Dpam=$(meson_use pam)
-Dpcre2=$(meson_multilib_native_use pcre)
-Dpolkit=$(meson_multilib_native_use policykit) -Dpolkit=$(meson_multilib_native_use policykit)
-Dqrencode=$(meson_multilib_native_use qrcode) -Dqrencode=$(meson_multilib_native_use qrcode)
-Dseccomp=$(meson_multilib_native_use seccomp) -Dseccomp=$(meson_multilib_native_use seccomp)
@ -258,9 +261,6 @@ multilib_src_configure() {
### CoreOS options ### 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 # Specify this, or meson breaks due to no /etc/login.defs
-Dsystem-gid-max=999 -Dsystem-gid-max=999
-Dsystem-uid-max=999 -Dsystem-uid-max=999
@ -330,9 +330,9 @@ multilib_src_install_all() {
if use sysv-utils; then if use sysv-utils; then
local app local app
for app in halt poweroff reboot runlevel shutdown telinit; do for app in halt poweroff reboot runlevel shutdown telinit; do
dosym ../bin/systemctl $(usex usrmerge /usr '')/sbin/${app} dosym ../bin/systemctl /sbin/${app}
done done
dosym ../lib/systemd/systemd $(usex usrmerge /usr '')/sbin/init dosym ../lib/systemd/systemd /sbin/init
else else
# we just keep sysvinit tools, so no need for the mans # we just keep sysvinit tools, so no need for the mans
rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
@ -466,6 +466,7 @@ pkg_postinst() {
enewgroup input enewgroup input
enewgroup kvm 78 enewgroup kvm 78
enewgroup render
enewgroup systemd-journal enewgroup systemd-journal
newusergroup systemd-coredump newusergroup systemd-coredump
newusergroup systemd-journal-remote newusergroup systemd-journal-remote