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

Merge pull request #3113 from dm0-/systemd

Browse Source 
Bump to systemd v238
This commit is contained in:
David Michael 2018-03-22 18:06:55 -04:00 committed by GitHub
commit 1726b0bc36
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -43,8 +43,8 @@ dev-util/checkbashisms
# xfsprogs 4.5.0 has install conflicts, and versions in between fail to link # xfsprogs 4.5.0 has install conflicts, and versions in between fail to link
=sys-fs/xfsprogs-4.9.0 ** =sys-fs/xfsprogs-4.9.0 **
# systemd v233 requires libseccomp 2.3.1 # systemd v238 requires libseccomp 2.3.3
=sys-libs/libseccomp-2.3.1 ** =sys-libs/libseccomp-2.3.3 **
# All versions are ~amd64 and not enabled on arm64 # All versions are ~amd64 and not enabled on arm64
=sys-apps/nvme-cli-1.1 ** =sys-apps/nvme-cli-1.1 **

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

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

@ -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="26a2f8c6f74d2b12b0b31610c35f48148c3e4264" # v237-coreos CROS_WORKON_COMMIT="dd42d3d148eef87f65666199c85905308a95bc53" # v238-coreos
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi fi
@ -64,7 +64,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
pcre? ( dev-libs/libpcre2 ) 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.3:0= )
selinux? ( sys-libs/libselinux:0= ) selinux? ( sys-libs/libselinux:0= )
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
@ -232,7 +232,7 @@ multilib_src_configure() {
-Ddbus=$(meson_multilib_native_use test) -Ddbus=$(meson_multilib_native_use test)
-Dxkbcommon=$(meson_multilib_native_use xkb) -Dxkbcommon=$(meson_multilib_native_use xkb)
# hardcode a few paths to spare some deps # hardcode a few paths to spare some deps
-Dpath-kill=/bin/kill -Dkill-path=/bin/kill
-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
# Breaks screen, tmux, etc. # Breaks screen, tmux, etc.
-Ddefault-kill-user-processes=false -Ddefault-kill-user-processes=false
@ -261,6 +261,9 @@ multilib_src_configure() {
### CoreOS options ### CoreOS options
# Upstream systemd recommends distros explicitly set this
-Dsplit-bin=true
# 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
@ -327,17 +330,12 @@ multilib_src_install_all() {
einstalldocs einstalldocs
if use sysv-utils; then if ! use sysv-utils; then
local app local rootprefix=$(usex usrmerge /usr '')
for app in halt poweroff reboot runlevel shutdown telinit; do rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
dosym ../bin/systemctl /sbin/${app} rmdir "${ED%/}${rootprefix}"/sbin || die
done
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 \
|| die
rm "${ED%/}"/usr/share/man/man1/init.1 || die rm "${ED%/}"/usr/share/man/man1/init.1 || die
rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
fi fi
local udevdir=/lib/udev local udevdir=/lib/udev