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

sys-apps/systemd: Bump to v246.6

Browse Source 
Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
Signed-off-by: Krzesimir Nowak <krzesimir@kinvolk.io>
This commit is contained in:
Sayan Chowdhury 2020-09-07 18:57:28 +05:30 committed by Krzesimir Nowak
parent 7d4c909793
commit c04efd7f22
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-245-r3.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-246.ebuild vendored
View File

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

@ -1,8 +1,9 @@
# Copyright 2011-2020 Gentoo Authors # Copyright 2011-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# Flatcar: Based on systemd-245.5.ebuild from commit # Flatcar: Based on systemd-246-r1.ebuild from commit
# 960277ffec44c6245e1ae16b3b36fed9d76496b1 in gentoo repo. # 431a568d06963207495c099b5a64f85442017507 in gentoo repo (see
# https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/systemd/systemd-246-r1.ebuild?id=431a568d06963207495c099b5a64f85442017507).
EAPI=7 EAPI=7
@ -16,8 +17,8 @@ if [[ ${PV} == 9999 ]]; then
KEYWORDS="~amd64 ~arm64 ~arm ~x86" KEYWORDS="~amd64 ~arm64 ~arm ~x86"
else else
# Flatcar: Use cros setup # Flatcar: Use cros setup
CROS_WORKON_COMMIT="d5568ff804c2bda9a3869aa249bb6300aa3be7dd" # v245-flatcar CROS_WORKON_COMMIT="5b1ed0e98a8a8225dc3f662483287a380643ab96" # v246-flatcar
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
fi fi
# Flatcar: We still have python 3.5, and have no python3.8 yet. # Flatcar: We still have python 3.5, and have no python3.8 yet.
@ -39,7 +40,7 @@ SLOT="0/2"
# Flatcar: Dropped cgroup-hybrid. We use legacy hierarchy by default # Flatcar: Dropped cgroup-hybrid. We use legacy hierarchy by default
# to keep docker working. Dropped static-libs, we don't care about # to keep docker working. Dropped static-libs, we don't care about
# static libraries. # static libraries.
IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb" IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
REQUIRED_USE=" REQUIRED_USE="
homed? ( cryptsetup ) homed? ( cryptsetup )
@ -58,6 +59,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
audit? ( >=sys-process/audit-2:0= ) audit? ( >=sys-process/audit-2:0= )
cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
curl? ( net-misc/curl:0= ) curl? ( net-misc/curl:0= )
dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
elfutils? ( >=dev-libs/elfutils-0.158:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= )
gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
homed? ( ${OPENSSL_DEP} ) homed? ( ${OPENSSL_DEP} )
@ -135,7 +137,7 @@ pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
~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 ~USER_NS
~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
~!SYSFS_DEPRECATED_V2" ~!SYSFS_DEPRECATED_V2"
@ -179,6 +181,10 @@ src_prepare() {
# Flatcar: We don't have separate patches, so no patching code here. # Flatcar: We don't have separate patches, so no patching code here.
# #
# Flatcar: Use the resolv.conf managed by systemd-resolved. # Flatcar: Use the resolv.conf managed by systemd-resolved.
# This shouldn't be necessary anymore. Added because of a bug
# https://github.com/systemd/systemd/issues/3826, which is
# apparently resolved in
# https://github.com/systemd/systemd/pull/5276.
sed -i -e 's,/run/systemd/resolve/stub-resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.m4 || die sed -i -e 's,/run/systemd/resolve/stub-resolv.conf,/run/systemd/resolve/resolv.conf,' tmpfiles.d/etc.conf.m4 || die
default default
@ -433,16 +439,25 @@ multilib_src_install_all() {
# Flatcar: getty@.service is enabled manually below. # Flatcar: getty@.service is enabled manually below.
systemd_enable_service sysinit.target systemd-timesyncd.service systemd_enable_service sysinit.target systemd-timesyncd.service
systemd_enable_service multi-user.target systemd-networkd.service systemd_enable_service multi-user.target systemd-networkd.service
# For systemd-networkd.service, it has it in Also, which also # Flatcar: For systemd-networkd.service, it has it in Also, which also
# needs to be enabled # needs to be enabled
systemd_enable_service sockets.target systemd-networkd.socket systemd_enable_service sockets.target systemd-networkd.socket
# For systemd-networkd.service, it has it in Also, which also # Flatcar: For systemd-networkd.service, it has it in Also, which also
# needs to be enabled # needs to be enabled
systemd_enable_service network-online.target systemd-networkd-wait-online.service systemd_enable_service network-online.target systemd-networkd-wait-online.service
systemd_enable_service multi-user.target systemd-resolved.service systemd_enable_service multi-user.target systemd-resolved.service
if use homed; then
systemd_enable_service multi-user.target systemd-homed.target
# Flatcar: systemd-homed.target has
# Also=systemd-userdbd.service, but the service has no
# WantedBy entry. It's likely going to be executed through
# systemd-userdbd.socket, which is enabled in upstream's
# presets file.
systemd_enable_service sockets.target systemd-userdbd.socket
fi
systemd_enable_service sysinit.target systemd-pstore.service
# Flatcar: not enabling reboot.target - it has no WantedBy # Flatcar: not enabling reboot.target - it has no WantedBy
# entry. # entry.
systemd_enable_service remount-fs.target systemd-pstore.service
# Flatcar: Enable getty manually. # Flatcar: Enable getty manually.
mkdir --parents "${ED}/usr/lib/systemd/system/getty.target.wants" mkdir --parents "${ED}/usr/lib/systemd/system/getty.target.wants"