mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 22:11:39 +02:00
sys-apps/systemd: Sync and bump to 238
Note systemd itself only depends on libseccomp 2.3.1, but Gentoo's ebuild is using 2.3.3 at minimum, so this uses that instead.
This commit is contained in:
parent
6ad086ff60
commit
e4fd6d02b5
@ -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="26a2f8c6f74d2b12b0b31610c35f48148c3e4264" # v237-coreos
|
||||
CROS_WORKON_COMMIT="dd42d3d148eef87f65666199c85905308a95bc53" # v238-coreos
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
@ -64,7 +64,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
|
||||
pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
|
||||
pcre? ( dev-libs/libpcre2 )
|
||||
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= )
|
||||
xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
||||
@ -232,7 +232,7 @@ multilib_src_configure() {
|
||||
-Ddbus=$(meson_multilib_native_use test)
|
||||
-Dxkbcommon=$(meson_multilib_native_use xkb)
|
||||
# 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"
|
||||
# Breaks screen, tmux, etc.
|
||||
-Ddefault-kill-user-processes=false
|
||||
@ -261,6 +261,9 @@ multilib_src_configure() {
|
||||
|
||||
### CoreOS options
|
||||
|
||||
# Upstream systemd recommends distros explicitly set this
|
||||
-Dsplit-bin=true
|
||||
|
||||
# Specify this, or meson breaks due to no /etc/login.defs
|
||||
-Dsystem-gid-max=999
|
||||
-Dsystem-uid-max=999
|
||||
@ -327,17 +330,12 @@ multilib_src_install_all() {
|
||||
|
||||
einstalldocs
|
||||
|
||||
if use sysv-utils; then
|
||||
local app
|
||||
for app in halt poweroff reboot runlevel shutdown telinit; do
|
||||
dosym ../bin/systemctl /sbin/${app}
|
||||
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
|
||||
if ! use sysv-utils; then
|
||||
local rootprefix=$(usex usrmerge /usr '')
|
||||
rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
|
||||
rmdir "${ED%/}${rootprefix}"/sbin || 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
|
||||
|
||||
local udevdir=/lib/udev
|
||||
|
Loading…
x
Reference in New Issue
Block a user