mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 09:26:58 +02:00
Merge pull request #314 from polvi/usr-systemd-dbus
Pull dbus/systemd into coreos-overlay and bump related packages
This commit is contained in:
polvi
commit
289ab86403
@ -90,7 +90,7 @@ src_install() {
|
||||
insinto /usr/share/dbus-1/services
|
||||
doins org.chromium.UpdateEngine.service
|
||||
|
||||
insinto /etc/dbus-1/system.d
|
||||
insinto /usr/share/dbus-1/system.d
|
||||
doins UpdateEngine.conf
|
||||
|
||||
insinto /lib/udev/rules.d
|
||||
|
||||
1
sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r25.ebuild
vendored
Symbolic link
1
sdk_container/src/third_party/coreos-overlay/net-misc/tlsdate/tlsdate-0.0.5-r25.ebuild
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
tlsdate-0.0.5.ebuild
|
||||
@ -43,7 +43,7 @@ src_install() {
|
||||
default
|
||||
insinto /etc/tlsdate
|
||||
doins "${FILESDIR}/tlsdated.conf"
|
||||
insinto /etc/dbus-1/system.d
|
||||
insinto /usr/share/dbus-1/system.d
|
||||
doins "${FILESDIR}/org.torproject.tlsdate.conf"
|
||||
|
||||
systemd_dounit "${FILESDIR}/tlsdate.service"
|
||||
1565
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog
vendored
Normal file
1565
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog
vendored
Normal file
File diff suppressed because it is too large
Load Diff
32
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest
vendored
Normal file
32
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest
vendored
Normal file
@ -0,0 +1,32 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
|
||||
AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 SHA512 e8cac05a0291f24fc3cd82cfd504a78b1d356a9ee613e226c3b16ccbfd8251afb036d4fb9da372a066e5bc9417fddbc3f10b68713620c4fd798069fdd8f6dbf8 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d
|
||||
AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
|
||||
DIST dbus-1.6.10.tar.gz 1930118 SHA256 1f3d6f4a53a7121328f6cd685fc14440d72e6c0006ecb3312cc779c495915e86 SHA512 7249555a62e80167d296db3075deef135aa303f2245d810360504d94d60acda467773a58982b209aab46a8a987f3bcf22eaef4d9cc71a1673650ab162797f8c1 WHIRLPOOL 60b07033aba493bec297690e3e552594658bfe11bbae4a935d29a30fc58c5e9531ed4544e8f600ee04e414d6d21031b80168ca683adbf7335248c962205d2ee4
|
||||
DIST dbus-1.6.12.tar.gz 1933805 SHA256 f67a7abfd6d045c1e9eba2bba4199d301836bc0c6e8a727c765913aba780ee92 SHA512 860f3c86268857662bc397cd6fd0c163dfe38c77c28525c47226e22d890ec3c2df724f887f55f65a60b729e8eb5dce91ce8ecd045391d88acb1884b8dbf33c71 WHIRLPOOL 248872ad9636f60d5b4e19b5876ec1b675db02e7c755f19f3a1966aedcdeb834a092d6e678fe1ea7e06a4b5e33d2ac31739c12093c6aee8dea8147fd0d22716a
|
||||
DIST dbus-1.6.8.tar.gz 1929630 SHA256 fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac SHA512 eb26f1dfb6c6e3757a408a98e0f4012eda926e2f8ee7a2356ebd567a2e4a7d96effca7cec6e6b4f9e7bc578cbdd7b703d00158343a260859aff0718c76f296b0 WHIRLPOOL b614da2bc57376c8ad626ed2469e9a2cfcf7a2debba97187728048ad73e0c5075b290766d088e470b266fcad3e3cf2ec2c9c8477f1f7c5a232f1f74cadc83c1a
|
||||
EBUILD dbus-1.6.10.ebuild 5193 SHA256 63b76d8813611b247717c5b922a1c02c6076b0e1589cf3f20d473f71067fb7a0 SHA512 d24c0a1dfbe6c6c88f47dda653d8dc667eb756143a4ac11bf39830d19875c47dd0c12c421bd7b115f0cfde40e91b3b6c8f13dfb3db66f2747ae4421a7bf34ffe WHIRLPOOL 9fbe4638c88d85e6a712e09205e69d37c7b6d5460bee5220bd7bbb58737af8da12ac8a74829af75025ff44e66302a1395c40ac522ebfde1d8340cf3be463184c
|
||||
EBUILD dbus-1.6.12.ebuild 5192 SHA256 cd99facf8417cfa959ac2ffc26827908567bb7d4904a18d5324222348db3f33e SHA512 8fe5e1855ee89ef69f04f65d3329e36ceaf7c9f9e3e93ee2266f1116d62e16189f503e8a223c4a8e59475bed2373a0246e7a4986dc1448f7a916b4e584850aa9 WHIRLPOOL b11ffeac4cc939bd2f9904a888648be49806193cd5f2fdba124855c73845217715148f48d27b3629734e2f1b774500e23882593280c2c91fb317c1bacbb8d061
|
||||
EBUILD dbus-1.6.8-r1.ebuild 5215 SHA256 71b84ca7f396cc50f1de7e4a2024ad2d0946b064969cf719a041031d6a4d6043 SHA512 964478ce0450d8e8c382490b702f4c9b7eec3b3e890fb3f8fc95653e6594c2c49b00dcd3bbc03b46ae03bf099332f3e22b82094d34fcf506edb6f9adf3e03b0b WHIRLPOOL 2af6773fa3a1e8c4efacdf2478b8bfd2a7985e49aa87b64317c93b21c9eacfbae42d28d76c73f2c1f3ec15d01155d9b1ce1d824a67c1c56a20f7d5d63e3fb1a5
|
||||
EBUILD dbus-1.6.8.ebuild 4977 SHA256 12c078f1279d359f21d808136dfd8e5e0877f57970ccadac069245f6054498f5 SHA512 92108bf767eb0ca035c229ba5785db26da5d0aa27dbb6dd3cc77ed0217313b7b193476b622a02824dc6580962805895670f9e82647da579ec6e84b438816a2ef WHIRLPOOL 9b3c06858526dab5fa21074d9217bbe395a35e4c42be04fb305f2adddb3ab7222384be25421840253dc3679bb72490bbdfa125926ad2c13bdf3bb4b21bd11323
|
||||
MISC ChangeLog 56965 SHA256 33cff546692bccddf54df7397a33fcc61538cb5b1c4324ec89f53b4fd9a89afb SHA512 e51f6cf6bc3fdb71d464780055a4323d65f1a6632772fabb3e6a31871420ce71986940b3032ab128772f90b69bcc26b6c60c2f6c90342b8cdb3e954515964b0e WHIRLPOOL 32b86d08c3ec9a9b92ebc4014f640933032c5494a35156350a5b0e4f4cbb9f7dd4e94a9da02990c81a2c1f2177ea32e1a4b8357ebed699b03698986b60a60bef
|
||||
MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.20 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCgAGBQJR1Xp+AAoJELp701BxlEWfODsQAJrsSEX+4WbCYXCXjPWC9doO
|
||||
eHP4s3qRvbQxN7fubs1DGTk+ndx7duX2B4YNtJrbzUtBWBMItDHGCl46iyi4TJXu
|
||||
xpmPzjT7YSCDsjcPYqZDu3U4YO7dgOAsdkK3R8NdEKI9fhP/UgmYbZZmmK4LypAU
|
||||
8Q+XdiqfSBXP11NpP2fwjUd1K/fkb0jOOGohzauYGYDPWkzrJCJX9wjahe7Z3iOi
|
||||
yFiOn9ollTwSRKtMiXwMm6IuVaQiH9XWNQ2iWG+p5n2+hI38dOU6V+kvj1+ULjQW
|
||||
6hYyr5lzq02vBi6reWJ3yyZrgIyS0XO9phqtzwskIY++EojLinXmPcU5naXekP87
|
||||
Qnk2atRt7dzWgGtnUA1kyfrMnzJWX5kY2A3yMYn5cujGFGSfYQo0YXWqByupn0Ys
|
||||
qE9PZNOLtpnmGI+BQmQJemNhXE2o4NX5ry6w9Jl5nJ9GR0BRyMlsGpntWP+USzIk
|
||||
biqBOKEvQSi8ZkABuu18KvM9WkADu4uf+rnn89HW6uZ5cdwtPNQ4aXkauMSneYxl
|
||||
RVY5DdxblQnb9YdmRNkZz7enYvWzmaO/uXXHy5dtJJO5H65ZZ2UTOF5UU7jsy19X
|
||||
lHdSzKDAdKFR8NoEPhHn/AIVYqUuQa224GtIvVJMpdXMayasCKQo1lvKW86GhfLr
|
||||
h6KvKoNcH90H7PIkDvfb
|
||||
=PunS
|
||||
-----END PGP SIGNATURE-----
|
||||
193
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.10.ebuild
vendored
Normal file
193
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.10.ebuild
vendored
Normal file
@ -0,0 +1,193 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.10.ebuild,v 1.11 2013/06/02 08:40:32 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools eutils linux-info flag-o-matic python-any-r1 systemd virtualx user
|
||||
|
||||
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
|
||||
HOMEPAGE="http://dbus.freedesktop.org/"
|
||||
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( AFL-2.1 GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="debug doc selinux static-libs systemd test X"
|
||||
|
||||
RDEPEND=">=dev-libs/expat-2
|
||||
selinux? (
|
||||
sec-policy/selinux-dbus
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( sys-apps/systemd )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
>=dev-libs/glib-2.24
|
||||
${PYTHON_DEPS}
|
||||
)"
|
||||
|
||||
# out of sources build directory
|
||||
BD=${WORKDIR}/${P}-build
|
||||
# out of sources build dir for make check
|
||||
TBD=${WORKDIR}/${P}-tests-build
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup messagebus
|
||||
enewuser messagebus -1 -1 -1 messagebus
|
||||
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
|
||||
|
||||
# Tests were restricted because of this
|
||||
sed -i \
|
||||
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
|
||||
-e '/"dispatch"/d' \
|
||||
bus/test-main.c || die
|
||||
|
||||
# required for asneeded patch but also for bug 263909, cross-compile so
|
||||
# don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
append-flags -rdynamic
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--disable-silent-rules
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
$(use_enable kernel_linux inotify)
|
||||
$(use_enable kernel_FreeBSD kqueue)
|
||||
$(use_enable systemd)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-xml=expat
|
||||
--with-session-socket-dir=/tmp
|
||||
--with-system-pid-file=/var/run/dbus.pid
|
||||
--with-system-socket=/var/run/dbus/system_bus_socket
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
"$(systemd_with_unitdir)"
|
||||
)
|
||||
|
||||
mkdir "${BD}"
|
||||
cd "${BD}"
|
||||
einfo "Running configure in ${BD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable doc xml-docs) \
|
||||
$(use_enable doc doxygen-docs)
|
||||
|
||||
if use test; then
|
||||
mkdir "${TBD}"
|
||||
cd "${TBD}"
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable test asserts) \
|
||||
$(use_enable test checks) \
|
||||
$(use_enable test embedded-tests) \
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# after the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
cd "${BD}"
|
||||
einfo "Running make in ${BD}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
cd "${TBD}"
|
||||
einfo "Running make in ${TBD}"
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${TBD}"
|
||||
DBUS_VERBOSE=1 Xemake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newinitd "${FILESDIR}"/dbus.initd dbus
|
||||
|
||||
if use X; then
|
||||
# dbus X session script (#77504)
|
||||
# turns out to only work for GDM (and startx). has been merged into
|
||||
# other desktop (kdm and such scripts)
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
doexe "${FILESDIR}"/80-dbus
|
||||
fi
|
||||
|
||||
# needs to exist for dbus sessions to launch
|
||||
keepdir /usr/share/dbus-1/services
|
||||
keepdir /etc/dbus-1/{session,system}.d
|
||||
# machine-id symlink from pkg_postinst()
|
||||
keepdir /var/lib/dbus
|
||||
|
||||
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
|
||||
|
||||
cd "${BD}"
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
prune_libtool_files --all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [ "$(rc-config list default | grep dbus)" = "" ] ; then
|
||||
elog "To start the D-Bus system-wide messagebus by default"
|
||||
elog "you should add it to the default runlevel :"
|
||||
elog "\`rc-update add dbus default\`"
|
||||
elog
|
||||
fi
|
||||
|
||||
elog "Some applications require a session bus in addition to the system"
|
||||
elog "bus. Please see \`man dbus-launch\` for more information."
|
||||
elog
|
||||
|
||||
if [ "$(rc-status | grep dbus | grep started)" ] ; then
|
||||
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
|
||||
ewarn "the new version of the daemon."
|
||||
ewarn "Don't do this while X is running because it will restart your X as well."
|
||||
fi
|
||||
|
||||
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
|
||||
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
|
||||
# dependencies with hardcoded paths (although the known ones got fixed already)
|
||||
dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
|
||||
ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
|
||||
}
|
||||
1
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r1.ebuild
vendored
Symbolic link
1
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r1.ebuild
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
dbus-1.6.12.ebuild
|
||||
193
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild
vendored
Normal file
193
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild
vendored
Normal file
@ -0,0 +1,193 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.12.ebuild,v 1.12 2013/07/04 13:40:03 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools eutils linux-info flag-o-matic python-any-r1 systemd virtualx user
|
||||
|
||||
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
|
||||
HOMEPAGE="http://dbus.freedesktop.org/"
|
||||
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( AFL-2.1 GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="debug doc selinux static-libs systemd test X"
|
||||
|
||||
RDEPEND=">=dev-libs/expat-2
|
||||
selinux? (
|
||||
sec-policy/selinux-dbus
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( sys-apps/systemd )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
>=dev-libs/glib-2.24
|
||||
${PYTHON_DEPS}
|
||||
)"
|
||||
|
||||
# out of sources build directory
|
||||
BD=${WORKDIR}/${P}-build
|
||||
# out of sources build dir for make check
|
||||
TBD=${WORKDIR}/${P}-tests-build
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup messagebus
|
||||
enewuser messagebus -1 -1 -1 messagebus
|
||||
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
|
||||
|
||||
# Tests were restricted because of this
|
||||
sed -i \
|
||||
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
|
||||
-e '/"dispatch"/d' \
|
||||
bus/test-main.c || die
|
||||
|
||||
# required for asneeded patch but also for bug 263909, cross-compile so
|
||||
# don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
append-flags -rdynamic
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--sysconfdir=/usr/share
|
||||
--disable-silent-rules
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
$(use_enable kernel_linux inotify)
|
||||
$(use_enable kernel_FreeBSD kqueue)
|
||||
$(use_enable systemd)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-xml=expat
|
||||
--with-session-socket-dir=/tmp
|
||||
--with-system-pid-file=/var/run/dbus.pid
|
||||
--with-system-socket=/var/run/dbus/system_bus_socket
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
"$(systemd_with_unitdir)"
|
||||
)
|
||||
|
||||
mkdir "${BD}"
|
||||
cd "${BD}"
|
||||
einfo "Running configure in ${BD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable doc xml-docs) \
|
||||
$(use_enable doc doxygen-docs)
|
||||
|
||||
if use test; then
|
||||
mkdir "${TBD}"
|
||||
cd "${TBD}"
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable test asserts) \
|
||||
$(use_enable test checks) \
|
||||
$(use_enable test embedded-tests) \
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# after the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
cd "${BD}"
|
||||
einfo "Running make in ${BD}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
cd "${TBD}"
|
||||
einfo "Running make in ${TBD}"
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${TBD}"
|
||||
DBUS_VERBOSE=1 Xemake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newinitd "${FILESDIR}"/dbus.initd dbus
|
||||
|
||||
if use X; then
|
||||
# dbus X session script (#77504)
|
||||
# turns out to only work for GDM (and startx). has been merged into
|
||||
# other desktop (kdm and such scripts)
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
doexe "${FILESDIR}"/80-dbus
|
||||
fi
|
||||
|
||||
# needs to exist for dbus sessions to launch
|
||||
keepdir /usr/share/dbus-1/services
|
||||
# machine-id symlink from pkg_postinst()
|
||||
keepdir /var/lib/dbus
|
||||
|
||||
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
|
||||
|
||||
cd "${BD}"
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
prune_libtool_files --all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [ "$(rc-config list default | grep dbus)" = "" ] ; then
|
||||
elog "To start the D-Bus system-wide messagebus by default"
|
||||
elog "you should add it to the default runlevel :"
|
||||
elog "\`rc-update add dbus default\`"
|
||||
elog
|
||||
fi
|
||||
|
||||
elog "Some applications require a session bus in addition to the system"
|
||||
elog "bus. Please see \`man dbus-launch\` for more information."
|
||||
elog
|
||||
|
||||
if [ "$(rc-status | grep dbus | grep started)" ] ; then
|
||||
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
|
||||
ewarn "the new version of the daemon."
|
||||
ewarn "Don't do this while X is running because it will restart your X as well."
|
||||
fi
|
||||
|
||||
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
|
||||
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
|
||||
# dependencies with hardcoded paths (although the known ones got fixed already)
|
||||
dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
|
||||
ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
|
||||
}
|
||||
193
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.8-r1.ebuild
vendored
Normal file
193
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.8-r1.ebuild
vendored
Normal file
@ -0,0 +1,193 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.8-r1.ebuild,v 1.4 2013/03/02 14:29:14 mgorny Exp $
|
||||
|
||||
EAPI=4
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools eutils linux-info flag-o-matic python-any-r1 systemd virtualx user
|
||||
|
||||
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
|
||||
HOMEPAGE="http://dbus.freedesktop.org/"
|
||||
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( AFL-2.1 GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="debug doc selinux static-libs systemd test X"
|
||||
|
||||
RDEPEND=">=dev-libs/expat-2
|
||||
selinux? (
|
||||
sec-policy/selinux-dbus
|
||||
sys-libs/libselinux
|
||||
)
|
||||
systemd? ( >=sys-apps/systemd-44-r1 )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
>=dev-libs/glib-2.24
|
||||
${PYTHON_DEPS}
|
||||
)"
|
||||
|
||||
# out of sources build directory
|
||||
BD=${WORKDIR}/${P}-build
|
||||
# out of sources build dir for make check
|
||||
TBD=${WORKDIR}/${P}-tests-build
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup messagebus
|
||||
enewuser messagebus -1 -1 -1 messagebus
|
||||
|
||||
use test && python-any-r1_pkg_setup
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
|
||||
|
||||
# Tests were restricted because of this
|
||||
sed -i \
|
||||
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
|
||||
-e '/"dispatch"/d' \
|
||||
bus/test-main.c || die
|
||||
|
||||
# required for asneeded patch but also for bug 263909, cross-compile so
|
||||
# don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
append-flags -rdynamic
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--disable-silent-rules
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
$(use_enable kernel_linux inotify)
|
||||
$(use_enable kernel_FreeBSD kqueue)
|
||||
$(use_enable systemd)
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-xml=expat
|
||||
--with-session-socket-dir=/tmp
|
||||
--with-system-pid-file=/var/run/dbus.pid
|
||||
--with-system-socket=/var/run/dbus/system_bus_socket
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
"$(systemd_with_unitdir)"
|
||||
)
|
||||
|
||||
mkdir "${BD}"
|
||||
cd "${BD}"
|
||||
einfo "Running configure in ${BD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable doc xml-docs) \
|
||||
$(use_enable doc doxygen-docs)
|
||||
|
||||
if use test; then
|
||||
mkdir "${TBD}"
|
||||
cd "${TBD}"
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable test asserts) \
|
||||
$(use_enable test checks) \
|
||||
$(use_enable test embedded-tests) \
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# after the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
cd "${BD}"
|
||||
einfo "Running make in ${BD}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
cd "${TBD}"
|
||||
einfo "Running make in ${TBD}"
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${TBD}"
|
||||
DBUS_VERBOSE=1 Xemake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newinitd "${FILESDIR}"/dbus.initd dbus
|
||||
|
||||
if use X; then
|
||||
# dbus X session script (#77504)
|
||||
# turns out to only work for GDM (and startx). has been merged into
|
||||
# other desktop (kdm and such scripts)
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
doexe "${FILESDIR}"/80-dbus
|
||||
fi
|
||||
|
||||
# needs to exist for dbus sessions to launch
|
||||
keepdir /usr/share/dbus-1/services
|
||||
keepdir /etc/dbus-1/{session,system}.d
|
||||
# machine-id symlink from pkg_postinst()
|
||||
keepdir /var/lib/dbus
|
||||
|
||||
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
|
||||
|
||||
cd "${BD}"
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
prune_libtool_files --all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [ "$(rc-config list default | grep dbus)" = "" ] ; then
|
||||
elog "To start the D-Bus system-wide messagebus by default"
|
||||
elog "you should add it to the default runlevel :"
|
||||
elog "\`rc-update add dbus default\`"
|
||||
elog
|
||||
fi
|
||||
|
||||
elog "Some applications require a session bus in addition to the system"
|
||||
elog "bus. Please see \`man dbus-launch\` for more information."
|
||||
elog
|
||||
|
||||
if [ "$(rc-status | grep dbus | grep started)" ] ; then
|
||||
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
|
||||
ewarn "the new version of the daemon."
|
||||
ewarn "Don't do this while X is running because it will restart your X as well."
|
||||
fi
|
||||
|
||||
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
|
||||
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
|
||||
# dependencies with hardcoded paths (although the known ones got fixed already)
|
||||
dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
|
||||
ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
|
||||
}
|
||||
187
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.8.ebuild
vendored
Normal file
187
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.8.ebuild
vendored
Normal file
@ -0,0 +1,187 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.8.ebuild,v 1.10 2013/01/20 11:21:03 pinkbyte Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit autotools eutils linux-info flag-o-matic python virtualx user
|
||||
|
||||
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
|
||||
HOMEPAGE="http://dbus.freedesktop.org/"
|
||||
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( AFL-2.1 GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
|
||||
IUSE="debug doc selinux static-libs test X"
|
||||
|
||||
RDEPEND=">=dev-libs/expat-2
|
||||
selinux? (
|
||||
sec-policy/selinux-dbus
|
||||
sys-libs/libselinux
|
||||
)
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
)
|
||||
test? (
|
||||
>=dev-libs/glib-2.24
|
||||
dev-lang/python:2.7
|
||||
)"
|
||||
|
||||
# out of sources build directory
|
||||
BD=${WORKDIR}/${P}-build
|
||||
# out of sources build dir for make check
|
||||
TBD=${WORKDIR}/${P}-tests-build
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup messagebus
|
||||
enewuser messagebus -1 -1 -1 messagebus
|
||||
|
||||
if use test; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
|
||||
if use kernel_linux; then
|
||||
CONFIG_CHECK="~EPOLL"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
|
||||
|
||||
# Tests were restricted because of this
|
||||
sed -i \
|
||||
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
|
||||
-e '/"dispatch"/d' \
|
||||
bus/test-main.c || die
|
||||
|
||||
# required for asneeded patch but also for bug 263909, cross-compile so
|
||||
# don't remove eautoreconf
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# so we can get backtraces from apps
|
||||
append-flags -rdynamic
|
||||
|
||||
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
|
||||
# not on an SELinux profile.
|
||||
myconf=(
|
||||
--disable-silent-rules
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable debug verbose-mode)
|
||||
--disable-asserts
|
||||
--disable-checks
|
||||
$(use_enable selinux)
|
||||
$(use_enable selinux libaudit)
|
||||
$(use_enable kernel_linux inotify)
|
||||
$(use_enable kernel_FreeBSD kqueue)
|
||||
--disable-systemd
|
||||
--disable-embedded-tests
|
||||
--disable-modular-tests
|
||||
$(use_enable debug stats)
|
||||
--with-xml=expat
|
||||
--with-session-socket-dir=/tmp
|
||||
--with-system-pid-file=/var/run/dbus.pid
|
||||
--with-system-socket=/var/run/dbus/system_bus_socket
|
||||
--with-dbus-user=messagebus
|
||||
$(use_with X x)
|
||||
)
|
||||
|
||||
mkdir "${BD}"
|
||||
cd "${BD}"
|
||||
einfo "Running configure in ${BD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable doc xml-docs) \
|
||||
$(use_enable doc doxygen-docs)
|
||||
|
||||
if use test; then
|
||||
mkdir "${TBD}"
|
||||
cd "${TBD}"
|
||||
einfo "Running configure in ${TBD}"
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
|
||||
$(use_enable test asserts) \
|
||||
$(use_enable test checks) \
|
||||
$(use_enable test embedded-tests) \
|
||||
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# after the compile, it uses a selinuxfs interface to
|
||||
# check if the SELinux policy has the right support
|
||||
use selinux && addwrite /selinux/access
|
||||
|
||||
cd "${BD}"
|
||||
einfo "Running make in ${BD}"
|
||||
emake
|
||||
|
||||
if use test; then
|
||||
cd "${TBD}"
|
||||
einfo "Running make in ${TBD}"
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${TBD}"
|
||||
DBUS_VERBOSE=1 Xemake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newinitd "${FILESDIR}"/dbus.initd dbus
|
||||
|
||||
if use X; then
|
||||
# dbus X session script (#77504)
|
||||
# turns out to only work for GDM (and startx). has been merged into
|
||||
# other desktop (kdm and such scripts)
|
||||
exeinto /etc/X11/xinit/xinitrc.d
|
||||
doexe "${FILESDIR}"/80-dbus
|
||||
fi
|
||||
|
||||
# needs to exist for dbus sessions to launch
|
||||
keepdir /usr/share/dbus-1/services
|
||||
keepdir /etc/dbus-1/{session,system}.d
|
||||
# machine-id symlink from pkg_postinst()
|
||||
keepdir /var/lib/dbus
|
||||
|
||||
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
|
||||
|
||||
cd "${BD}"
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
prune_libtool_files --all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "To start the D-Bus system-wide messagebus by default"
|
||||
elog "you should add it to the default runlevel :"
|
||||
elog "\`rc-update add dbus default\`"
|
||||
elog
|
||||
elog "Some applications require a session bus in addition to the system"
|
||||
elog "bus. Please see \`man dbus-launch\` for more information."
|
||||
elog
|
||||
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
|
||||
ewarn "the new version of the daemon."
|
||||
ewarn "Don't do this while X is running because it will restart your X as well."
|
||||
|
||||
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
|
||||
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
|
||||
# dependencies with hardcoded paths (although the known ones got fixed already)
|
||||
dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
|
||||
ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
|
||||
}
|
||||
13
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/80-dbus
vendored
Normal file
13
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/80-dbus
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
|
||||
# launches a session dbus instance
|
||||
|
||||
dbuslaunch="`which dbus-launch 2>/dev/null`"
|
||||
if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||
if [ -n "$command" ]; then
|
||||
command="$dbuslaunch --exit-with-session $command"
|
||||
else
|
||||
eval `$dbuslaunch --sh-syntax --exit-with-session`
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
http://bugs.gentoo.org/405975
|
||||
|
||||
From e1b83fb58eadfd02227673db9a7e2833d29b0c98 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Mon, 23 Apr 2012 00:32:43 +0200
|
||||
Subject: [PATCH] selinux: when dropping capabilities only include AUDIT caps
|
||||
if we have them
|
||||
|
||||
When we drop capabilities we shouldn't assume we can keep
|
||||
CAP_AUDIT_WRITE unconditionally, since it will not be available when
|
||||
running in containers.
|
||||
|
||||
This patch only adds CAP_AUDIT_WRITE to the list of caps we keep if we
|
||||
actually have it in the first place.
|
||||
|
||||
This makes audit/selinux enabled D-Bus work in a Linux container.
|
||||
---
|
||||
bus/selinux.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bus/selinux.c b/bus/selinux.c
|
||||
index 36287e9..1bfc791 100644
|
||||
--- a/bus/selinux.c
|
||||
+++ b/bus/selinux.c
|
||||
@@ -1053,8 +1053,9 @@ _dbus_change_to_daemon_user (const char *user,
|
||||
int rc;
|
||||
|
||||
capng_clear (CAPNG_SELECT_BOTH);
|
||||
- capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
|
||||
- CAP_AUDIT_WRITE);
|
||||
+ if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE))
|
||||
+ capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
|
||||
+ CAP_AUDIT_WRITE);
|
||||
rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP);
|
||||
if (rc)
|
||||
{
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
diff --git a/bus/session.conf.in b/bus/session.conf.in
|
||||
index e121ff9..f364887 100644
|
||||
--- a/bus/session.conf.in
|
||||
+++ b/bus/session.conf.in
|
||||
@@ -28,10 +28,11 @@
|
||||
<!-- Config files are placed here that among other things,
|
||||
further restrict the above policy for specific services. -->
|
||||
<includedir>session.d</includedir>
|
||||
+ <includedir>/etc/dbus-1/session.d</includedir>
|
||||
|
||||
<!-- This is included last so local configuration can override what's
|
||||
in this standard file -->
|
||||
- <include ignore_missing="yes">session-local.conf</include>
|
||||
+ <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include>
|
||||
|
||||
<include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
|
||||
|
||||
diff --git a/bus/system.conf.in b/bus/system.conf.in
|
||||
index 92f4cc4..1863a03 100644
|
||||
--- a/bus/system.conf.in
|
||||
+++ b/bus/system.conf.in
|
||||
@@ -73,10 +73,11 @@
|
||||
<!-- Config files are placed here that among other things, punch
|
||||
holes in the above policy for specific services. -->
|
||||
<includedir>system.d</includedir>
|
||||
+ <includedir>/etc/dbus-1/system.d</includedir>
|
||||
|
||||
<!-- This is included last so local configuration can override what's
|
||||
in this standard file -->
|
||||
- <include ignore_missing="yes">system-local.conf</include>
|
||||
+ <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include>
|
||||
|
||||
<include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
|
||||
50
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd
vendored
Normal file
50
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
|
||||
|
||||
extra_started_commands="reload"
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
after bootmisc
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting D-BUS system messagebus"
|
||||
/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
|
||||
|
||||
# We need to test if /var/run/dbus exists, since script will fail if it does not
|
||||
[ ! -e /var/run/dbus ] && mkdir /var/run/dbus
|
||||
|
||||
start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
local retval
|
||||
|
||||
ebegin "Stopping D-BUS system messagebus"
|
||||
|
||||
start-stop-daemon --stop --pidfile /var/run/dbus.pid
|
||||
retval=$?
|
||||
|
||||
eend ${retval}
|
||||
|
||||
[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
|
||||
|
||||
return ${retval}
|
||||
}
|
||||
|
||||
reload() {
|
||||
local retval
|
||||
|
||||
ebegin "Reloading D-BUS messagebus config"
|
||||
|
||||
/usr/bin/dbus-send --print-reply --system --type=method_call \
|
||||
--dest=org.freedesktop.DBus \
|
||||
/ org.freedesktop.DBus.ReloadConfig > /dev/null
|
||||
retval=$?
|
||||
eend ${retval}
|
||||
return ${retval}
|
||||
}
|
||||
14
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml
vendored
Normal file
14
sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>freedesktop</herd>
|
||||
<maintainer>
|
||||
<email>freedesktop-bugs@gentoo.org</email>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name='systemd'>Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
871
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/ChangeLog
vendored
Normal file
871
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/ChangeLog
vendored
Normal file
@ -0,0 +1,871 @@
|
||||
# ChangeLog for sys-apps/systemd
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.174 2013/09/14 18:44:05 floppym Exp $
|
||||
|
||||
14 Sep 2013; Mike Gilbert <floppym@gentoo.org> systemd-207.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Replace --without-python with --disable-python-devel for non-native abis, bug
|
||||
484934.
|
||||
|
||||
*systemd-207 (14 Sep 2013)
|
||||
|
||||
14 Sep 2013; Michał Górny <mgorny@gentoo.org> +systemd-207.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Version bump. Update kernel checks. Do not check for HOTPLUG on 3.7+ wrt bug
|
||||
#476464. Run tests for native ABI only.
|
||||
|
||||
*systemd-206-r5 (14 Sep 2013)
|
||||
|
||||
14 Sep 2013; Pacho Ramos <pacho@gentoo.org>
|
||||
+files/206-0006-allow-tabs-in-configuration-files.patch,
|
||||
+files/206-0007-allow-tabs-in-configuration-files2.patch,
|
||||
+systemd-206-r5.ebuild:
|
||||
Allow tabs in environment files (#481554 by dolphinling)
|
||||
|
||||
13 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
|
||||
Sync the live ebuild with latest changes.
|
||||
|
||||
*systemd-206-r4 (11 Sep 2013)
|
||||
|
||||
11 Sep 2013; Michał Górny <mgorny@gentoo.org> +systemd-206-r4.ebuild:
|
||||
Introduce -r4 that uses separate sys-apps/gentoo-systemd-integration.
|
||||
Introduces local.d generator.
|
||||
|
||||
06 Sep 2013; Pacho Ramos <pacho@gentoo.org> systemd-204.ebuild,
|
||||
systemd-206-r3.ebuild:
|
||||
Check for TMPFS_POSIX_ACL when needed (#482336#c24 by Alexander Tsoy)
|
||||
|
||||
28 Aug 2013; Pacho Ramos <pacho@gentoo.org> systemd-204.ebuild,
|
||||
systemd-206-r3.ebuild:
|
||||
Update message about /etc/mtab link (#482786), show message about systemd-ui
|
||||
only when package is not installed (#480606)
|
||||
|
||||
11 Aug 2013; Mike Gilbert <floppym@gentoo.org> systemd-206-r3.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Call udevadm control --reload in pkg_postinst.
|
||||
|
||||
10 Aug 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
|
||||
Enable building multilib libgudev.
|
||||
|
||||
10 Aug 2013; Michał Górny <mgorny@gentoo.org> systemd-206-r3.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Add missing prune_libtool_files call.
|
||||
|
||||
09 Aug 2013; Michał Górny <mgorny@gentoo.org> -systemd-206-r1.ebuild,
|
||||
systemd-206-r3.ebuild, systemd-9999-r1.ebuild:
|
||||
Make polkit a PDEP to avoid circular dependency. Bug #480328.
|
||||
|
||||
09 Aug 2013; Michał Górny <mgorny@gentoo.org> systemd-206-r3.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Work-around 32-bit dbus check (it is not used by the libraries).
|
||||
|
||||
*systemd-206-r3 (09 Aug 2013)
|
||||
|
||||
09 Aug 2013; Michał Górny <mgorny@gentoo.org> +systemd-206-r3.ebuild,
|
||||
-systemd-206-r2.ebuild:
|
||||
Fix installing multilib pkg-config files.
|
||||
|
||||
08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> systemd-206-r2.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Raise the emul-linux-x86-baselibs block from -r7 to -r8 in order to avoid
|
||||
file collision w/ libsystemd-daemon wrt #480274 by "nE0sIghT"
|
||||
|
||||
*systemd-206-r2 (08 Aug 2013)
|
||||
|
||||
08 Aug 2013; Michał Górny <mgorny@gentoo.org> +systemd-206-r2.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Enable partial multilib support wrt bug #479620.
|
||||
|
||||
07 Aug 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
|
||||
Stable for x86, wrt bug #477910
|
||||
|
||||
04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
|
||||
Stable for ppc64, wrt bug #477910
|
||||
|
||||
04 Aug 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
|
||||
Sync kmod dep in the live ebuild.
|
||||
|
||||
03 Aug 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
|
||||
Update zsh-completion install after upstream cleanup.
|
||||
|
||||
31 Jul 2013; Michał Górny <mgorny@gentoo.org>
|
||||
-files/191-0001-Disable-udev-targets-for-udev-190.patch,
|
||||
-files/196-0001-Disable-udev-targets.patch,
|
||||
-files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch,
|
||||
-files/197-0001-Disable-udev-targets.patch,
|
||||
-files/198-0001-Disable-udev-targets.patch,
|
||||
-files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch,
|
||||
-files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch,
|
||||
-files/199-firmware.patch, -files/203-systemd-sleep.patch:
|
||||
Drop old patches.
|
||||
|
||||
*systemd-206-r1 (31 Jul 2013)
|
||||
|
||||
31 Jul 2013; Michał Górny <mgorny@gentoo.org>
|
||||
+files/206-0001-logind-update-state-file-after-generating-the-sessio.patch,
|
||||
+files/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch,
|
||||
+files/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch,
|
||||
+files/206-0004-tmpfiles-introduce-exclude-prefix.patch,
|
||||
+files/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch,
|
||||
+systemd-206-r1.ebuild, -systemd-205.ebuild, -systemd-206.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Fix gnome-shell<->logind race condition, bug #477954. Fix missing keymap
|
||||
location, bug #474946. Fix broken device permissions due to static-nodes, bug
|
||||
#478198. Check for CONFIG_AUDITSYSCALL, bug #478032. Add >=binutils-2.32.1
|
||||
dep, bug #479038.
|
||||
|
||||
31 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
|
||||
Finally drop compatibility symlinks. This time for real.
|
||||
|
||||
30 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd-206.ebuild,
|
||||
systemd-9999-r1.ebuild:
|
||||
Bump kernel dep to 3.0. Reported by ssuominen, thanks.
|
||||
|
||||
*systemd-9999-r1 (29 Jul 2013)
|
||||
|
||||
29 Jul 2013; Michał Górny <mgorny@gentoo.org> +systemd-9999-r1.ebuild,
|
||||
-systemd-9999.ebuild:
|
||||
Move the Gentoo-specific files from the live ebuild to gentoo-systemd-
|
||||
integration. Revbump to ensure smooth migration.
|
||||
|
||||
28 Jul 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
|
||||
Stable for arm, wrt bug #477910
|
||||
|
||||
28 Jul 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
|
||||
Stable for ppc, wrt bug #477910
|
||||
|
||||
27 Jul 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
|
||||
Stable for amd64, wrt bug #477910
|
||||
|
||||
24 Jul 2013; Mike Gilbert <floppym@gentoo.org> systemd-204.ebuild:
|
||||
Add missing inherit bash-completion-r1, bug 478038.
|
||||
|
||||
23 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd-206.ebuild:
|
||||
Bump kmod dep per bug #477886.
|
||||
|
||||
*systemd-206 (23 Jul 2013)
|
||||
|
||||
23 Jul 2013; Michał Górny <mgorny@gentoo.org> +systemd-206.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Version bump. Drop USE=keyword as it was replaced upstream by hwdb magic.
|
||||
|
||||
16 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-204.ebuild, systemd-205.ebuild, systemd-9999.ebuild:
|
||||
Use get_bashcompdir for future bash-completion compat.
|
||||
|
||||
14 Jul 2013; Mike Gilbert <floppym@gentoo.org> systemd-205.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Set file capabilities on systemd-detect-virt, bug 468876 by Michał
|
||||
Bartoszkiewicz.
|
||||
|
||||
*systemd-205 (05 Jul 2013)
|
||||
|
||||
05 Jul 2013; Michał Górny <mgorny@gentoo.org> +systemd-205.ebuild,
|
||||
-systemd-197-r1.ebuild, -systemd-200-r1.ebuild, -systemd-202.ebuild,
|
||||
-systemd-203-r1.ebuild, systemd-9999.ebuild:
|
||||
Version bump. Drop USE=static-libs since it is no longer supported. Drop old.
|
||||
|
||||
04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> systemd-201.ebuild:
|
||||
Stable for ppc64, wrt bug #465870
|
||||
|
||||
30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> systemd-201.ebuild:
|
||||
Stable for x86, wrt bug #465870
|
||||
|
||||
30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> systemd-201.ebuild:
|
||||
Stable for amd64, wrt bug #465870
|
||||
|
||||
20 Jun 2013; Agostino Sarubbo <ago@gentoo.org> systemd-204.ebuild:
|
||||
Add ~ppc, wrt bug #465870
|
||||
|
||||
25 May 2013; Agostino Sarubbo <ago@gentoo.org> systemd-201.ebuild:
|
||||
Stable for arm, wrt bug #465870
|
||||
|
||||
14 May 2013; Mike Gilbert <floppym@gentoo.org> systemd-201.ebuild,
|
||||
systemd-202.ebuild, systemd-203-r1.ebuild, systemd-204.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Depend on app-text/docbook-xml-dtd:4.2, bug 469668 by Alexander Tsoy.
|
||||
|
||||
*systemd-204 (13 May 2013)
|
||||
|
||||
13 May 2013; Michał Górny <mgorny@gentoo.org> +systemd-204.ebuild:
|
||||
Version bump.
|
||||
|
||||
*systemd-203-r1 (08 May 2013)
|
||||
|
||||
08 May 2013; Mike Gilbert <floppym@gentoo.org> +files/203-systemd-sleep.patch,
|
||||
+systemd-203-r1.ebuild, -systemd-203.ebuild:
|
||||
Apply upstream fix for systemd-sleep, bug 468998 by Paul Volkov.
|
||||
|
||||
*systemd-203 (07 May 2013)
|
||||
|
||||
07 May 2013; Michał Górny <mgorny@gentoo.org> +systemd-203.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Version bump. Simplify .la removal. Drop init= compatibility symlinks.
|
||||
|
||||
*systemd-202 (27 Apr 2013)
|
||||
|
||||
27 Apr 2013; Michal Gorny <mgorny@gentoo.org> +systemd-202.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Version bump. Use new --disable-tests option with USE=-test.
|
||||
|
||||
27 Apr 2013; Michal Gorny <mgorny@gentoo.org> systemd-200-r1.ebuild,
|
||||
systemd-201.ebuild, systemd-9999.ebuild:
|
||||
Enforce bash-completion dir to avoid automagic dependency on bash-completion.
|
||||
Fixes bug #467428.
|
||||
|
||||
19 Apr 2013; Mike Gilbert <floppym@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Skip python-single-r1_pkg_setup when python is disabled, bug 466408.
|
||||
|
||||
18 Apr 2013; William Hubbs <williamh@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
revert the check for CONFIG_FW_LOADER_USER_HELPER per mgorny since we force
|
||||
the firmware-loader use flag on.
|
||||
|
||||
18 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Remove CONFIG_ wrt firmware loading, it was unnecessary.
|
||||
|
||||
18 Apr 2013; Michał Górny <mgorny@gentoo.org> -systemd-198-r1.ebuild,
|
||||
metadata.xml:
|
||||
The required udev version has been removed.
|
||||
|
||||
18 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Fix mistyped gcc version number.
|
||||
|
||||
18 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Update the firmware-loader CONFIG_CHECK for 3.9 kernel. Thanks to WilliamH for
|
||||
noticing.
|
||||
|
||||
18 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Add a gcc version check wrt bug #466160.
|
||||
|
||||
17 Apr 2013; Michał Górny <mgorny@gentoo.org> metadata.xml,
|
||||
systemd-201.ebuild, systemd-9999.ebuild:
|
||||
Introduce USE=firmware-loader, as suggested by williamh. Check whether kernel
|
||||
supports loading firmwares and warn properly.
|
||||
|
||||
17 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Fix duplicated --enable-polkit.
|
||||
|
||||
17 Apr 2013; Michał Górny <mgorny@gentoo.org> metadata.xml,
|
||||
systemd-201.ebuild, systemd-9999.ebuild:
|
||||
Add USE=keymap to match udev ebuild.
|
||||
|
||||
16 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Put polkit under a USE flag since people may want to disable the whole policy
|
||||
magic.
|
||||
|
||||
16 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Perform kernel checks in pkg_pretend() to warn the user early. Use MERGE_TYPE
|
||||
as an efficient replacement for pkg_preinst() implications.
|
||||
|
||||
16 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Re-enable IMA, my mistake.
|
||||
|
||||
15 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild:
|
||||
Backport quota dep removal and configure cleanup from -9999. No need to
|
||||
revbump since the changes affect build process only.
|
||||
|
||||
15 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Remove redundant configure args. Disable deps which are not supported in
|
||||
Gentoo and therefore can result in automagic deps.
|
||||
|
||||
15 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Inline paths to quota tools and drop the dep.
|
||||
|
||||
*systemd-201 (14 Apr 2013)
|
||||
|
||||
14 Apr 2013; Michał Górny <mgorny@gentoo.org> +systemd-201.ebuild,
|
||||
-systemd-198-r5.ebuild:
|
||||
Version bump. Mostly bugfixes and minor features in the new release.
|
||||
|
||||
06 Apr 2013; Mike Gilbert <floppym@gentoo.org> metadata.xml,
|
||||
systemd-200-r1.ebuild, systemd-9999.ebuild:
|
||||
Add openrc use flag to control dependency on sys-fs/udev-init-scripts, bug
|
||||
464502.
|
||||
|
||||
05 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-200-r1.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Add a dependency on udev-init-scripts, to avoid breaking OpenRC installs if
|
||||
the package got unmerged.
|
||||
|
||||
*systemd-200-r1 (02 Apr 2013)
|
||||
|
||||
02 Apr 2013; Michał Górny <mgorny@gentoo.org> +systemd-200-r1.ebuild,
|
||||
-systemd-200.ebuild, systemd-9999.ebuild:
|
||||
Move udevadm temporarily to /bin as that is the official sys-fs/udev location
|
||||
for longer time than I expected.
|
||||
|
||||
31 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-200.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Obtain PAM moduledir from pam.eclass.
|
||||
|
||||
30 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-200.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Work around bug 463846 by exporting CC.
|
||||
|
||||
30 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-200.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Copy last two changes from live ebuild.
|
||||
|
||||
30 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
|
||||
Update hwids version per ssuominen.
|
||||
|
||||
30 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
|
||||
Move hwids to PDEPEND. Call udevadm to update the hwdb in pkg_postinst. Copied
|
||||
from the udev package.
|
||||
|
||||
29 Mar 2013; Michał Górny <mgorny@gentoo.org> -systemd-199.ebuild:
|
||||
Drop the unnecessary mid-version.
|
||||
|
||||
*systemd-200 (29 Mar 2013)
|
||||
|
||||
29 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-200.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Move the #ifdefs around a bit and remove double deps from the live ebuild.
|
||||
Bump to 200.
|
||||
|
||||
29 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Move udev executables to rootfs to avoid breaking the few systems which
|
||||
install systemd but aren't prepared for it. Symlink to the new locations for
|
||||
compat.
|
||||
|
||||
28 Mar 2013; Mike Gilbert <floppym@gentoo.org> +files/199-firmware.patch,
|
||||
systemd-199.ebuild:
|
||||
Add patch to resolve issue with firmware built-in, bug 463604.
|
||||
|
||||
*systemd-199 (27 Mar 2013)
|
||||
|
||||
27 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-199.ebuild:
|
||||
Version bump.
|
||||
|
||||
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Move nss_myhostname back to /usr -- it seems that nss handles this well.
|
||||
|
||||
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Enable EFI support unconditionally since it does not introduce any deps.
|
||||
|
||||
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Warn users who use compatibility symlinks for init=.
|
||||
|
||||
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Depend on baselayout to handle /run. Remove old warnings.
|
||||
|
||||
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Use get_udevdir rather than the deprecated one. Support installing static-libs
|
||||
wrt bug #463250. Disable SysV compat wrt bug #463270.
|
||||
|
||||
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Install udev to current udevdir to avoid breakages.
|
||||
|
||||
*systemd-198-r5 (25 Mar 2013)
|
||||
|
||||
25 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-198-r5.ebuild,
|
||||
-systemd-198-r4.ebuild:
|
||||
Re-introduce patches fixing bug #461210. Drop useless "README" files.
|
||||
|
||||
24 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-198-r4.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Run the install phase with a single make job, bug 463156 by Ray Griffin.
|
||||
|
||||
*systemd-198-r4 (24 Mar 2013)
|
||||
|
||||
24 Mar 2013; Mike Gilbert <floppym@gentoo.org> +systemd-198-r4.ebuild,
|
||||
-systemd-198-r3.ebuild, systemd-9999.ebuild:
|
||||
Fix collision with sys-apps/hwids.
|
||||
|
||||
*systemd-198-r3 (24 Mar 2013)
|
||||
|
||||
24 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-198-r3.ebuild,
|
||||
-files/199-0001-Disable-udev-targets.patch, metadata.xml, systemd-9999.ebuild:
|
||||
Install udev along with systemd again. Using a separate provider has proven to
|
||||
be unmaintainable.
|
||||
|
||||
24 Mar 2013; Michał Górny <mgorny@gentoo.org> -systemd-198-r2.ebuild,
|
||||
systemd-198-r1.ebuild:
|
||||
Require working udev version. Drop the unit requiring udev which Samuli broke.
|
||||
|
||||
*systemd-198-r2 (23 Mar 2013)
|
||||
|
||||
23 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-198-r2.ebuild,
|
||||
files/199-0001-Disable-udev-targets.patch, systemd-9999.ebuild:
|
||||
Handle moving initrd-udevadm-cleanup.service to sys-fs/udev. Update the live
|
||||
version patch.
|
||||
|
||||
*systemd-198-r1 (14 Mar 2013)
|
||||
|
||||
14 Mar 2013; Michał Górny <mgorny@gentoo.org>
|
||||
+files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch,
|
||||
+files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch,
|
||||
+systemd-198-r1.ebuild, -systemd-198.ebuild:
|
||||
Fix underlinking of libsystemd-login, bug #461210.
|
||||
|
||||
10 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Add libgcrypt to autoreconf deps.
|
||||
|
||||
10 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-198.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Create libdir before we move files into it, bug 460640.
|
||||
|
||||
10 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-198.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Create systemd-journal-gateway user/group if USE=http. Bug 461044 by Michał
|
||||
Bartoszkiewicz.
|
||||
|
||||
10 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Install zsh-completion file as _systemd, still bug #460640.
|
||||
|
||||
10 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Unconditionally add dependencies for full autoreconf, due to automake version
|
||||
mismatch potential resulting in autoreconf.
|
||||
|
||||
10 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Add missing multilib inherit.
|
||||
|
||||
*systemd-198 (09 Mar 2013)
|
||||
|
||||
09 Mar 2013; Michał Górny <mgorny@gentoo.org>
|
||||
+files/199-0001-Disable-udev-targets.patch, +systemd-198.ebuild,
|
||||
files/198-0001-Disable-udev-targets.patch, metadata.xml, systemd-9999.ebuild:
|
||||
Version bump. Move nss_myhostname to rootfs and install zsh completion (both
|
||||
bug #460640). Update the live version patch.
|
||||
|
||||
06 Mar 2013; Michał Górny <mgorny@gentoo.org>
|
||||
files/198-0001-Disable-udev-targets.patch:
|
||||
Rebase the future -198 build split patch on current git HEAD. Requested in bug
|
||||
#460538.
|
||||
|
||||
24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> systemd-197-r1.ebuild:
|
||||
Add ~ppc64, wrt bug #458360
|
||||
|
||||
08 Feb 2013; Michał Górny <mgorny@gentoo.org>
|
||||
+files/198-0001-Disable-udev-targets.patch, systemd-9999.ebuild:
|
||||
Update wrt changes to udev ebuild.
|
||||
|
||||
21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
systemd-197-r1.ebuild, systemd-9999.ebuild:
|
||||
Block nss-myhostname since it was merged into systemd-197 (bug#453026, thanks
|
||||
to Michał Bartoszkiewicz).
|
||||
|
||||
21 Jan 2013; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
|
||||
Append to the DEPEND variable instead of overwriting it.
|
||||
|
||||
21 Jan 2013; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
|
||||
Update live ebuild with previous change.
|
||||
|
||||
21 Jan 2013; Mike Gilbert <floppym@gentoo.org> systemd-197-r1.ebuild:
|
||||
udev-197-r3 is good enough as it does install sd-daemon.h.
|
||||
|
||||
21 Jan 2013; Michał Górny <mgorny@gentoo.org> -systemd-196.ebuild,
|
||||
systemd-197-r1.ebuild, systemd-9999.ebuild:
|
||||
Drop old as requested by ssuominen. Bump udev requirement to avoid bug
|
||||
#452972.
|
||||
|
||||
*systemd-197-r1 (21 Jan 2013)
|
||||
|
||||
21 Jan 2013; Mike Gilbert <floppym@gentoo.org> +systemd-197-r1.ebuild,
|
||||
-systemd-197.ebuild, systemd-9999.ebuild:
|
||||
Disable SysV init script compatibility. Thanks to Michał Bartoszkiewicz on bug
|
||||
453260.
|
||||
|
||||
20 Jan 2013; Michał Górny <mgorny@gentoo.org> systemd-197.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Remove pointless README files installed in random system locations.
|
||||
|
||||
19 Jan 2013; Michał Górny <mgorny@gentoo.org>
|
||||
files/197-0001-Disable-udev-targets.patch, systemd-197.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Fix installing udev rules for the new udev location.
|
||||
|
||||
*systemd-197 (18 Jan 2013)
|
||||
|
||||
18 Jan 2013; Michał Górny <mgorny@gentoo.org> +systemd-197.ebuild,
|
||||
files/197-0001-Disable-udev-targets.patch, systemd-9999.ebuild:
|
||||
Commit the incomplete/broken ebuild to let people submit patches.
|
||||
|
||||
11 Jan 2013; Michał Górny <mgorny@gentoo.org> -systemd-195.ebuild,
|
||||
systemd-196.ebuild, systemd-9999.ebuild:
|
||||
Bump the sys-apps/dbus dependency, per bug #451402. Drop old.
|
||||
|
||||
08 Jan 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Remove unnecessary enewuser/enewgroup -- spotted by WilliamH.
|
||||
|
||||
08 Jan 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
|
||||
Update the journald catalogs when rebuilding systemd.
|
||||
|
||||
17 Dec 2012; Michał Górny <mgorny@gentoo.org> systemd-196.ebuild,
|
||||
systemd-9999.ebuild:
|
||||
Bump to EAPI=5 to make Paludis happy, bug #447524.
|
||||
|
||||
*systemd-9999 (15 Dec 2012)
|
||||
|
||||
15 Dec 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/197-0001-Disable-udev-targets.patch, +systemd-9999.ebuild:
|
||||
Import the live ebuild.
|
||||
|
||||
05 Dec 2012; Michał Górny <mgorny@gentoo.org> metadata.xml,
|
||||
systemd-196.ebuild:
|
||||
Make kmod optional, bug #446138.
|
||||
|
||||
04 Dec 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch,
|
||||
systemd-196.ebuild:
|
||||
Do not require libgcrypt macros when gcrypt is disabled, bug #445920.
|
||||
|
||||
*systemd-196 (02 Dec 2012)
|
||||
|
||||
02 Dec 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/196-0001-Disable-udev-targets.patch, +systemd-196.ebuild,
|
||||
-files/0001-Disable-udev-targets-for-udev-189.patch,
|
||||
-files/0002-journald-add-missing-includes.patch,
|
||||
-files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch,
|
||||
-files/0004-journal-don-t-try-to-compress-without-XZ.patch,
|
||||
-files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch,
|
||||
-files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch,
|
||||
-files/update-etc-systemd-symlinks.path,
|
||||
-files/update-etc-systemd-symlinks.service,
|
||||
-files/update-etc-systemd-symlinks.sh:
|
||||
Version bump. Enable Python support. Drop old patches.
|
||||
|
||||
01 Dec 2012; Michał Górny <mgorny@gentoo.org> -systemd-189-r3.ebuild,
|
||||
-systemd-191-r1.ebuild, -systemd-192.ebuild, -systemd-193.ebuild,
|
||||
-systemd-194.ebuild:
|
||||
Drop old.
|
||||
|
||||
27 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd-195.ebuild:
|
||||
Disable storing coredumps again, since it is insecure (bug #433457, c9).
|
||||
|
||||
26 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd-195.ebuild:
|
||||
Fix udev dep, once and for all.
|
||||
|
||||
*systemd-195 (26 Oct 2012)
|
||||
|
||||
26 Oct 2012; Michał Górny <mgorny@gentoo.org> +systemd-195.ebuild,
|
||||
metadata.xml:
|
||||
Version bump. Re-enable coredumps since a tool to read them was introduced.
|
||||
Add USE=vanilla to disable Gentoo-specific quirks as requested by Léo Gillot-
|
||||
Lamure (via mail). Remove PAM .la file wrt bug #424900.
|
||||
|
||||
04 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd-194.ebuild:
|
||||
Preserve empty directories, per bug #437008.
|
||||
|
||||
*systemd-194 (04 Oct 2012)
|
||||
|
||||
04 Oct 2012; Michał Górny <mgorny@gentoo.org> +systemd-194.ebuild:
|
||||
Version bump.
|
||||
|
||||
*systemd-193 (30 Sep 2012)
|
||||
|
||||
30 Sep 2012; Michał Górny <mgorny@gentoo.org> +systemd-193.ebuild,
|
||||
metadata.xml:
|
||||
Version bump.
|
||||
|
||||
*systemd-192 (26 Sep 2012)
|
||||
|
||||
26 Sep 2012; Michał Górny <mgorny@gentoo.org> +systemd-192.ebuild:
|
||||
Version bump.
|
||||
|
||||
*systemd-191-r1 (26 Sep 2012)
|
||||
|
||||
26 Sep 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch,
|
||||
+systemd-191-r1.ebuild, -systemd-190.ebuild, -systemd-191.ebuild:
|
||||
Fix libc segfault, bug #436196.
|
||||
|
||||
24 Sep 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/191-0001-Disable-udev-targets-for-udev-190.patch,
|
||||
+files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch,
|
||||
-files/0001-Disable-udev-targets-for-udev-190.patch, systemd-191.ebuild:
|
||||
Fix journald prototype missync, bug #436098.
|
||||
|
||||
*systemd-191 (22 Sep 2012)
|
||||
*systemd-190 (22 Sep 2012)
|
||||
|
||||
22 Sep 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0001-Disable-udev-targets-for-udev-190.patch, +systemd-190.ebuild,
|
||||
+systemd-191.ebuild:
|
||||
Version bump.
|
||||
|
||||
21 Sep 2012; Michał Górny <mgorny@gentoo.org>
|
||||
-files/0001-Disable-udev-targets-for-udev-188.patch,
|
||||
-files/0001-util-never-follow-symlinks-in-rm_rf_children.patch,
|
||||
-files/0002-journal-PAGE_SIZE-is-not-known-on-ppc-and-other-arch.patch,
|
||||
-systemd-44-r2.ebuild:
|
||||
Drop old.
|
||||
|
||||
*systemd-189-r3 (17 Sep 2012)
|
||||
|
||||
17 Sep 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0004-journal-don-t-try-to-compress-without-XZ.patch,
|
||||
+systemd-189-r3.ebuild, -systemd-189-r2.ebuild:
|
||||
Backport patch for journal storage without USE=lzma, wrt bug #434972.
|
||||
|
||||
*systemd-189-r2 (08 Sep 2012)
|
||||
|
||||
08 Sep 2012; Michał Górny <mgorny@gentoo.org> +systemd-189-r2.ebuild,
|
||||
-systemd-189-r1.ebuild:
|
||||
Actually enable /var/lock and /var/run mounts. Stupid me.
|
||||
|
||||
07 Sep 2012; Michał Górny <mgorny@gentoo.org> systemd-189-r1.ebuild:
|
||||
sulogin has been moved to util-linux, adjust the dep.
|
||||
|
||||
*systemd-189-r1 (03 Sep 2012)
|
||||
|
||||
03 Sep 2012; Michał Górny <mgorny@gentoo.org> +files/var-lock.mount,
|
||||
+files/var-run.mount, +systemd-189-r1.ebuild, -systemd-188-r1.ebuild,
|
||||
-systemd-189.ebuild:
|
||||
Fix missing /var/lock & /var/run mountpoints, bug #433607.
|
||||
|
||||
28 Aug 2012; Zac Medico <zmedico@gentoo.org> systemd-188-r1.ebuild,
|
||||
systemd-189.ebuild:
|
||||
Fix COMMON_RDEPEND typo for bug #432794.
|
||||
|
||||
25 Aug 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch,
|
||||
systemd-189.ebuild:
|
||||
Backport patch for USE=-lzma build failure. Bug #432700.
|
||||
|
||||
*systemd-189 (24 Aug 2012)
|
||||
|
||||
24 Aug 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0001-Disable-udev-targets-for-udev-189.patch,
|
||||
+files/0002-journald-add-missing-includes.patch, +systemd-189.ebuild,
|
||||
metadata.xml:
|
||||
Version bump.
|
||||
|
||||
*systemd-188-r1 (15 Aug 2012)
|
||||
|
||||
15 Aug 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0001-Disable-udev-targets-for-udev-188.patch, +systemd-188-r1.ebuild,
|
||||
-files/0001-Disable-udev-targets.patch, -systemd-188.ebuild:
|
||||
Revbump and sync for udev-188. Install logind udev rules wrt bug #431152.
|
||||
|
||||
11 Aug 2012; Michał Górny <mgorny@gentoo.org> metadata.xml,
|
||||
systemd-188.ebuild:
|
||||
Remove leftover from USE=doc, and cleanup metadata.xml.
|
||||
|
||||
11 Aug 2012; Michał Górny <mgorny@gentoo.org>
|
||||
files/0001-Disable-udev-targets.patch:
|
||||
Update the udev removal patch to remove two more rule files, wrt #430872.
|
||||
|
||||
*systemd-188 (11 Aug 2012)
|
||||
|
||||
11 Aug 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0001-Disable-udev-targets.patch, +systemd-188.ebuild,
|
||||
-files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch,
|
||||
-files/40-gentoo.rules, -systemd-186.ebuild, -systemd-187.ebuild,
|
||||
metadata.xml:
|
||||
Version bump. Use sys-fs/udev again.
|
||||
|
||||
09 Aug 2012; Michał Górny <mgorny@gentoo.org> metadata.xml,
|
||||
systemd-44-r2.ebuild:
|
||||
Fix the dep to accept udev-187-r1, wrt bug #430470.
|
||||
|
||||
*systemd-44-r2 (09 Aug 2012)
|
||||
|
||||
09 Aug 2012; Michał Górny <mgorny@gentoo.org> +systemd-44-r2.ebuild,
|
||||
-systemd-29-r3.ebuild, -systemd-29-r6.ebuild, -systemd-39.ebuild,
|
||||
-systemd-44-r1.ebuild:
|
||||
Drop old, and require older udev in older systemd.
|
||||
|
||||
*systemd-187 (06 Aug 2012)
|
||||
|
||||
06 Aug 2012; Michał Górny <mgorny@gentoo.org>
|
||||
+files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch,
|
||||
+systemd-187.ebuild:
|
||||
Version bump. Update udev firmware search path and add /lib support patch.
|
||||
|
||||
*systemd-186 (09 Jul 2012)
|
||||
|
||||
09 Jul 2012; Michał Górny <mgorny@gentoo.org> +files/40-gentoo.rules,
|
||||
+systemd-186.ebuild, -systemd-185.ebuild:
|
||||
Version bump. Integrate some code from the udev ebuild.
|
||||
|
||||
22 Jun 2012; Michał Górny <mgorny@gentoo.org> systemd-185.ebuild:
|
||||
Disable out-of-source build wrt bug #422927.
|
||||
|
||||
*systemd-185 (20 Jun 2012)
|
||||
|
||||
20 Jun 2012; Michał Górny <mgorny@gentoo.org> +systemd-185.ebuild,
|
||||
metadata.xml:
|
||||
Version bump. The new version comes with bundled udev and is highly
|
||||
experimental. You need to put udev in package.provided to use it, and beware -
|
||||
something will break, certainly.
|
||||
|
||||
24 May 2012; Mike Frysinger <vapier@gentoo.org> systemd-29-r3.ebuild,
|
||||
systemd-29-r6.ebuild, systemd-39.ebuild, systemd-44-r1.ebuild:
|
||||
Inherit user for enewuser/etc...
|
||||
|
||||
*systemd-44-r1 (02 May 2012)
|
||||
|
||||
02 May 2012; Michał Górny <mgorny@gentoo.org> -systemd-44.ebuild,
|
||||
+systemd-44-r1.ebuild:
|
||||
systemd-analyze works only with py2.7, wrt bug #413755.
|
||||
|
||||
06 Apr 2012; Michał Górny <mgorny@gentoo.org> systemd-44.ebuild,
|
||||
+files/0002-journal-PAGE_SIZE-is-not-known-on-ppc-and-other-arch.patch:
|
||||
Add a patch for ARM and keyword wrt bug #410973.
|
||||
|
||||
05 Apr 2012; Michał Górny <mgorny@gentoo.org> systemd-44.ebuild:
|
||||
Avoid installing duplicate systemadm manpage.
|
||||
|
||||
*systemd-44 (05 Apr 2012)
|
||||
|
||||
05 Apr 2012; Michał Górny <mgorny@gentoo.org> -systemd-43.ebuild,
|
||||
+systemd-44.ebuild,
|
||||
+files/0001-util-never-follow-symlinks-in-rm_rf_children.patch:
|
||||
Version bump wrt bug #376047.
|
||||
|
||||
04 Apr 2012; Michał Górny <mgorny@gentoo.org> systemd-29-r3.ebuild,
|
||||
systemd-29-r6.ebuild, systemd-39.ebuild, systemd-43.ebuild:
|
||||
Add doc building deps wrt bug #410615.
|
||||
|
||||
08 Mar 2012; Michał Górny <mgorny@gentoo.org> systemd-43.ebuild:
|
||||
Restore UI parts in the ebuild.
|
||||
|
||||
05 Mar 2012; Michał Górny <mgorny@gentoo.org> -systemd-37-r1.ebuild,
|
||||
-systemd-37-r4.ebuild, -systemd-38-r1.ebuild:
|
||||
Due to security bug #406655, remove offending versions.
|
||||
|
||||
*systemd-43 (23 Feb 2012)
|
||||
|
||||
23 Feb 2012; Michał Górny <mgorny@gentoo.org> +systemd-43.ebuild:
|
||||
Version bump.
|
||||
|
||||
*systemd-39 (02 Feb 2012)
|
||||
|
||||
02 Feb 2012; Michał Górny <mgorny@gentoo.org> +systemd-39.ebuild:
|
||||
Version bump.
|
||||
|
||||
*systemd-38-r1 (21 Jan 2012)
|
||||
*systemd-37-r4 (21 Jan 2012)
|
||||
*systemd-29-r6 (21 Jan 2012)
|
||||
|
||||
21 Jan 2012; Michał Górny <mgorny@gentoo.org> -systemd-29-r5.ebuild,
|
||||
+systemd-29-r6.ebuild, -systemd-37-r3.ebuild, +systemd-37-r4.ebuild,
|
||||
-systemd-38.ebuild, +systemd-38-r1.ebuild:
|
||||
Fix installing pam_systemd.so to /lib*/security. Also, backport a few other
|
||||
fixes.
|
||||
|
||||
14 Jan 2012; William Hubbs <williamh@gentoo.org> systemd-29-r3.ebuild,
|
||||
systemd-29-r5.ebuild, systemd-37-r1.ebuild, systemd-37-r3.ebuild,
|
||||
systemd-38.ebuild:
|
||||
move the creation of /run to pkg_postinst (approved by mgorny)
|
||||
|
||||
*systemd-38 (11 Jan 2012)
|
||||
|
||||
11 Jan 2012; Michał Górny <mgorny@gentoo.org> +systemd-38.ebuild:
|
||||
Version bump. This is the first release including systemd-journald for
|
||||
logging.
|
||||
|
||||
*systemd-37-r3 (10 Jan 2012)
|
||||
*systemd-29-r5 (10 Jan 2012)
|
||||
|
||||
10 Jan 2012; Michał Górny <mgorny@gentoo.org> -systemd-29-r4.ebuild,
|
||||
+systemd-29-r5.ebuild, -systemd-37-r2.ebuild, +systemd-37-r3.ebuild:
|
||||
Add systemctl compatibility symlink.
|
||||
|
||||
*systemd-37-r2 (06 Jan 2012)
|
||||
*systemd-29-r4 (06 Jan 2012)
|
||||
|
||||
06 Jan 2012; Michał Górny <mgorny@gentoo.org> systemd-29-r3.ebuild,
|
||||
+systemd-29-r4.ebuild, systemd-37-r1.ebuild, +systemd-37-r2.ebuild,
|
||||
+files/update-etc-systemd-symlinks.path,
|
||||
+files/update-etc-systemd-symlinks.service,
|
||||
+files/update-etc-systemd-symlinks.sh:
|
||||
Migrate to /usr.
|
||||
|
||||
*systemd-37-r1 (12 Dec 2011)
|
||||
*systemd-29-r3 (12 Dec 2011)
|
||||
|
||||
12 Dec 2011; Michał Górny <mgorny@gentoo.org> -systemd-29-r2.ebuild,
|
||||
+systemd-29-r3.ebuild, -systemd-37.ebuild, +systemd-37-r1.ebuild,
|
||||
+files/gentoo-run.conf:
|
||||
Create /run/lock as enforced by new OpenRC.
|
||||
|
||||
06 Nov 2011; Michał Górny <mgorny@gentoo.org> systemd-37.ebuild:
|
||||
Re-introduce keywords to the systemd ebuild as package.mask entry was
|
||||
introduced.
|
||||
|
||||
*systemd-37 (16 Oct 2011)
|
||||
|
||||
16 Oct 2011; Michał Górny <mgorny@gentoo.org> -systemd-36.ebuild,
|
||||
+systemd-37.ebuild:
|
||||
Version bump.
|
||||
|
||||
*systemd-36 (25 Sep 2011)
|
||||
|
||||
25 Sep 2011; Michał Górny <mgorny@gentoo.org> -systemd-32.ebuild,
|
||||
-systemd-35.ebuild, +systemd-36.ebuild:
|
||||
Version bump. Still masked due to udev dep.
|
||||
|
||||
*systemd-35 (05 Sep 2011)
|
||||
|
||||
05 Sep 2011; Michał Górny <mgorny@gentoo.org> +systemd-35.ebuild:
|
||||
Version bump. Still masked due to udev not bumped.
|
||||
|
||||
*systemd-29-r2 (15 Aug 2011)
|
||||
|
||||
15 Aug 2011; Michał Górny <mgorny@gentoo.org> -systemd-29-r1.ebuild,
|
||||
+systemd-29-r2.ebuild:
|
||||
Backport a few ebuild changes to -29: delay kernel checks and make them
|
||||
non-obligatory, report optional deps, bump vala slot.
|
||||
|
||||
*systemd-32 (09 Aug 2011)
|
||||
|
||||
09 Aug 2011; Michał Górny <mgorny@gentoo.org> +systemd-32.ebuild:
|
||||
Version bump. Committing unkeyworded as udev is delaying bump, bug #375263.
|
||||
|
||||
24 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-29-r1.ebuild:
|
||||
Add systemd inherit to silence the new portage QA warning.
|
||||
|
||||
*systemd-29-r1 (24 Jun 2011)
|
||||
|
||||
24 Jun 2011; Michał Górny <mgorny@gentoo.org> -systemd-28.ebuild,
|
||||
-systemd-29.ebuild, +systemd-29-r1.ebuild:
|
||||
Use bash-completion eclass to install bash completion file correctly.
|
||||
Temp-install docs to ${D}/tmp as well.
|
||||
|
||||
*systemd-29 (17 Jun 2011)
|
||||
|
||||
17 Jun 2011; Michał Górny <mgorny@gentoo.org> +systemd-29.ebuild:
|
||||
Version bump.
|
||||
|
||||
15 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
|
||||
metadata.xml:
|
||||
Support plymouth as requested by Christoph Brill.
|
||||
|
||||
10 Jun 2011; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
||||
Switch the maintainer to systemd@g.o alias.
|
||||
|
||||
08 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild:
|
||||
Fix DESCRIPTION. Rely on dbus-1.4.10 to set up /etc/machine-id for us. Add a
|
||||
warning about downsides of having /etc/mtab symlinked, reformat messages.
|
||||
|
||||
07 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
|
||||
metadata.xml:
|
||||
Support libcryptsetup, misc fixes.
|
||||
|
||||
06 Jun 2011; Robert Piasek <dagger@gentoo.org> metadata.xml:
|
||||
Add dagger to metadata as maintainer
|
||||
|
||||
*systemd-28 (06 Jun 2011)
|
||||
|
||||
06 Jun 2011; Michał Górny <mgorny@gentoo.org> +systemd-28.ebuild,
|
||||
+metadata.xml:
|
||||
Introduce sys-apps/systemd wrt bug #318365. The ebuild is currently
|
||||
hard-masked for testing.
|
||||
33
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest
vendored
Normal file
33
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest
vendored
Normal file
@ -0,0 +1,33 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX 206-0001-logind-update-state-file-after-generating-the-sessio.patch 3341 SHA256 642a08dbcfa0517515570fd7537569ce0c7caa0c2b90274e80d999b6dd8e8d6a SHA512 1a901777c0a586ad5e4fcf6380784e451754c9ac65cf6e83641a6a2af2bed9f0741316d6aedb5d960a6c828186f4dcce79c7cc8234607f7f164253abd7cdfeed WHIRLPOOL 34639bc6dd4250209383c97061c09ded8d01f8962e19a39a9b2d848edf4fc4c6dbd3d6a5ff5563c2057c033d8a95ef46de7f116e3bbaee330bdbc26bb60d5b91
|
||||
AUX 206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch 996 SHA256 494bd90cb327cd0bd08f7d8183802d6c91238b1cfab19dee312c704869fa23b6 SHA512 ff4db4bfb2d4050b276c487e9d7cba39b9cd26b62ff455c2c0d21f31f6d313453de73743974266f6ba1ee4aca50639c1abba40f73ed58f32dda8831b3b649337 WHIRLPOOL bada3e79aa856e7a67ffb6603f27b94d3b359536036e12c931181e6e768c0e0c91edfdab0c0d30bdd40fffb1bc27d653700aa3c410e122ae0653003b1bdad5cd
|
||||
AUX 206-0003-tmpfiles-support-passing-prefix-multiple-times.patch 2991 SHA256 94d66e0bdd45fea0648971e9ef234e03bb743fd32444d972f5e8f293847aed01 SHA512 980134aac21cb7f0883a6326f62abaa32adf65b5b1263d14a2efacdadf2a7f46f4549b79077f0f087914e3b513981763f7065c915f959853ae34a6a1b2c0b323 WHIRLPOOL 73a3b5737c80c2ff6ae8050ca471bd2cf6d62a85de82d482eb12819d6eef90739ffd785b8f65ad17d88def79685a69e561373cf2aa57c88dd582002e37b06107
|
||||
AUX 206-0004-tmpfiles-introduce-exclude-prefix.patch 6467 SHA256 dc87aab586d1b4c1fa3747df6c10e48472f404dcda83a41609bf12340cece0c7 SHA512 24707c2e865bf832b76ae127e4796bbc264da69600643ecd626b1acc03609602b5517975da29dd664cd3148e0696161298c1778ccbeb6559fe520cd33414a1c5 WHIRLPOOL 12394930e1aadb98cc24826352430c1de06ac5b5d58ff841e4ca415569cf8bda3c1509a580b647595f3a752988c348a773a808890db76c9e323e01137d48e8eb
|
||||
AUX 206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch 857 SHA256 1fdd94d2968aab1ac909dda98efd11a805ba5cbaeab765f1bc477816a61ae38f SHA512 774bfb95667c405d6d63e5e60a1b814d7125170700753135a41b5af4186872f907a8dc486e8dff0c222b7f3cf66776f52f76fb5354a40293c90cca739558007e WHIRLPOOL 29039d1a63012bf1f7bd419b6056c95150b940fc9009a941af6cdad6dfb43732614cef6594c6c9e2b16b29e2de8a55566f00b336d1f7c05706e699323b626cb2
|
||||
AUX 206-0006-allow-tabs-in-configuration-files.patch 1991 SHA256 2fe01d46e79cde6dc15d0462b2568056e679f8d5556601c1b2cd832417de2957 SHA512 bbb03e8a7358897f1b29d88640c21dad29fa4daa68c72bcc6f2269ae233bc9dbce3cb35268f17db4d48fde8d9b2f1e574101e65b4dd0dcc559b75a06cb32d1e9 WHIRLPOOL 1db0cb922741da0163d3ab425d4399938d5f9ca74c70be60c8a8d9b6d0b9036416c51f1d09ee2b48468a48021464f5e9e8f8e6e619bd9c20e886f8e61e139170
|
||||
AUX 206-0007-allow-tabs-in-configuration-files2.patch 667 SHA256 391bdd6936809096d000506ef4c800d938ff1b979b5740a920350b710f81133a SHA512 7adbbd72678a07e0865b8ca0daf95ce0a441370c37d7bef1e459c08abb085237f3ee6c06db0cc7617f3786329c9feb9f7617b1b66dfc28de99c1bb9e3dfb11f7 WHIRLPOOL 540ba0c2814c4bd3675a2ee998507f7e74dd43e7ab123e2aeec0c674cdfd123ccfce37a0eaceb05f691fc101465a7c046dfe4d91775005bb16c8340987ac7eb0
|
||||
AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed
|
||||
AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa8ec2aafc22868a SHA512 8a4d72c63794676a01db2792b44fa39ec4ea80db97f2b54904f5b118a776c08721d360f8bb2ed15da12e922dbac3f2a431d6a6f98831bef3520d781d97d665db WHIRLPOOL e83955a1d86400ee16d35d61eaa35fb3050af2b2805a2049c37a602be1bd60233caaa1cadbbd4a3b3e425a44629c9cac921a5c4b2fca9003a45e49b89298ca50
|
||||
AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01
|
||||
DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe899c03ed5ebec7e70c8cc10 SHA512 e181b0bd0d0169890f99733d5e61ca506115b50d702b24895add5240ef3929ed9add87b0d3fd34a3366c1830339f6e4b5aa50f763f6d7d75b80ce677d35c385d WHIRLPOOL 84465cc8b3a97c2fbf120c8515ced6a759c1dec2df525b92a552308e1060475bf889de92a05ad470a2d56b582e3190dcc37aa4d009c8a0714411894cfed99376
|
||||
DIST systemd-204.tar.xz 2186264 SHA256 072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b SHA512 a2fe02f8ab4197bb4ff40c1c3e145370ebc5f3edfe97e6eb179086c42270523f76b49b5dd7dae0c52742a71bfb6a4217ecfa27cc6032faf5d4fe10b1264ed110 WHIRLPOOL 13baafbab202d2b1aa538281261a2bd70faa8634d4dc61f3ade6780f2e27b3e35919b7eb8a9258b66150924c8f2e82aa310a9a952f1f4e8128038b544a5c09df
|
||||
DIST systemd-206.tar.xz 2340536 SHA256 4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de SHA512 0e8270981f549875519485657ccf4f8f69f6e4d2000dba3419c39bd710abbf6e8ab5fce038b75a220e6fc1ba2d66e1582d492feb7710d0539c5f7a5918d5ae31 WHIRLPOOL f8033865f236aa06c649d40ccaa3c8cb12de1f42863d3f824740b2f076945fc5c9dd131cadd995b313b20b04363d32507e85de61afae7f77ac9c62c3ad236b83
|
||||
DIST systemd-207.tar.xz 2363804 SHA256 ac1f8120315e7969063bbb0c181c8dc59509aeaf10c4266077c257a182ad5942 SHA512 566c6126fea038cb182608f7b9c3bb4410d0622cb637f30c60fba73c9052f7a36d2b0f790e3d94bb751080448ba14cee600481da378f5e97b0f5becfc849be54 WHIRLPOOL 823c3064e1e961599011d4cd027f5e2d0ba3b434c67b880d1a541720220f40c7cc82211f3f086042dbb440b2c7e11e1379aa0d656e33a2a7ba5b1d7e45b904f7
|
||||
EBUILD systemd-201.ebuild 8320 SHA256 a7e696450c4ec2875c38678b26b6445e5b53672edf42553178ff2661cf14fb29 SHA512 ddf8484af18c3a995dce1b544c0e8099cc0a78422c113533be036365adb03ca6d915243fd256dfebea320baa6db602fd1f4790fbaceffad08b8d31494c828f73 WHIRLPOOL e8e90d0e6bc6dae01bd589547ba7c5af604046f02b9b5aaca6fa7e99681b9e415fec4bb5d3a265a98392bf26942b9c80d6e22509ebaa0a842f5091ed36f919b3
|
||||
EBUILD systemd-204.ebuild 8302 SHA256 8ab8f6d06d4f3e31cb3cb0f8411fa612b69068cf7b1f80436507b959af287481 SHA512 268f27595cc2d55ec81b32eda1d42afe76907e351db21adae019cba96dbbcefa56f2a1ff22d9330af23d7b9328b11bc225c098f36bea3990ef1988bb71528d92 WHIRLPOOL a113c4a70b38ce1cb3ebbc13a63d5d98d3cb247c4e55c348f3090f3dffefb5e0ee64d4246d975f076a0de2079d423ccd43d59a3d39ed6f1c51eeadba6126383e
|
||||
EBUILD systemd-206-r3.ebuild 10806 SHA256 b65de528f90a4c37d8a8b2f4a0040e84b531a3c9fd2de8faeb874e03b5ea845c SHA512 87e8649f7e6671f5740d0b0ff5dbd4af0ab9e224bed205177650c403b83be0c52931e04c8bdc1003241b8a6de6afce989096e6592dd4099441bc4083fff00236 WHIRLPOOL f87ba65374d7d824cfd9db05ef89805fd627c5ebf2b7b9b1081319b70289f136cd904dbdf8c53fd33f8b7ea1809ec3736644cba383a49300d2201cec62fbb2fb
|
||||
EBUILD systemd-206-r4.ebuild 10454 SHA256 1593e4d21ed5e3b1ba19da643236135ba2873b0bab0b874fe2a52c849c033f7c SHA512 38d63ac62876e22f760f68422d566c4a2d4f0e8f0cb357173d1aceddea21f24f17f7f3ebec11c9676cd18e5d2a8db236001711df2ac050ff3941baf8a0068775 WHIRLPOOL acf31ed9e0df0db1e266d8733a7cb5ce0bf4c52b64cff121c84ea0c65d82eddc1de46848e57e52b97a8e8b56a8d3b6ad6db8c2d2fe75d69a9f84c7cb4563c4f8
|
||||
EBUILD systemd-206-r5.ebuild 10645 SHA256 04f8ef0cbbb522bb66f8a05dbb687b722ba6afe68d79420f0ce4f58cfe84b4cd SHA512 ceca3ac47dd086330a61a010899e36228e50f07459f45a047d290350ce212017a705a291b6a47094d2a4f79487c253cc238a0f0cdc6a781690f1812b357b2e2b WHIRLPOOL e33d10ee1172f21c4f0e7a0422c5c67a7dbc93807f5f8419f1c8e2daea3559623d2e81e4358c717f0680b616ea035755945cebfb0a5dd6c0d2aa74fc26366676
|
||||
EBUILD systemd-207.ebuild 8478 SHA256 50ce4919055396d6616deefa695c008b898f7715212d17d3b04ee4ceafc909e8 SHA512 4b007a54c258a6ad14af2634c09c4b354a079faa9c8003ad90ea8456d00b6adb4c07b8cd4a3f9bf10eb9b0f157417d95ff4f93dd5d950823ec39a739c5ef3b30 WHIRLPOOL 231c57961d7b7addff796d352f30ade80564d711bd48d24c0b268f63b86d71b3a538c4209de87b07396d137ef04e80bbff834e4bf5468da233d30102c7ba1ae2
|
||||
EBUILD systemd-9999-r1.ebuild 8863 SHA256 50d1fd9e1536478be4d2c6a8cd401cf446682f67a138670cb74e838a2fb2b47e SHA512 9cb501818bb8de4566068e03d78ef2c22b38d4b54e005a8086cec731768cc4716e36c4fbe20aa3c4190c41b9de4876f3f4790b8631228a99ad58fc5fea8049d4 WHIRLPOOL ebb006d00a0c13fe2a6b50c40936b431378e6b0e044451e52b74e7695917d0feb796ed4859401f13be0e8ea47230f8fc616bf0e5c3c5c627906c57d01b9568a0
|
||||
MISC ChangeLog 32929 SHA256 29762c6ac4357228d96a6c4a8e4cbbaacdb19bf1ed019de9d9e3173e68dc06bc SHA512 7da9f2b7f6e5ac7c9b44d265ea776165e05b8f03275d3f2f9f03503918ae6228ba93b26fc4dabf2734d1a5bef397df40bae882780f1a4cb588e533d51609123c WHIRLPOOL efa7bf9de655d82bae54a3688e6c87985079aa1a28ff3f43ea237becb1542b193a8e0e6ff1badc962742da721aa599e0456bc1cef072bf7f2026533dbfd6ba42
|
||||
MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iF4EAREIAAYFAlI0rngACgkQC77qH+pIQ6TFggD/T0p0NSiVPTmQ8AN615FyYL4U
|
||||
q05Qn8hU63odU/lQ4QMA/3b98IglSyKLOT1i5h+ZcYol6AhYyv3BgbasBxt0RHtA
|
||||
=ipJl
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,84 @@
|
||||
From a7ca0f06aaa0e0ae3b5eada2cdece8c9766bff1a Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Fri, 26 Jul 2013 17:32:19 +0200
|
||||
Subject: [PATCH 1/5] logind: update state file after generating the session
|
||||
fifo, not before
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=67273
|
||||
---
|
||||
src/login/logind-dbus.c | 7 ++++++-
|
||||
src/login/logind-session-dbus.c | 4 ++++
|
||||
src/machine/machined-dbus.c | 3 ++-
|
||||
3 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
|
||||
index 39af637..b5e975a 100644
|
||||
--- a/src/login/logind-dbus.c
|
||||
+++ b/src/login/logind-dbus.c
|
||||
@@ -643,6 +643,10 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) {
|
||||
|
||||
session->create_message = dbus_message_ref(message);
|
||||
|
||||
+ /* Now, let's wait until the slice unit and stuff got
|
||||
+ * created. We send the reply back from
|
||||
+ * session_send_create_reply().*/
|
||||
+
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
@@ -2356,7 +2360,6 @@ DBusHandlerResult bus_message_filter(
|
||||
if (streq_ptr(path, s->scope_job)) {
|
||||
free(s->scope_job);
|
||||
s->scope_job = NULL;
|
||||
- session_save(s);
|
||||
|
||||
if (s->started) {
|
||||
if (streq(result, "done"))
|
||||
@@ -2366,6 +2369,8 @@ DBusHandlerResult bus_message_filter(
|
||||
session_send_create_reply(s, &error);
|
||||
}
|
||||
}
|
||||
+
|
||||
+ session_save(s);
|
||||
}
|
||||
|
||||
session_add_to_gc_queue(s);
|
||||
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
|
||||
index 62b9ffd..210f756 100644
|
||||
--- a/src/login/logind-session-dbus.c
|
||||
+++ b/src/login/logind-session-dbus.c
|
||||
@@ -535,6 +535,10 @@ int session_send_create_reply(Session *s, DBusError *error) {
|
||||
if (!s->create_message)
|
||||
return 0;
|
||||
|
||||
+ /* This is called after the session scope was successfully
|
||||
+ * created, and finishes where bus_manager_create_session()
|
||||
+ * left off. */
|
||||
+
|
||||
if (error) {
|
||||
DBusError buffer;
|
||||
|
||||
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
|
||||
index 1e8bc60..6c4d50b 100644
|
||||
--- a/src/machine/machined-dbus.c
|
||||
+++ b/src/machine/machined-dbus.c
|
||||
@@ -543,7 +543,6 @@ DBusHandlerResult bus_message_filter(
|
||||
if (streq_ptr(path, mm->scope_job)) {
|
||||
free(mm->scope_job);
|
||||
mm->scope_job = NULL;
|
||||
- machine_save(mm);
|
||||
|
||||
if (mm->started) {
|
||||
if (streq(result, "done"))
|
||||
@@ -553,6 +552,8 @@ DBusHandlerResult bus_message_filter(
|
||||
machine_send_create_reply(mm, &error);
|
||||
}
|
||||
}
|
||||
+
|
||||
+ machine_save(mm);
|
||||
}
|
||||
|
||||
machine_add_to_gc_queue(mm);
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 64fa15a7ca9c276d28413567c74a1d360fbdc975 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Wed, 31 Jul 2013 23:12:17 +0200
|
||||
Subject: [PATCH 2/5] Add /usr/share/keymaps to localectl supported locations.
|
||||
|
||||
This is the standard upstream location where kbd installs keymaps.
|
||||
---
|
||||
src/locale/localectl.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
|
||||
index cd7356a..8259c0a 100644
|
||||
--- a/src/locale/localectl.c
|
||||
+++ b/src/locale/localectl.c
|
||||
@@ -538,6 +538,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
|
||||
if (!keymaps)
|
||||
return log_oom();
|
||||
|
||||
+ nftw("/usr/share/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
|
||||
nftw("/usr/share/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
|
||||
nftw("/usr/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
|
||||
nftw("/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -0,0 +1,90 @@
|
||||
From 9c26db4da7a474b024fcdc97ea490280d86777e1 Mon Sep 17 00:00:00 2001
|
||||
From: Dave Reisner <dreisner@archlinux.org>
|
||||
Date: Wed, 24 Jul 2013 11:10:05 -0400
|
||||
Subject: [PATCH 3/5] tmpfiles: support passing --prefix multiple times
|
||||
|
||||
---
|
||||
man/systemd-tmpfiles.xml | 3 ++-
|
||||
src/tmpfiles/tmpfiles.c | 24 +++++++++++++++++++++---
|
||||
2 files changed, 23 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
|
||||
index 405a9f1..b0f2d9c 100644
|
||||
--- a/man/systemd-tmpfiles.xml
|
||||
+++ b/man/systemd-tmpfiles.xml
|
||||
@@ -121,7 +121,8 @@
|
||||
<term><option>--prefix=PATH</option></term>
|
||||
<listitem><para>Only apply rules that
|
||||
apply to paths with the specified
|
||||
- prefix.</para></listitem>
|
||||
+ prefix. This option can be specified
|
||||
+ multiple times.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
|
||||
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
||||
index eae993e..cb15133 100644
|
||||
--- a/src/tmpfiles/tmpfiles.c
|
||||
+++ b/src/tmpfiles/tmpfiles.c
|
||||
@@ -105,7 +105,7 @@ static bool arg_create = false;
|
||||
static bool arg_clean = false;
|
||||
static bool arg_remove = false;
|
||||
|
||||
-static const char *arg_prefix = NULL;
|
||||
+static char **include_prefixes = NULL;
|
||||
|
||||
static const char conf_file_dirs[] =
|
||||
"/etc/tmpfiles.d\0"
|
||||
@@ -1018,6 +1018,21 @@ static bool item_equal(Item *a, Item *b) {
|
||||
return true;
|
||||
}
|
||||
|
||||
+static bool should_include_path(const char *path) {
|
||||
+ char **prefix;
|
||||
+
|
||||
+ /* no explicit paths specified for inclusion, so everything is valid */
|
||||
+ if (strv_length(include_prefixes) == 0)
|
||||
+ return true;
|
||||
+
|
||||
+ STRV_FOREACH(prefix, include_prefixes) {
|
||||
+ if (path_startswith(path, *prefix))
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
static int parse_line(const char *fname, unsigned line, const char *buffer) {
|
||||
_cleanup_item_free_ Item *i = NULL;
|
||||
Item *existing;
|
||||
@@ -1119,7 +1134,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
|
||||
|
||||
path_kill_slashes(i->path);
|
||||
|
||||
- if (arg_prefix && !path_startswith(i->path, arg_prefix))
|
||||
+ if (!should_include_path(i->path))
|
||||
return 0;
|
||||
|
||||
if (user && !streq(user, "-")) {
|
||||
@@ -1258,7 +1273,8 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
break;
|
||||
|
||||
case ARG_PREFIX:
|
||||
- arg_prefix = optarg;
|
||||
+ if (strv_extend(&include_prefixes, optarg) < 0)
|
||||
+ return log_oom();
|
||||
break;
|
||||
|
||||
case '?':
|
||||
@@ -1423,6 +1439,8 @@ finish:
|
||||
hashmap_free(items);
|
||||
hashmap_free(globs);
|
||||
|
||||
+ strv_free(include_prefixes);
|
||||
+
|
||||
set_free_free(unix_sockets);
|
||||
|
||||
label_finish();
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -0,0 +1,138 @@
|
||||
From 059e02a48e58da81591ebd34e87f928269d77929 Mon Sep 17 00:00:00 2001
|
||||
From: Dave Reisner <dreisner@archlinux.org>
|
||||
Date: Wed, 24 Jul 2013 11:19:24 -0400
|
||||
Subject: [PATCH 4/5] tmpfiles: introduce --exclude-prefix
|
||||
|
||||
The opposite of --prefix, allows specifying path prefixes which should
|
||||
be skipped when processing rules.
|
||||
---
|
||||
man/systemd-tmpfiles.xml | 7 +++++
|
||||
shell-completion/systemd-zsh-completion.zsh | 1 +
|
||||
src/tmpfiles/tmpfiles.c | 44 ++++++++++++++++++-----------
|
||||
3 files changed, 36 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
|
||||
index b0f2d9c..403592d 100644
|
||||
--- a/man/systemd-tmpfiles.xml
|
||||
+++ b/man/systemd-tmpfiles.xml
|
||||
@@ -124,6 +124,13 @@
|
||||
prefix. This option can be specified
|
||||
multiple times.</para></listitem>
|
||||
</varlistentry>
|
||||
+ <varlistentry>
|
||||
+ <term><option>--exclude-prefix=PATH</option></term>
|
||||
+ <listitem><para>Ignore rules that
|
||||
+ apply to paths with the specified
|
||||
+ prefix. This option can be specified
|
||||
+ multiple times.</para></listitem>
|
||||
+ </varlistentry>
|
||||
|
||||
|
||||
<varlistentry>
|
||||
diff --git a/shell-completion/systemd-zsh-completion.zsh b/shell-completion/systemd-zsh-completion.zsh
|
||||
index c85e00e..7aebbcd 100644
|
||||
--- a/shell-completion/systemd-zsh-completion.zsh
|
||||
+++ b/shell-completion/systemd-zsh-completion.zsh
|
||||
@@ -249,6 +249,7 @@ _ctls()
|
||||
'--clean[Clean up all files and directories with an age parameter configured.]' \
|
||||
'--remove[All files and directories marked with r, R in the configuration files are removed.]' \
|
||||
'--prefix=[Only apply rules that apply to paths with the specified prefix.]' \
|
||||
+ '--exclude-prefix=[Ignore rules that apply to paths with the specified prefix.]' \
|
||||
'--help[Prints a short help text and exits.]' \
|
||||
'*::files:_files'
|
||||
;;
|
||||
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
||||
index cb15133..5eca82a 100644
|
||||
--- a/src/tmpfiles/tmpfiles.c
|
||||
+++ b/src/tmpfiles/tmpfiles.c
|
||||
@@ -106,6 +106,7 @@ static bool arg_clean = false;
|
||||
static bool arg_remove = false;
|
||||
|
||||
static char **include_prefixes = NULL;
|
||||
+static char **exclude_prefixes = NULL;
|
||||
|
||||
static const char conf_file_dirs[] =
|
||||
"/etc/tmpfiles.d\0"
|
||||
@@ -1021,16 +1022,19 @@ static bool item_equal(Item *a, Item *b) {
|
||||
static bool should_include_path(const char *path) {
|
||||
char **prefix;
|
||||
|
||||
- /* no explicit paths specified for inclusion, so everything is valid */
|
||||
- if (strv_length(include_prefixes) == 0)
|
||||
- return true;
|
||||
+ STRV_FOREACH(prefix, exclude_prefixes) {
|
||||
+ if (path_startswith(path, *prefix))
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
STRV_FOREACH(prefix, include_prefixes) {
|
||||
if (path_startswith(path, *prefix))
|
||||
return true;
|
||||
}
|
||||
|
||||
- return false;
|
||||
+ /* no matches, so we should include this path only if we
|
||||
+ * have no whitelist at all */
|
||||
+ return strv_length(include_prefixes) == 0;
|
||||
}
|
||||
|
||||
static int parse_line(const char *fname, unsigned line, const char *buffer) {
|
||||
@@ -1219,11 +1223,12 @@ static int help(void) {
|
||||
|
||||
printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n"
|
||||
"Creates, deletes and cleans up volatile and temporary files and directories.\n\n"
|
||||
- " -h --help Show this help\n"
|
||||
- " --create Create marked files/directories\n"
|
||||
- " --clean Clean up marked directories\n"
|
||||
- " --remove Remove marked files/directories\n"
|
||||
- " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n",
|
||||
+ " -h --help Show this help\n"
|
||||
+ " --create Create marked files/directories\n"
|
||||
+ " --clean Clean up marked directories\n"
|
||||
+ " --remove Remove marked files/directories\n"
|
||||
+ " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n"
|
||||
+ " --exclude-prefix=PATH Ignore rules that apply to paths with the specified prefix\n",
|
||||
program_invocation_short_name);
|
||||
|
||||
return 0;
|
||||
@@ -1235,16 +1240,18 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
ARG_CREATE,
|
||||
ARG_CLEAN,
|
||||
ARG_REMOVE,
|
||||
- ARG_PREFIX
|
||||
+ ARG_PREFIX,
|
||||
+ ARG_EXCLUDE_PREFIX,
|
||||
};
|
||||
|
||||
static const struct option options[] = {
|
||||
- { "help", no_argument, NULL, 'h' },
|
||||
- { "create", no_argument, NULL, ARG_CREATE },
|
||||
- { "clean", no_argument, NULL, ARG_CLEAN },
|
||||
- { "remove", no_argument, NULL, ARG_REMOVE },
|
||||
- { "prefix", required_argument, NULL, ARG_PREFIX },
|
||||
- { NULL, 0, NULL, 0 }
|
||||
+ { "help", no_argument, NULL, 'h' },
|
||||
+ { "create", no_argument, NULL, ARG_CREATE },
|
||||
+ { "clean", no_argument, NULL, ARG_CLEAN },
|
||||
+ { "remove", no_argument, NULL, ARG_REMOVE },
|
||||
+ { "prefix", required_argument, NULL, ARG_PREFIX },
|
||||
+ { "exclude-prefix", required_argument, NULL, ARG_EXCLUDE_PREFIX },
|
||||
+ { NULL, 0, NULL, 0 }
|
||||
};
|
||||
|
||||
int c;
|
||||
@@ -1277,6 +1284,11 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
return log_oom();
|
||||
break;
|
||||
|
||||
+ case ARG_EXCLUDE_PREFIX:
|
||||
+ if (strv_extend(&exclude_prefixes, optarg) < 0)
|
||||
+ return log_oom();
|
||||
+ break;
|
||||
+
|
||||
case '?':
|
||||
return -EINVAL;
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
From a7b85011f13bf2a90cfcfad1f3d2ca2deebaa2f1 Mon Sep 17 00:00:00 2001
|
||||
From: Dave Reisner <dreisner@archlinux.org>
|
||||
Date: Wed, 24 Jul 2013 11:58:35 -0400
|
||||
Subject: [PATCH 5/5] tmpfiles-setup: exclude /dev prefixes files
|
||||
|
||||
Fixes Arch Linux bug: https://bugs.archlinux.org/task/36259
|
||||
---
|
||||
units/systemd-tmpfiles-setup.service.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
|
||||
index 67c7d4a..6f98063 100644
|
||||
--- a/units/systemd-tmpfiles-setup.service.in
|
||||
+++ b/units/systemd-tmpfiles-setup.service.in
|
||||
@@ -21,4 +21,4 @@ ConditionDirectoryNotEmpty=|/run/tmpfiles.d
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
-ExecStart=@rootbindir@/systemd-tmpfiles --create --remove
|
||||
+ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --exclude-prefix=/dev
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
From ac4c8d6da8b5ebc35f02c9c6cb7595be7b134a05 Mon Sep 17 00:00:00 2001
|
||||
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
||||
Date: Thu, 12 Sep 2013 01:50:16 +0000
|
||||
Subject: Allow tabs in environment files
|
||||
|
||||
bash allows them, and so should we.
|
||||
|
||||
string_has_cc is changed to allow tabs, and if they are not wanted,
|
||||
they must be now checked for explicitly. There are two other callers,
|
||||
apart from the env file loaders, and one already checked anyway, and
|
||||
the other is changed to check.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=68592
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=481554
|
||||
---
|
||||
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
|
||||
index 0437e33..6a43aeb 100644
|
||||
--- a/src/hostname/hostnamed.c
|
||||
+++ b/src/hostname/hostnamed.c
|
||||
@@ -553,7 +553,8 @@ static DBusHandlerResult hostname_message_handler(
|
||||
* safe than sorry */
|
||||
if (k == PROP_ICON_NAME && !filename_is_safe(name))
|
||||
return bus_send_error_reply(connection, message, NULL, -EINVAL);
|
||||
- if (k == PROP_PRETTY_HOSTNAME && string_has_cc(name))
|
||||
+ if (k == PROP_PRETTY_HOSTNAME &&
|
||||
+ (string_has_cc(name) || chars_intersect(name, "\t")))
|
||||
return bus_send_error_reply(connection, message, NULL, -EINVAL);
|
||||
if (k == PROP_CHASSIS && !valid_chassis(name))
|
||||
return bus_send_error_reply(connection, message, NULL, -EINVAL);
|
||||
diff --git a/src/shared/util.c b/src/shared/util.c
|
||||
index 1dde8af..ad463e8 100644
|
||||
--- a/src/shared/util.c
|
||||
+++ b/src/shared/util.c
|
||||
@@ -5311,6 +5311,10 @@ bool string_is_safe(const char *p) {
|
||||
return true;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * Check if a string contains control characters.
|
||||
+ * Spaces and tabs are not considered control characters.
|
||||
+ */
|
||||
bool string_has_cc(const char *p) {
|
||||
const char *t;
|
||||
@ -0,0 +1,22 @@
|
||||
From da2620a5f878ad5c8d8d51992528cb3e637c7d1f Mon Sep 17 00:00:00 2001
|
||||
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
||||
Date: Thu, 12 Sep 2013 14:03:16 +0000
|
||||
Subject: Actually allow tabs in environment files
|
||||
|
||||
Fixup for ac4c8d6da8b5e.
|
||||
---
|
||||
diff --git a/src/shared/util.c b/src/shared/util.c
|
||||
index ad463e8..9a075fa 100644
|
||||
--- a/src/shared/util.c
|
||||
+++ b/src/shared/util.c
|
||||
@@ -5321,7 +5321,7 @@ bool string_has_cc(const char *p) {
|
||||
assert(p);
|
||||
|
||||
for (t = p; *t; t++)
|
||||
- if (*t > 0 && *t < ' ')
|
||||
+ if (*t > 0 && *t < ' ' && *t != '\t')
|
||||
return true;
|
||||
|
||||
return false;
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
5
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/gentoo-run.conf
vendored
Normal file
5
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/gentoo-run.conf
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
# New OpenRC versions replace /var/lock with a symlink to /run/lock.
|
||||
# We just create that directory for now, just in case.
|
||||
# Of course, it's not guaranteed that'll satisfy all relevant packages.
|
||||
|
||||
d /run/lock 0755 root root -
|
||||
19
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-lock.mount
vendored
Normal file
19
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-lock.mount
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
[Unit]
|
||||
Description=Lock Directory
|
||||
Before=local-fs.target
|
||||
# skip mounting if the directory does not exist or is a symlink
|
||||
ConditionPathIsDirectory=/var/lock
|
||||
ConditionPathIsSymbolicLink=!/var/lock
|
||||
|
||||
[Mount]
|
||||
What=/run/lock
|
||||
Where=/var/lock
|
||||
Type=bind
|
||||
Options=bind
|
||||
19
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-run.mount
vendored
Normal file
19
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-run.mount
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
[Unit]
|
||||
Description=Runtime Directory
|
||||
Before=local-fs.target
|
||||
# skip mounting if the directory does not exist or is a symlink
|
||||
ConditionPathIsDirectory=/var/run
|
||||
ConditionPathIsSymbolicLink=!/var/run
|
||||
|
||||
[Mount]
|
||||
What=/run
|
||||
Where=/var/run
|
||||
Type=bind
|
||||
Options=bind
|
||||
22
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/metadata.xml
vendored
Normal file
22
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/metadata.xml
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>systemd@gentoo.org</email>
|
||||
<name>Gentoo systemd team</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<!-- XXX: describe those two better -->
|
||||
<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
|
||||
<flag name='cryptsetup'>Use libcryptsetup</flag>
|
||||
<flag name='firmware-loader'>Enable user-space firmware loader (for kernels prior to 3.8)</flag>
|
||||
<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
|
||||
<flag name="gudev">enable libudev gobject interface</flag>
|
||||
<flag name='http'>Enable embedded HTTP server in journald</flag>
|
||||
<flag name="keymap">Map custom hardware's multimedia keys</flag>
|
||||
<flag name='kmod'>Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
|
||||
<flag name='openrc'>Depend on <pkg>sys-fs/udev-init-scripts</pkg></flag>
|
||||
<flag name='qrcode'>Enable qrcode output support in journal</flag>
|
||||
<flag name='vanilla'>Disable Gentoo-specific behavior and compatibility quirks</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
287
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-201.ebuild
vendored
Normal file
287
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-201.ebuild
vendored
Normal file
@ -0,0 +1,287 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.23 2013/07/16 07:30:08 mgorny Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 linux-info multilib pam \
|
||||
python-single-r1 systemd toolchain-funcs udev user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ppc64 x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
keymap +kmod lzma openrc pam policykit python qrcode selinux static-libs
|
||||
tcpd vanilla xattr"
|
||||
|
||||
MINKV="2.6.39"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2 )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-12 )
|
||||
lzma? ( app-arch/xz-utils )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )"
|
||||
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
policykit? ( sys-auth/polkit )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev"
|
||||
|
||||
PDEPEND=">=sys-apps/hwids-20130326.1[udev]"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
|
||||
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
# ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable keymap)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_with python)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
autotools-utils_src_compile \
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install -j1 \
|
||||
udevlibexecdir="${MY_UDEVDIR}" \
|
||||
dist_udevhwdb_DATA=
|
||||
|
||||
# keep udev working without initramfs, for openrc compat
|
||||
dodir /bin /sbin
|
||||
mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die
|
||||
mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die
|
||||
dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd
|
||||
dosym ../../bin/udevadm /usr/bin/udevadm
|
||||
|
||||
# zsh completion
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
|
||||
|
||||
# remove pam.d plugin .la-file
|
||||
prune_libtool_files --modules
|
||||
|
||||
# compat for init= use
|
||||
dosym ../usr/lib/systemd/systemd /bin/systemd
|
||||
dosym ../lib/systemd/systemd /usr/bin/systemd
|
||||
# rsyslog.service depends on it...
|
||||
dosym ../usr/bin/systemctl /bin/systemctl
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
if ! use vanilla; then
|
||||
# Create /run/lock as required by new baselay/OpenRC compat.
|
||||
systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
|
||||
|
||||
# Add mount-rules for /var/lock and /var/run, bug #433607
|
||||
systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
|
||||
systemd_enable_service sysinit.target var-lock.mount
|
||||
systemd_enable_service sysinit.target var-run.mount
|
||||
fi
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Check whether we won't break user's system.
|
||||
local x
|
||||
for x in /bin/systemd /usr/bin/systemd \
|
||||
/usr/bin/udevadm /usr/lib/systemd/systemd-udevd
|
||||
do
|
||||
[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting."
|
||||
done
|
||||
}
|
||||
|
||||
optfeature() {
|
||||
local i desc=${1} text
|
||||
shift
|
||||
|
||||
text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
|
||||
shift
|
||||
|
||||
for i; do
|
||||
elog "${text}"
|
||||
text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
|
||||
done
|
||||
elog "${text} (${desc})"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
|
||||
ewarn "require that specific feature, please call:"
|
||||
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
|
||||
'sys-apps/systemd-ui'
|
||||
|
||||
# read null-terminated argv[0] from PID 1
|
||||
# and see which path to systemd was used (if any)
|
||||
local init_path
|
||||
IFS= read -r -d '' init_path < /proc/1/cmdline
|
||||
if [[ ${init_path} == */bin/systemd ]]; then
|
||||
ewarn
|
||||
ewarn "You are using a compatibility symlink to run systemd. The symlink"
|
||||
ewarn "will be removed in near future. Please update your bootloader"
|
||||
ewarn "to use:"
|
||||
ewarn
|
||||
ewarn " init=/usr/lib/systemd/systemd"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
277
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-204.ebuild
vendored
Normal file
277
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-204.ebuild
vendored
Normal file
@ -0,0 +1,277 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-204.ebuild,v 1.12 2013/09/06 19:58:12 pacho Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 linux-info multilib pam python-single-r1 systemd toolchain-funcs udev user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ppc ppc64 x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
keymap +kmod lzma openrc pam policykit python qrcode selinux static-libs
|
||||
tcpd test vanilla xattr"
|
||||
|
||||
MINKV="2.6.39"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2 )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-12 )
|
||||
lzma? ( app-arch/xz-utils )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )"
|
||||
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
policykit? ( sys-auth/polkit )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev"
|
||||
|
||||
PDEPEND=">=sys-apps/hwids-20130326.1[udev]"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
|
||||
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
# ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
|
||||
# read null-terminated argv[0] from PID 1
|
||||
# and see which path to systemd was used (if any)
|
||||
local init_path
|
||||
IFS= read -r -d '' init_path < /proc/1/cmdline
|
||||
if [[ ${init_path} == */bin/systemd ]]; then
|
||||
eerror "You are using a compatibility symlink to run systemd. The symlink"
|
||||
eerror "has been removed. Please update your bootloader to use:"
|
||||
eerror
|
||||
eerror " init=/usr/lib/systemd/systemd"
|
||||
eerror
|
||||
eerror "and reboot your system. We are sorry for the inconvenience."
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
die "Compatibility symlink used to boot systemd."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable keymap)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_with python)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable test tests)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
autotools-utils_src_compile \
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install -j1 \
|
||||
udevlibexecdir="${MY_UDEVDIR}" \
|
||||
dist_udevhwdb_DATA=
|
||||
|
||||
# keep udev working without initramfs, for openrc compat
|
||||
dodir /bin /sbin
|
||||
mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die
|
||||
mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die
|
||||
dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd
|
||||
dosym ../../bin/udevadm /usr/bin/udevadm
|
||||
|
||||
# zsh completion
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
|
||||
|
||||
# compat for init= use
|
||||
dosym ../usr/lib/systemd/systemd /bin/systemd
|
||||
dosym ../lib/systemd/systemd /usr/bin/systemd
|
||||
# rsyslog.service depends on it...
|
||||
dosym ../usr/bin/systemctl /bin/systemctl
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
if ! use vanilla; then
|
||||
# Create /run/lock as required by new baselay/OpenRC compat.
|
||||
systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
|
||||
|
||||
# Add mount-rules for /var/lock and /var/run, bug #433607
|
||||
systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
|
||||
systemd_enable_service sysinit.target var-lock.mount
|
||||
systemd_enable_service sysinit.target var-run.mount
|
||||
fi
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Check whether we won't break user's system.
|
||||
local x
|
||||
for x in /bin/systemd /usr/bin/systemd \
|
||||
/usr/bin/udevadm /usr/lib/systemd/systemd-udevd
|
||||
do
|
||||
[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting."
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
||||
ewarn "and 'mount' to not work properly. Please run:"
|
||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! has_version sys-apps/systemd-ui; then
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
378
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-206-r3.ebuild
vendored
Normal file
378
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-206-r3.ebuild
vendored
Normal file
@ -0,0 +1,378 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild,v 1.7 2013/09/06 19:58:12 pacho Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
||||
user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
+kmod lzma openrc pam policykit python qrcode selinux tcpd test
|
||||
vanilla xattr"
|
||||
|
||||
MINKV="3.0"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2 )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-14-r1 )
|
||||
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r8
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
|
||||
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!sys-apps/gentoo-systemd-integration
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev"
|
||||
|
||||
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
|
||||
policykit? ( sys-auth/polkit )"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/binutils-2.23.1
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
|
||||
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
# ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
|
||||
|
||||
# read null-terminated argv[0] from PID 1
|
||||
# and see which path to systemd was used (if any)
|
||||
local init_path
|
||||
IFS= read -r -d '' init_path < /proc/1/cmdline
|
||||
if [[ ${init_path} == */bin/systemd ]]; then
|
||||
eerror "You are using a compatibility symlink to run systemd. The symlink"
|
||||
eerror "has been removed. Please update your bootloader to use:"
|
||||
eerror
|
||||
eerror " init=/usr/lib/systemd/systemd"
|
||||
eerror
|
||||
eerror "and reboot your system. We are sorry for the inconvenience."
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
die "Compatibility symlink used to boot systemd."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
#477954 - gnome-shell-3.8* session unlock broken
|
||||
"${FILESDIR}"/206-0001-logind-update-state-file-after-generating-the-sessio.patch
|
||||
#474946 - localectl does not find keymaps
|
||||
"${FILESDIR}"/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch
|
||||
#478198 - wrong permission for static-nodes
|
||||
"${FILESDIR}"/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch
|
||||
"${FILESDIR}"/206-0004-tmpfiles-introduce-exclude-prefix.patch
|
||||
"${FILESDIR}"/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch
|
||||
)
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_with python)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable test tests)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! multilib_is_native_abi; then
|
||||
myeconfargs+=(
|
||||
ac_cv_search_cap_init=
|
||||
ac_cv_header_sys_capability_h=yes
|
||||
DBUS_CFLAGS=' '
|
||||
DBUS_LIBS=' '
|
||||
|
||||
--disable-acl
|
||||
--disable-audit
|
||||
--disable-gcrypt
|
||||
--disable-gtk-doc
|
||||
--disable-gudev
|
||||
--disable-introspection
|
||||
--disable-kmod
|
||||
--disable-libcryptsetup
|
||||
--disable-microhttpd
|
||||
--disable-pam
|
||||
--disable-polkit
|
||||
--disable-qrencode
|
||||
--disable-selinux
|
||||
--disable-tcpwrap
|
||||
--disable-tests
|
||||
--disable-xattr
|
||||
--disable-xz
|
||||
--without-python
|
||||
)
|
||||
fi
|
||||
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}"
|
||||
else
|
||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
MULTILIB_WRAPPED_HEADERS=()
|
||||
|
||||
if use gudev; then
|
||||
MULTILIB_WRAPPED_HEADERS+=(
|
||||
/usr/include/gudev-1.0/gudev/gudev.h
|
||||
/usr/include/gudev-1.0/gudev/gudevclient.h
|
||||
/usr/include/gudev-1.0/gudev/gudevdevice.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenumerator.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenums.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenumtypes.h
|
||||
/usr/include/gudev-1.0/gudev/gudevtypes.h
|
||||
)
|
||||
fi
|
||||
|
||||
multilib-minimal_src_install
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
dist_udevhwdb_DATA=
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}" -j1 install
|
||||
else
|
||||
mymakeopts+=(
|
||||
install-libLTLIBRARIES
|
||||
install-pkgconfiglibDATA
|
||||
install-includeHEADERS
|
||||
install-pkgincludeHEADERS
|
||||
)
|
||||
|
||||
emake "${mymakeopts[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --modules
|
||||
|
||||
# keep udev working without initramfs, for openrc compat
|
||||
dodir /bin /sbin
|
||||
mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die
|
||||
mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die
|
||||
dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd
|
||||
dosym ../../bin/udevadm /usr/bin/udevadm
|
||||
|
||||
# zsh completion
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
|
||||
|
||||
# compat for init= use
|
||||
dosym ../usr/lib/systemd/systemd /bin/systemd
|
||||
dosym ../lib/systemd/systemd /usr/bin/systemd
|
||||
# rsyslog.service depends on it...
|
||||
dosym ../usr/bin/systemctl /bin/systemctl
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
if ! use vanilla; then
|
||||
# Create /run/lock as required by new baselay/OpenRC compat.
|
||||
systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf
|
||||
|
||||
# Add mount-rules for /var/lock and /var/run, bug #433607
|
||||
systemd_dounit "${FILESDIR}"/var-{lock,run}.mount
|
||||
systemd_enable_service sysinit.target var-lock.mount
|
||||
systemd_enable_service sysinit.target var-run.mount
|
||||
fi
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Check whether we won't break user's system.
|
||||
local x
|
||||
for x in /bin/systemd /usr/bin/systemd \
|
||||
/usr/bin/udevadm /usr/lib/systemd/systemd-udevd
|
||||
do
|
||||
[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting."
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == "" || ${ROOT} == "/" ]]; then
|
||||
udevadm control --reload
|
||||
fi
|
||||
|
||||
# Bug 468876
|
||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
||||
ewarn "and 'mount' to not work properly. Please run:"
|
||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! has_version sys-apps/systemd-ui; then
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
368
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-206-r4.ebuild
vendored
Normal file
368
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-206-r4.ebuild
vendored
Normal file
@ -0,0 +1,368 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r4.ebuild,v 1.1 2013/09/11 11:52:15 mgorny Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
||||
user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
+kmod lzma openrc pam policykit python qrcode selinux tcpd test
|
||||
vanilla xattr"
|
||||
|
||||
MINKV="3.0"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2 )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-14-r1 )
|
||||
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r8
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
|
||||
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!vanilla? ( sys-apps/gentoo-systemd-integration )
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev"
|
||||
|
||||
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
|
||||
policykit? ( sys-auth/polkit )"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/binutils-2.23.1
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
|
||||
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
# ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
|
||||
|
||||
# read null-terminated argv[0] from PID 1
|
||||
# and see which path to systemd was used (if any)
|
||||
local init_path
|
||||
IFS= read -r -d '' init_path < /proc/1/cmdline
|
||||
if [[ ${init_path} == */bin/systemd ]]; then
|
||||
eerror "You are using a compatibility symlink to run systemd. The symlink"
|
||||
eerror "has been removed. Please update your bootloader to use:"
|
||||
eerror
|
||||
eerror " init=/usr/lib/systemd/systemd"
|
||||
eerror
|
||||
eerror "and reboot your system. We are sorry for the inconvenience."
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
die "Compatibility symlink used to boot systemd."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
#477954 - gnome-shell-3.8* session unlock broken
|
||||
"${FILESDIR}"/206-0001-logind-update-state-file-after-generating-the-sessio.patch
|
||||
#474946 - localectl does not find keymaps
|
||||
"${FILESDIR}"/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch
|
||||
#478198 - wrong permission for static-nodes
|
||||
"${FILESDIR}"/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch
|
||||
"${FILESDIR}"/206-0004-tmpfiles-introduce-exclude-prefix.patch
|
||||
"${FILESDIR}"/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch
|
||||
)
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_with python)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable test tests)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! multilib_is_native_abi; then
|
||||
myeconfargs+=(
|
||||
ac_cv_search_cap_init=
|
||||
ac_cv_header_sys_capability_h=yes
|
||||
DBUS_CFLAGS=' '
|
||||
DBUS_LIBS=' '
|
||||
|
||||
--disable-acl
|
||||
--disable-audit
|
||||
--disable-gcrypt
|
||||
--disable-gtk-doc
|
||||
--disable-gudev
|
||||
--disable-introspection
|
||||
--disable-kmod
|
||||
--disable-libcryptsetup
|
||||
--disable-microhttpd
|
||||
--disable-pam
|
||||
--disable-polkit
|
||||
--disable-qrencode
|
||||
--disable-selinux
|
||||
--disable-tcpwrap
|
||||
--disable-tests
|
||||
--disable-xattr
|
||||
--disable-xz
|
||||
--without-python
|
||||
)
|
||||
fi
|
||||
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}"
|
||||
else
|
||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
MULTILIB_WRAPPED_HEADERS=()
|
||||
|
||||
if use gudev; then
|
||||
MULTILIB_WRAPPED_HEADERS+=(
|
||||
/usr/include/gudev-1.0/gudev/gudev.h
|
||||
/usr/include/gudev-1.0/gudev/gudevclient.h
|
||||
/usr/include/gudev-1.0/gudev/gudevdevice.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenumerator.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenums.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenumtypes.h
|
||||
/usr/include/gudev-1.0/gudev/gudevtypes.h
|
||||
)
|
||||
fi
|
||||
|
||||
multilib-minimal_src_install
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
dist_udevhwdb_DATA=
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}" -j1 install
|
||||
else
|
||||
mymakeopts+=(
|
||||
install-libLTLIBRARIES
|
||||
install-pkgconfiglibDATA
|
||||
install-includeHEADERS
|
||||
install-pkgincludeHEADERS
|
||||
)
|
||||
|
||||
emake "${mymakeopts[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --modules
|
||||
|
||||
# keep udev working without initramfs, for openrc compat
|
||||
dodir /bin /sbin
|
||||
mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die
|
||||
mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die
|
||||
dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd
|
||||
dosym ../../bin/udevadm /usr/bin/udevadm
|
||||
|
||||
# zsh completion
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
|
||||
|
||||
# compat for init= use
|
||||
dosym ../usr/lib/systemd/systemd /bin/systemd
|
||||
dosym ../lib/systemd/systemd /usr/bin/systemd
|
||||
# rsyslog.service depends on it...
|
||||
dosym ../usr/bin/systemctl /bin/systemctl
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Check whether we won't break user's system.
|
||||
local x
|
||||
for x in /bin/systemd /usr/bin/systemd \
|
||||
/usr/bin/udevadm /usr/lib/systemd/systemd-udevd
|
||||
do
|
||||
[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting."
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == "" || ${ROOT} == "/" ]]; then
|
||||
udevadm control --reload
|
||||
fi
|
||||
|
||||
# Bug 468876
|
||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
||||
ewarn "and 'mount' to not work properly. Please run:"
|
||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! has_version sys-apps/systemd-ui; then
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
374
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-206-r5.ebuild
vendored
Normal file
374
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-206-r5.ebuild
vendored
Normal file
@ -0,0 +1,374 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r5.ebuild,v 1.1 2013/09/14 08:47:56 pacho Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
||||
user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
+kmod lzma openrc pam policykit python qrcode selinux tcpd test
|
||||
vanilla xattr"
|
||||
|
||||
MINKV="3.0"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2 )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-14-r1 )
|
||||
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r8
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
|
||||
"
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!vanilla? ( sys-apps/gentoo-systemd-integration )
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev
|
||||
"
|
||||
PDEPEND="
|
||||
>=sys-apps/hwids-20130717-r1[udev]
|
||||
policykit? ( sys-auth/polkit )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/binutils-2.23.1
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )
|
||||
"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD
|
||||
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
# ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
|
||||
|
||||
# read null-terminated argv[0] from PID 1
|
||||
# and see which path to systemd was used (if any)
|
||||
local init_path
|
||||
IFS= read -r -d '' init_path < /proc/1/cmdline
|
||||
if [[ ${init_path} == */bin/systemd ]]; then
|
||||
eerror "You are using a compatibility symlink to run systemd. The symlink"
|
||||
eerror "has been removed. Please update your bootloader to use:"
|
||||
eerror
|
||||
eerror " init=/usr/lib/systemd/systemd"
|
||||
eerror
|
||||
eerror "and reboot your system. We are sorry for the inconvenience."
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
die "Compatibility symlink used to boot systemd."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
#477954 - gnome-shell-3.8* session unlock broken
|
||||
"${FILESDIR}"/206-0001-logind-update-state-file-after-generating-the-sessio.patch
|
||||
#474946 - localectl does not find keymaps
|
||||
"${FILESDIR}"/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch
|
||||
#478198 - wrong permission for static-nodes
|
||||
"${FILESDIR}"/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch
|
||||
"${FILESDIR}"/206-0004-tmpfiles-introduce-exclude-prefix.patch
|
||||
"${FILESDIR}"/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch
|
||||
#481554 - tabs in environment files should be allowed
|
||||
"${FILESDIR}"/206-0006-allow-tabs-in-configuration-files.patch
|
||||
"${FILESDIR}"/206-0007-allow-tabs-in-configuration-files2.patch
|
||||
)
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_with python)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable test tests)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! multilib_is_native_abi; then
|
||||
myeconfargs+=(
|
||||
ac_cv_search_cap_init=
|
||||
ac_cv_header_sys_capability_h=yes
|
||||
DBUS_CFLAGS=' '
|
||||
DBUS_LIBS=' '
|
||||
|
||||
--disable-acl
|
||||
--disable-audit
|
||||
--disable-gcrypt
|
||||
--disable-gtk-doc
|
||||
--disable-gudev
|
||||
--disable-introspection
|
||||
--disable-kmod
|
||||
--disable-libcryptsetup
|
||||
--disable-microhttpd
|
||||
--disable-pam
|
||||
--disable-polkit
|
||||
--disable-qrencode
|
||||
--disable-selinux
|
||||
--disable-tcpwrap
|
||||
--disable-tests
|
||||
--disable-xattr
|
||||
--disable-xz
|
||||
--without-python
|
||||
)
|
||||
fi
|
||||
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}"
|
||||
else
|
||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
MULTILIB_WRAPPED_HEADERS=()
|
||||
|
||||
if use gudev; then
|
||||
MULTILIB_WRAPPED_HEADERS+=(
|
||||
/usr/include/gudev-1.0/gudev/gudev.h
|
||||
/usr/include/gudev-1.0/gudev/gudevclient.h
|
||||
/usr/include/gudev-1.0/gudev/gudevdevice.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenumerator.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenums.h
|
||||
/usr/include/gudev-1.0/gudev/gudevenumtypes.h
|
||||
/usr/include/gudev-1.0/gudev/gudevtypes.h
|
||||
)
|
||||
fi
|
||||
|
||||
multilib-minimal_src_install
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
dist_udevhwdb_DATA=
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}" -j1 install
|
||||
else
|
||||
mymakeopts+=(
|
||||
install-libLTLIBRARIES
|
||||
install-pkgconfiglibDATA
|
||||
install-includeHEADERS
|
||||
install-pkgincludeHEADERS
|
||||
)
|
||||
|
||||
emake "${mymakeopts[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --modules
|
||||
|
||||
# keep udev working without initramfs, for openrc compat
|
||||
dodir /bin /sbin
|
||||
mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die
|
||||
mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die
|
||||
dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd
|
||||
dosym ../../bin/udevadm /usr/bin/udevadm
|
||||
|
||||
# zsh completion
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
|
||||
|
||||
# compat for init= use
|
||||
dosym ../usr/lib/systemd/systemd /bin/systemd
|
||||
dosym ../lib/systemd/systemd /usr/bin/systemd
|
||||
# rsyslog.service depends on it...
|
||||
dosym ../usr/bin/systemctl /bin/systemctl
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Check whether we won't break user's system.
|
||||
local x
|
||||
for x in /bin/systemd /usr/bin/systemd \
|
||||
/usr/bin/udevadm /usr/lib/systemd/systemd-udevd
|
||||
do
|
||||
[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting."
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == "" || ${ROOT} == "/" ]]; then
|
||||
udevadm control --reload
|
||||
fi
|
||||
|
||||
# Bug 468876
|
||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
||||
ewarn "and 'mount' to not work properly. Please run:"
|
||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! has_version sys-apps/systemd-ui; then
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
1
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r1.ebuild
vendored
Symbolic link
1
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r1.ebuild
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
systemd-207.ebuild
|
||||
310
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild
vendored
Normal file
310
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild
vendored
Normal file
@ -0,0 +1,310 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-207.ebuild,v 1.2 2013/09/14 18:44:05 floppym Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
||||
user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
+kmod lzma openrc pam policykit python qrcode selinux tcpd test
|
||||
vanilla xattr"
|
||||
|
||||
MINKV="3.0"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-14-r1 )
|
||||
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
|
||||
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!vanilla? ( sys-apps/gentoo-systemd-integration )
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev"
|
||||
|
||||
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
|
||||
policykit? ( sys-auth/polkit )"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/binutils-2.23.1
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )"
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
|
||||
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
|
||||
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
|
||||
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
|
||||
use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-pamconfdir=/usr/share/pam.d
|
||||
--with-dbuspolicydir=/usr/share/dbus-1/system.d
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_enable python python-devel)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable test tests)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! multilib_is_native_abi; then
|
||||
myeconfargs+=(
|
||||
ac_cv_search_cap_init=
|
||||
ac_cv_header_sys_capability_h=yes
|
||||
DBUS_CFLAGS=' '
|
||||
DBUS_LIBS=' '
|
||||
|
||||
--disable-acl
|
||||
--disable-audit
|
||||
--disable-gcrypt
|
||||
--disable-gtk-doc
|
||||
--disable-introspection
|
||||
--disable-kmod
|
||||
--disable-libcryptsetup
|
||||
--disable-microhttpd
|
||||
--disable-pam
|
||||
--disable-polkit
|
||||
--disable-qrencode
|
||||
--disable-selinux
|
||||
--disable-tcpwrap
|
||||
--disable-tests
|
||||
--disable-xattr
|
||||
--disable-xz
|
||||
--disable-python-devel
|
||||
)
|
||||
fi
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}"
|
||||
else
|
||||
# prerequisites for gudev
|
||||
use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
|
||||
|
||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
multilib_is_native_abi || continue
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
dist_udevhwdb_DATA=
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}" install
|
||||
else
|
||||
mymakeopts+=(
|
||||
install-libLTLIBRARIES
|
||||
install-pkgconfiglibDATA
|
||||
install-includeHEADERS
|
||||
# safe to call unconditionally, 'installs' empty list
|
||||
install-libgudev_includeHEADERS
|
||||
install-pkgincludeHEADERS
|
||||
)
|
||||
|
||||
emake "${mymakeopts[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --modules
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Symlink /etc/sysctl.conf for easy migration.
|
||||
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == "" || ${ROOT} == "/" ]]; then
|
||||
udevadm control --reload
|
||||
fi
|
||||
|
||||
# Bug 468876
|
||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
||||
ewarn "and 'mount' to not work properly. Please run:"
|
||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! has_version sys-apps/systemd-ui; then
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
333
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999-r1.ebuild
vendored
Normal file
333
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999-r1.ebuild
vendored
Normal file
@ -0,0 +1,333 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.16 2013/09/14 18:44:05 floppym Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
#if LIVE
|
||||
AUTOTOOLS_AUTORECONF=yes
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}
|
||||
http://cgit.freedesktop.org/${PN}/${PN}/"
|
||||
|
||||
inherit git-2
|
||||
#endif
|
||||
|
||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
||||
user
|
||||
|
||||
DESCRIPTION="System and service manager for Linux"
|
||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
||||
+kmod lzma openrc pam policykit python qrcode selinux tcpd test
|
||||
vanilla xattr"
|
||||
|
||||
MINKV="3.0"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
|
||||
>=sys-apps/util-linux-2.20
|
||||
sys-libs/libcap
|
||||
acl? ( sys-apps/acl )
|
||||
audit? ( >=sys-process/audit-2 )
|
||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
|
||||
gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] )
|
||||
http? ( net-libs/libmicrohttpd )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
|
||||
kmod? ( >=sys-apps/kmod-14-r1 )
|
||||
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
|
||||
pam? ( virtual/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qrcode? ( media-gfx/qrencode )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
tcpd? ( sys-apps/tcp-wrappers )
|
||||
xattr? ( sys-apps/attr )
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
|
||||
|
||||
# baselayout-2.2 has /run
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-2.2
|
||||
openrc? ( >=sys-fs/udev-init-scripts-25 )
|
||||
|| (
|
||||
>=sys-apps/util-linux-2.22
|
||||
<sys-apps/sysvinit-2.88-r4
|
||||
)
|
||||
!vanilla? ( sys-apps/gentoo-systemd-integration )
|
||||
!sys-auth/nss-myhostname
|
||||
!<sys-libs/glibc-2.10
|
||||
!sys-fs/udev"
|
||||
|
||||
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
|
||||
policykit? ( sys-auth/polkit )"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=sys-devel/binutils-2.23.1
|
||||
>=sys-devel/gcc-4.6
|
||||
>=sys-kernel/linux-headers-${MINKV}
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.18 )"
|
||||
|
||||
#if LIVE
|
||||
DEPEND="${DEPEND}
|
||||
dev-libs/gobject-introspection
|
||||
>=dev-libs/libgcrypt-1.4.5
|
||||
>=dev-util/gtk-doc-1.18"
|
||||
|
||||
SRC_URI=
|
||||
KEYWORDS=
|
||||
|
||||
src_prepare() {
|
||||
gtkdocize --docdir docs/ || die
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
#endif
|
||||
|
||||
pkg_pretend() {
|
||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS
|
||||
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
|
||||
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
|
||||
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
|
||||
|
||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
||||
use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
|
||||
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
|
||||
use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
if [[ $(gcc-major-version) -lt 4
|
||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
||||
then
|
||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
||||
eerror "gcc version using gcc-config."
|
||||
die "systemd requires at least gcc 4.6"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
ewarn "Kernel version at least ${MINKV} required"
|
||||
fi
|
||||
|
||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--localstatedir=/var
|
||||
--with-pamlibdir=$(getpam_mod_dir)
|
||||
# avoid bash-completion dep
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
# make sure we get /bin:/sbin in $PATH
|
||||
--enable-split-usr
|
||||
# disable sysv compatibility
|
||||
--with-sysvinit-path=
|
||||
--with-sysvrcnd-path=
|
||||
# no deps
|
||||
--enable-efi
|
||||
--enable-ima
|
||||
# optional components/dependencies
|
||||
$(use_enable acl)
|
||||
$(use_enable audit)
|
||||
$(use_enable cryptsetup libcryptsetup)
|
||||
$(use_enable doc gtk-doc)
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable gudev)
|
||||
$(use_enable http microhttpd)
|
||||
$(use_enable introspection)
|
||||
$(use_enable kmod)
|
||||
$(use_enable lzma xz)
|
||||
$(use_enable pam)
|
||||
$(use_enable policykit polkit)
|
||||
$(use_enable python python-devel)
|
||||
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
|
||||
$(use_enable qrcode qrencode)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcpd tcpwrap)
|
||||
$(use_enable test tests)
|
||||
$(use_enable xattr)
|
||||
|
||||
# not supported (avoid automagic deps in the future)
|
||||
--disable-chkconfig
|
||||
|
||||
# hardcode a few paths to spare some deps
|
||||
QUOTAON=/usr/sbin/quotaon
|
||||
QUOTACHECK=/usr/sbin/quotacheck
|
||||
)
|
||||
|
||||
# Keep using the one where the rules were installed.
|
||||
MY_UDEVDIR=$(get_udevdir)
|
||||
|
||||
if use firmware-loader; then
|
||||
myeconfargs+=(
|
||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! multilib_is_native_abi; then
|
||||
myeconfargs+=(
|
||||
ac_cv_search_cap_init=
|
||||
ac_cv_header_sys_capability_h=yes
|
||||
DBUS_CFLAGS=' '
|
||||
DBUS_LIBS=' '
|
||||
|
||||
--disable-acl
|
||||
--disable-audit
|
||||
--disable-gcrypt
|
||||
--disable-gtk-doc
|
||||
--disable-introspection
|
||||
--disable-kmod
|
||||
--disable-libcryptsetup
|
||||
--disable-microhttpd
|
||||
--disable-pam
|
||||
--disable-polkit
|
||||
--disable-qrencode
|
||||
--disable-selinux
|
||||
--disable-tcpwrap
|
||||
--disable-tests
|
||||
--disable-xattr
|
||||
--disable-xz
|
||||
--disable-python-devel
|
||||
)
|
||||
fi
|
||||
|
||||
# Work around bug 463846.
|
||||
tc-export CC
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}"
|
||||
else
|
||||
# prerequisites for gudev
|
||||
use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
|
||||
|
||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
multilib_is_native_abi || continue
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local mymakeopts=(
|
||||
udevlibexecdir="${MY_UDEVDIR}"
|
||||
dist_udevhwdb_DATA=
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
emake "${mymakeopts[@]}" install
|
||||
else
|
||||
mymakeopts+=(
|
||||
install-libLTLIBRARIES
|
||||
install-pkgconfiglibDATA
|
||||
install-includeHEADERS
|
||||
# safe to call unconditionally, 'installs' empty list
|
||||
install-libgudev_includeHEADERS
|
||||
install-pkgincludeHEADERS
|
||||
)
|
||||
|
||||
emake "${mymakeopts[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --modules
|
||||
|
||||
# we just keep sysvinit tools, so no need for the mans
|
||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
||||
|| die
|
||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
||||
|
||||
# Disable storing coredumps in journald, bug #433457
|
||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
||||
|
||||
# Preserve empty dirs in /etc & /var, bug #437008
|
||||
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
|
||||
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
|
||||
|
||||
# Symlink /etc/sysctl.conf for easy migration.
|
||||
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# for udev rules
|
||||
enewgroup dialout
|
||||
|
||||
enewgroup systemd-journal
|
||||
if use http; then
|
||||
enewgroup systemd-journal-gateway
|
||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
||||
fi
|
||||
systemd_update_catalog
|
||||
|
||||
# Keep this here in case the database format changes so it gets updated
|
||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
||||
if has_version "sys-apps/hwids[udev]"; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
fi
|
||||
|
||||
if [[ ${ROOT} == "" || ${ROOT} == "/" ]]; then
|
||||
udevadm control --reload
|
||||
fi
|
||||
|
||||
# Bug 468876
|
||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
||||
|
||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
||||
ewarn "and 'mount' to not work properly. Please run:"
|
||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! has_version sys-apps/systemd-ui; then
|
||||
elog "To get additional features, a number of optional runtime dependencies may"
|
||||
elog "be installed:"
|
||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# If removing systemd completely, remove the catalog database.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user