sys-apps/systemd: Update systemd to v245

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
This commit is contained in:
Sayan Chowdhury 2020-06-29 19:02:44 +05:30
parent 0167e577cf
commit aa53e2ed3a

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="171ebfdbcb79b1f42659d111b5a642e72ea02021" # v243-flatcar CROS_WORKON_COMMIT="171ebfdbcb79b1f42659d111b5a642e72ea02021" # v245-flatcar
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi fi
@ -28,31 +28,34 @@ 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 pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb" IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
REQUIRED_USE="importd? ( curl gcrypt lzma )" REQUIRED_USE="
homed? ( cryptsetup )
importd? ( curl gcrypt lzma )
"
RESTRICT="!test? ( test )" RESTRICT="!test? ( test )"
MINKV="3.11" MINKV="3.11"
OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
sys-libs/libcap:0=[${MULTILIB_USEDEP}] sys-libs/libcap:0=[${MULTILIB_USEDEP}]
!<sys-libs/glibc-2.16
acl? ( sys-apps/acl:0= ) acl? ( sys-apps/acl:0= )
apparmor? ( sys-libs/libapparmor:0= ) apparmor? ( sys-libs/libapparmor:0= )
audit? ( >=sys-process/audit-2:0= ) audit? ( >=sys-process/audit-2:0= )
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0:1= )
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} )
http? ( http? (
>=net-libs/libmicrohttpd-0.9.33:0= >=net-libs/libmicrohttpd-0.9.33:0=
ssl? ( >=net-libs/gnutls-3.1.4:0= ) ssl? ( >=net-libs/gnutls-3.1.4:0= )
) )
idn? ( idn? ( net-dns/libidn2:= )
libidn2? ( net-dns/libidn2:= )
!libidn2? ( net-dns/libidn:= )
)
importd? ( importd? (
app-arch/bzip2:0= app-arch/bzip2:0=
sys-libs/zlib:0= sys-libs/zlib:0=
@ -61,9 +64,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) lz4? ( >=app-arch/lz4-0_p131: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? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
pkcs11? (app-crypt/p11-kit:0=)
pcre? ( dev-libs/libpcre2 ) pcre? ( dev-libs/libpcre2 )
pwquality? ( dev-libs/libpwquality:0= )
qrcode? ( media-gfx/qrencode:0= ) qrcode? ( media-gfx/qrencode:0= )
repart? ( ${OPENSSL_DEP} )
seccomp? ( >=sys-libs/libseccomp-2.3.3: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= )"
@ -78,13 +84,12 @@ RDEPEND="${COMMON_DEPEND}
sys-apps/coreutils[kill(-)] sys-apps/coreutils[kill(-)]
) ) ) )
!sys-auth/nss-myhostname !sys-auth/nss-myhostname
!<sys-kernel/dracut-048
!sys-fs/eudev !sys-fs/eudev
!sys-fs/udev" !sys-fs/udev"
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
PDEPEND=">=sys-apps/dbus-1.9.8[systemd] PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
>=sys-apps/hwids-20150417[udev] hwdb? ( >=sys-apps/hwids-20150417[udev] )
policykit? ( sys-auth/polkit ) policykit? ( sys-auth/polkit )
!vanilla? ( sys-apps/gentoo-systemd-integration )" !vanilla? ( sys-apps/gentoo-systemd-integration )"
@ -100,7 +105,7 @@ BDEPEND="
>=dev-util/meson-0.46 >=dev-util/meson-0.46
>=dev-util/intltool-0.50 >=dev-util/intltool-0.50
>=sys-apps/coreutils-8.16 >=sys-apps/coreutils-8.16
virtual/pkgconfig[${MULTILIB_USEDEP}] virtual/pkgconfig
test? ( sys-apps/dbus ) test? ( sys-apps/dbus )
app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5 app-text/docbook-xml-dtd:4.5
@ -109,6 +114,10 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
" "
python_check_deps() {
has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
}
pkg_pretend() { pkg_pretend() {
if [[ ${MERGE_TYPE} != buildonly ]]; then if [[ ${MERGE_TYPE} != buildonly ]]; then
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
@ -116,7 +125,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_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED ~!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"
@ -197,9 +206,9 @@ multilib_src_configure() {
-Dbashcompletiondir="$(get_bashcompdir)" -Dbashcompletiondir="$(get_bashcompdir)"
# make sure we get /bin:/sbin in PATH # make sure we get /bin:/sbin in PATH
-Dsplit-usr=$(usex split-usr true false) -Dsplit-usr=$(usex split-usr true false)
-Dsplit-bin=true
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-Dsysvinit-path= -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-Dsysvrcnd-path=
# Avoid infinite exec recursion, bug 642724 # Avoid infinite exec recursion, bug 642724
-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
# no deps # no deps
@ -215,7 +224,10 @@ multilib_src_configure() {
-Dgcrypt=$(meson_use gcrypt) -Dgcrypt=$(meson_use gcrypt)
-Dgnu-efi=$(meson_multilib_native_use gnuefi) -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-Defi-libdir="${EPREFIX}/usr/$(get_libdir)" -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-Dhomed=$(meson_multilib_native_use homed)
-Dhwdb=$(meson_multilib_native_use hwdb)
-Dmicrohttpd=$(meson_multilib_native_use http) -Dmicrohttpd=$(meson_multilib_native_use http)
-Didn=$(meson_multilib_native_use idn)
$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-Dimportd=$(meson_multilib_native_use importd) -Dimportd=$(meson_multilib_native_use importd)
-Dbzip2=$(meson_multilib_native_use importd) -Dbzip2=$(meson_multilib_native_use importd)
@ -225,9 +237,12 @@ 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)
-Dp11kit=$(meson_multilib_native_use pkcs11)
-Dpcre2=$(meson_multilib_native_use pcre) -Dpcre2=$(meson_multilib_native_use pcre)
-Dpolkit=$(meson_multilib_native_use policykit) -Dpolkit=$(meson_multilib_native_use policykit)
-Dpwquality=$(meson_multilib_native_use pwquality)
-Dqrencode=$(meson_multilib_native_use qrcode) -Dqrencode=$(meson_multilib_native_use qrcode)
-Drepart=$(meson_multilib_native_use repart)
-Dseccomp=$(meson_multilib_native_use seccomp) -Dseccomp=$(meson_multilib_native_use seccomp)
-Dselinux=$(meson_multilib_native_use selinux) -Dselinux=$(meson_multilib_native_use selinux)
#-Dtests=$(meson_multilib_native_use test) #-Dtests=$(meson_multilib_native_use test)
@ -247,7 +262,6 @@ multilib_src_configure() {
-Dfirstboot=$(meson_multilib) -Dfirstboot=$(meson_multilib)
-Dhibernate=$(meson_multilib) -Dhibernate=$(meson_multilib)
-Dhostnamed=$(meson_multilib) -Dhostnamed=$(meson_multilib)
-Dhwdb=$(meson_multilib)
-Dldconfig=$(meson_multilib) -Dldconfig=$(meson_multilib)
-Dlocaled=$(meson_multilib) -Dlocaled=$(meson_multilib)
-Dman=$(meson_multilib) -Dman=$(meson_multilib)
@ -261,11 +275,11 @@ multilib_src_configure() {
-Dtmpfiles=$(meson_multilib) -Dtmpfiles=$(meson_multilib)
-Dvconsole=$(meson_multilib) -Dvconsole=$(meson_multilib)
# static-libs
-Dstatic-libsystemd=$(usex static-libs true false)
-Dstatic-libudev=$(usex static-libs true false)
### 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
@ -302,18 +316,6 @@ multilib_src_configure() {
-Drootlibdir="${EPREFIX}$(usex split-usr '' /usr)/$(get_libdir)" -Drootlibdir="${EPREFIX}$(usex split-usr '' /usr)/$(get_libdir)"
) )
if multilib_is_native_abi && use idn; then
myconf+=(
-Dlibidn2=$(usex libidn2 true false)
-Dlibidn=$(usex libidn2 false true)
)
else
myconf+=(
-Dlibidn2=false
-Dlibidn=false
)
fi
meson_src_configure "${myconf[@]}" meson_src_configure "${myconf[@]}"
} }