mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-21 06:21:08 +02:00
Merge pull request #1113 from crawford/systemd-219
sys-apps/systemd: bump to v219
This commit is contained in:
Alex Crawford
commit
2ff2c55abe
@ -39,7 +39,7 @@ net-analyzer/nmap ncat -lua
|
||||
app-admin/sudo -sendmail
|
||||
|
||||
# avoid pulling in gnutls, disable gentoo-only bits, enable journal upload
|
||||
sys-apps/systemd -ssl curl vanilla lzma gcrypt
|
||||
sys-apps/systemd -ssl curl vanilla -lz4 lzma gcrypt
|
||||
|
||||
# disable kernel config detection and module building
|
||||
net-firewall/ipset -modules
|
||||
|
||||
1
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild
vendored
Symbolic link
1
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
systemd-9999.ebuild
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.153 2014/12/26 19:58:55 floppym Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.160 2015/02/20 16:13:22 floppym Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
@ -35,12 +35,14 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
|
||||
SLOT="0/2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
|
||||
idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
|
||||
selinux ssl sysv-utils terminal test vanilla xkb"
|
||||
idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
|
||||
qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
|
||||
|
||||
# Gentoo removed the nls use flag, we'll keep it for now
|
||||
IUSE+=" nls symlink-usr"
|
||||
|
||||
REQUIRED_USE="importd? ( curl gcrypt lzma )"
|
||||
|
||||
MINKV="3.8"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
|
||||
@ -58,10 +60,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
|
||||
ssl? ( >=net-libs/gnutls-3.1.4:0= )
|
||||
)
|
||||
idn? ( net-dns/libidn:0= )
|
||||
importd? (
|
||||
app-arch/bzip2:0=
|
||||
sys-libs/zlib:0=
|
||||
)
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
|
||||
kmod? ( >=sys-apps/kmod-15:0= )
|
||||
lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
|
||||
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
|
||||
nat? ( net-firewall/iptables:0= )
|
||||
pam? ( virtual/pam:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode:0= )
|
||||
@ -100,9 +107,11 @@ DEPEND="${COMMON_DEPEND}
|
||||
>=sys-devel/binutils-2.23.1
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
ia64? ( >=sys-kernel/linux-headers-3.9 )
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )
|
||||
python? ( dev-python/lxml[${PYTHON_USEDEP}] )
|
||||
terminal? ( media-fonts/unifont[utils(+)] )
|
||||
test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
|
||||
|
||||
# Only required if patches touch man page source xml, which is usually.
|
||||
@ -122,11 +131,12 @@ KEYWORDS=
|
||||
fi
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
|
||||
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
|
||||
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR
|
||||
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
|
||||
~!GRKERNSEC_PROC ~!FW_LOADER_USER_HELPER"
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
|
||||
~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
|
||||
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
|
||||
~TIMERFD ~TMPFS_XATTR
|
||||
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
|
||||
~!SYSFS_DEPRECATED_V2"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
|
||||
@ -185,14 +195,6 @@ src_configure() {
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_native_enable() {
|
||||
if multilib_is_native_abi; then
|
||||
echo "--enable-${1}"
|
||||
else
|
||||
echo "--disable-${1}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-pamconfdir=/usr/share/pam.d
|
||||
@ -232,11 +234,15 @@ multilib_src_configure() {
|
||||
$(multilib_native_use_enable http microhttpd)
|
||||
$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
|
||||
$(multilib_native_use_enable idn libidn)
|
||||
$(multilib_native_use_enable importd)
|
||||
$(multilib_native_use_enable importd bzip2)
|
||||
$(multilib_native_use_enable importd zlib)
|
||||
$(multilib_native_use_enable introspection)
|
||||
$(use_enable kdbus)
|
||||
$(multilib_native_use_enable kmod)
|
||||
$(use_enable lz4)
|
||||
$(use_enable lzma xz)
|
||||
$(multilib_native_use_enable nat libiptc)
|
||||
$(use_enable nls)
|
||||
$(multilib_native_use_enable pam)
|
||||
$(multilib_native_use_enable policykit polkit)
|
||||
@ -250,28 +256,6 @@ multilib_src_configure() {
|
||||
$(multilib_native_use_enable test dbus)
|
||||
$(multilib_native_use_enable xkb xkbcommon)
|
||||
|
||||
# Disable optional binaries for non-native abis
|
||||
$(multilib_native_enable backlight)
|
||||
$(multilib_native_enable binfmt)
|
||||
$(multilib_native_enable bootchart)
|
||||
$(multilib_native_enable coredump)
|
||||
$(multilib_native_enable firstboot)
|
||||
$(multilib_native_enable hibernate)
|
||||
$(multilib_native_enable hostnamed)
|
||||
$(multilib_native_enable localed)
|
||||
$(multilib_native_enable logind)
|
||||
$(multilib_native_enable machined)
|
||||
$(multilib_native_enable networkd)
|
||||
$(multilib_native_enable quotacheck)
|
||||
$(multilib_native_enable randomseed)
|
||||
$(multilib_native_enable resolved)
|
||||
$(multilib_native_enable rfkill)
|
||||
$(multilib_native_enable sysusers)
|
||||
$(multilib_native_enable timedated)
|
||||
$(multilib_native_enable timesyncd)
|
||||
$(multilib_native_enable tmpfiles)
|
||||
$(multilib_native_enable vconsole)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
@ -371,9 +355,9 @@ multilib_src_install_all() {
|
||||
local prefix
|
||||
use symlink-usr && prefix=/usr
|
||||
for app in halt poweroff reboot runlevel shutdown telinit; do
|
||||
dosym /usr/bin/systemctl ${prefix}/sbin/${app}
|
||||
dosym "/${ROOTPREFIX-/usr}/bin/systemctl" ${prefix}/sbin/${app}
|
||||
done
|
||||
dosym /usr/lib/systemd/systemd ${prefix}/sbin/init
|
||||
dosym "/${ROOTPREFIX-/usr}/lib/systemd/systemd" ${prefix}/sbin/init
|
||||
else
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
@ -396,17 +380,21 @@ multilib_src_install_all() {
|
||||
rm "${D}"/usr/lib/systemd/system/default.target || die
|
||||
dosym multi-user.target /usr/lib/systemd/system/default.target
|
||||
|
||||
# If we install these symlinks, there is no way for the sysadmin to remove them
|
||||
# permanently.
|
||||
rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
|
||||
rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
|
||||
rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
|
||||
rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
|
||||
|
||||
# Move a few services enabled in /etc to /usr
|
||||
# systemd-timesyncd is left disabled, we currently use ntpd
|
||||
rm -f "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service
|
||||
rm -f "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target
|
||||
rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
|
||||
rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
|
||||
|
||||
rm -f "${D}"/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
|
||||
rm -rf "${D}"/etc/systemd/system/network-online.target.wants
|
||||
rmdir "${D}"/etc/systemd/system/getty.target.wants \
|
||||
"${D}"/etc/systemd/system/multi-user.target.wants \
|
||||
"${D}"/etc/systemd/system/sysinit.target.wants \
|
||||
|| die
|
||||
|
||||
dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user