* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog
@ 2013-07-31 7:09 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-31 7:09 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/31 07:09:02
Modified: systemd-9999-r1.ebuild ChangeLog
Log:
Finally drop compatibility symlinks. This time for real.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Revision Changes Path
1.3 sys-apps/systemd/systemd-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.2&r2=1.3
Index: systemd-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- systemd-9999-r1.ebuild 30 Jul 2013 08:48:24 -0000 1.2
+++ systemd-9999-r1.ebuild 31 Jul 2013 07:09:02 -0000 1.3
@@ -1,6 +1,6 @@
# 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.2 2013/07/30 08:48:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.3 2013/07/31 07:09:02 mgorny Exp $
EAPI=5
@@ -99,22 +99,6 @@
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
# ~!FW_LOADER_USER_HELPER"
- # 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 ) ]]
@@ -212,23 +196,10 @@
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
@@ -240,14 +211,6 @@
# 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() {
1.153 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.152&r2=1.153
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog 30 Jul 2013 08:48:24 -0000 1.152
+++ ChangeLog 31 Jul 2013 07:09:02 -0000 1.153
@@ -1,6 +1,9 @@
# 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.152 2013/07/30 08:48:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.153 2013/07/31 07:09:02 mgorny Exp $
+
+ 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:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog
@ 2013-08-03 22:14 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-03 22:14 UTC (permalink / raw
To: gentoo-commits
mgorny 13/08/03 22:14:22
Modified: systemd-9999-r1.ebuild ChangeLog
Log:
Update zsh-completion install after upstream cleanup.
(Portage version: 2.2.0_alpha192/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Revision Changes Path
1.5 sys-apps/systemd/systemd-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.4&r2=1.5
Index: systemd-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- systemd-9999-r1.ebuild 31 Jul 2013 22:23:50 -0000 1.4
+++ systemd-9999-r1.ebuild 3 Aug 2013 22:14:22 -0000 1.5
@@ -1,6 +1,6 @@
# 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.4 2013/07/31 22:23:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.5 2013/08/03 22:14:22 mgorny Exp $
EAPI=5
@@ -201,7 +201,7 @@
# zsh completion
insinto /usr/share/zsh/site-functions
- newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
+ doins shell-completion/zsh/_*
# we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
1.156 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.155&r2=1.156
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 31 Jul 2013 22:44:12 -0000 1.155
+++ ChangeLog 3 Aug 2013 22:14:22 -0000 1.156
@@ -1,6 +1,9 @@
# 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.155 2013/07/31 22:44:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.156 2013/08/03 22:14:22 mgorny Exp $
+
+ 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,
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog
@ 2013-08-04 8:15 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-04 8:15 UTC (permalink / raw
To: gentoo-commits
mgorny 13/08/04 08:15:09
Modified: systemd-9999-r1.ebuild ChangeLog
Log:
Sync kmod dep in the live ebuild.
(Portage version: 2.2.0_alpha193/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Revision Changes Path
1.6 sys-apps/systemd/systemd-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.5&r2=1.6
Index: systemd-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- systemd-9999-r1.ebuild 3 Aug 2013 22:14:22 -0000 1.5
+++ systemd-9999-r1.ebuild 4 Aug 2013 08:15:08 -0000 1.6
@@ -1,6 +1,6 @@
# 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.5 2013/08/03 22:14:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.6 2013/08/04 08:15:08 mgorny Exp $
EAPI=5
@@ -40,7 +40,7 @@
gudev? ( >=dev-libs/glib-2 )
http? ( net-libs/libmicrohttpd )
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- kmod? ( >=sys-apps/kmod-12 )
+ kmod? ( >=sys-apps/kmod-14-r1 )
lzma? ( app-arch/xz-utils )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
1.157 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.156&r2=1.157
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog 3 Aug 2013 22:14:22 -0000 1.156
+++ ChangeLog 4 Aug 2013 08:15:08 -0000 1.157
@@ -1,6 +1,9 @@
# 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.156 2013/08/03 22:14:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.157 2013/08/04 08:15:08 mgorny Exp $
+
+ 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog
@ 2013-08-10 21:49 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-10 21:49 UTC (permalink / raw
To: gentoo-commits
mgorny 13/08/10 21:49:40
Modified: systemd-9999-r1.ebuild ChangeLog
Log:
Enable building multilib libgudev.
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Revision Changes Path
1.12 sys-apps/systemd/systemd-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.11&r2=1.12
Index: systemd-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- systemd-9999-r1.ebuild 10 Aug 2013 08:08:23 -0000 1.11
+++ systemd-9999-r1.ebuild 10 Aug 2013 21:49:40 -0000 1.12
@@ -1,6 +1,6 @@
# 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.11 2013/08/10 08:08:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.12 2013/08/10 21:49:40 mgorny Exp $
EAPI=5
@@ -38,7 +38,7 @@
audit? ( >=sys-process/audit-2 )
cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
- gudev? ( >=dev-libs/glib-2 )
+ 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 )
@@ -49,7 +49,7 @@
selinux? ( sys-libs/libselinux )
tcpd? ( sys-apps/tcp-wrappers )
xattr? ( sys-apps/attr )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r8
+ 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
@@ -197,7 +197,6 @@
--disable-audit
--disable-gcrypt
--disable-gtk-doc
- --disable-gudev
--disable-introspection
--disable-kmod
--disable-libcryptsetup
@@ -228,29 +227,14 @@
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
}
-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}"
@@ -265,6 +249,8 @@
install-libLTLIBRARIES
install-pkgconfiglibDATA
install-includeHEADERS
+ # safe to call unconditionally, 'installs' empty list
+ install-libgudev_includeHEADERS
install-pkgincludeHEADERS
)
1.166 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.165&r2=1.166
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- ChangeLog 10 Aug 2013 08:08:23 -0000 1.165
+++ ChangeLog 10 Aug 2013 21:49:40 -0000 1.166
@@ -1,6 +1,9 @@
# 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.165 2013/08/10 08:08:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.166 2013/08/10 21:49:40 mgorny Exp $
+
+ 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:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog
@ 2013-09-13 11:27 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-13 11:27 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/13 11:27:49
Modified: systemd-9999-r1.ebuild ChangeLog
Log:
Sync the live ebuild with latest changes.
(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.14 sys-apps/systemd/systemd-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.13&r2=1.14
Index: systemd-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- systemd-9999-r1.ebuild 11 Aug 2013 21:34:00 -0000 1.13
+++ systemd-9999-r1.ebuild 13 Sep 2013 11:27:49 -0000 1.14
@@ -1,6 +1,6 @@
# 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.13 2013/08/11 21:34:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.14 2013/09/13 11:27:49 mgorny Exp $
EAPI=5
@@ -103,6 +103,7 @@
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
# ~!FW_LOADER_USER_HELPER"
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
if [[ ${MERGE_TYPE} != binary ]]; then
@@ -278,20 +279,6 @@
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
}
-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
@@ -317,17 +304,18 @@
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
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 "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
- 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'
+ 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() {
1.171 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.171&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.171&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.170&r2=1.171
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- ChangeLog 11 Sep 2013 11:52:15 -0000 1.170
+++ ChangeLog 13 Sep 2013 11:27:49 -0000 1.171
@@ -1,6 +1,9 @@
# 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.170 2013/09/11 11:52:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.171 2013/09/13 11:27:49 mgorny Exp $
+
+ 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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog
@ 2013-09-18 10:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-18 10:23 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/18 10:23:49
Modified: systemd-9999-r1.ebuild ChangeLog
Log:
Handle locale.conf/env.d wrt bug #465468.
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.17 sys-apps/systemd/systemd-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.16&r2=1.17
Index: systemd-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- systemd-9999-r1.ebuild 14 Sep 2013 18:44:05 -0000 1.16
+++ systemd-9999-r1.ebuild 18 Sep 2013 10:23:49 -0000 1.17
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.17 2013/09/18 10:23:49 mgorny Exp $
EAPI=5
@@ -286,6 +286,50 @@
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
}
+migrate_locale() {
+ local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+ local locale_conf="${EROOT%/}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # if locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
pkg_postinst() {
# for udev rules
enewgroup dialout
@@ -303,13 +347,22 @@
udevadm hwdb --update --root="${ROOT%/}"
fi
- if [[ ${ROOT} == "" || ${ROOT} == "/" ]]; then
- udevadm control --reload
- fi
+ udev_reload || FAIL=1
# Bug 468876
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
+ # Bug 465468, make sure locales are respect, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ 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'"
1.175 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.174&r2=1.175
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog 14 Sep 2013 18:44:05 -0000 1.174
+++ ChangeLog 18 Sep 2013 10:23:49 -0000 1.175
@@ -1,6 +1,9 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.175 2013/09/18 10:23:49 mgorny Exp $
+
+ 18 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd-9999-r1.ebuild:
+ Handle locale.conf/env.d wrt bug #465468.
14 Sep 2013; Mike Gilbert <floppym@gentoo.org> systemd-207.ebuild,
systemd-9999-r1.ebuild:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-09-18 10:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-10 21:49 [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999-r1.ebuild ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2013-09-18 10:23 Michal Gorny (mgorny)
2013-09-13 11:27 Michal Gorny (mgorny)
2013-08-04 8:15 Michal Gorny (mgorny)
2013-08-03 22:14 Michal Gorny (mgorny)
2013-07-31 7:09 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox