* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-09-11 7:58 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-11 7:58 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/11 07:58:00
Modified: ChangeLog systemd.eclass
Log:
Use subshells instead of "local INSDESTTREE" for doins/newins since that confuses people less.
Revision Changes Path
1.956 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.956&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.956&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.955&r2=1.956
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -r1.955 -r1.956
--- ChangeLog 10 Sep 2013 09:10:22 -0000 1.955
+++ ChangeLog 11 Sep 2013 07:58:00 -0000 1.956
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.955 2013/09/10 09:10:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.956 2013/09/11 07:58:00 mgorny Exp $
+
+ 11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Use subshells instead of "local INSDESTTREE" for doins/newins since that
+ confuses people less.
10 Sep 2013; Michał Górny <mgorny@gentoo.org> multibuild.eclass:
Add new enough coreutils dep wrt bug #484454.
1.27 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.26&r2=1.27
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- systemd.eclass 27 Jul 2013 10:36:55 -0000 1.26
+++ systemd.eclass 11 Sep 2013 07:58:00 -0000 1.27
@@ -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/eclass/systemd.eclass,v 1.26 2013/07/27 10:36:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.27 2013/09/11 07:58:00 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -113,9 +113,10 @@
systemd_dounit() {
debug-print-function ${FUNCNAME} "${@}"
- local INSDESTTREE
- insinto "$(_systemd_get_unitdir)"
- doins "${@}"
+ (
+ insinto "$(_systemd_get_unitdir)"
+ doins "${@}"
+ )
}
# @FUNCTION: systemd_newunit
@@ -126,9 +127,10 @@
systemd_newunit() {
debug-print-function ${FUNCNAME} "${@}"
- local INSDESTTREE
- insinto "$(_systemd_get_unitdir)"
- newins "${@}"
+ (
+ insinto "$(_systemd_get_unitdir)"
+ newins "${@}"
+ )
}
# @FUNCTION: systemd_dotmpfilesd
@@ -144,9 +146,10 @@
|| die 'tmpfiles.d files need to have .conf suffix.'
done
- local INSDESTTREE
- insinto /usr/lib/tmpfiles.d/
- doins "${@}"
+ (
+ insinto /usr/lib/tmpfiles.d/
+ doins "${@}"
+ )
}
# @FUNCTION: systemd_newtmpfilesd
@@ -160,9 +163,10 @@
[[ ${2} == *.conf ]] \
|| die 'tmpfiles.d files need to have .conf suffix.'
- local INSDESTTREE
- insinto /usr/lib/tmpfiles.d/
- newins "${@}"
+ (
+ insinto /usr/lib/tmpfiles.d/
+ newins "${@}"
+ )
}
# @FUNCTION: systemd_enable_service
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2014-05-31 10:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-31 10:23 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/31 10:23:36
Modified: ChangeLog systemd.eclass
Log:
Add systemd_{do,new}userunit.
Revision Changes Path
1.1278 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1278&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1278&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1277&r2=1.1278
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1277
retrieving revision 1.1278
diff -u -r1.1277 -r1.1278
--- ChangeLog 28 May 2014 18:53:20 -0000 1.1277
+++ ChangeLog 31 May 2014 10:23:36 -0000 1.1278
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1277 2014/05/28 18:53:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1278 2014/05/31 10:23:36 mgorny Exp $
+
+ 31 May 2014; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Add systemd_{do,new}userunit.
28 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Fix ABI flag stripping in multilib_get_enabled_abis(), bug #511682.
1.32 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.31&r2=1.32
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- systemd.eclass 22 Oct 2013 15:14:40 -0000 1.31
+++ systemd.eclass 31 May 2014 10:23:36 -0000 1.32
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.31 2013/10/22 15:14:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.32 2014/05/31 10:23:36 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -133,6 +133,34 @@
)
}
+# @FUNCTION: systemd_douserunit
+# @USAGE: <unit>...
+# @DESCRIPTION:
+# Install systemd user unit(s). Uses doins, thus it is fatal in EAPI 4
+# and non-fatal in earlier EAPIs.
+systemd_douserunit() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ (
+ insinto "$(_systemd_get_userunitdir)"
+ doins "${@}"
+ )
+}
+
+# @FUNCTION: systemd_newuserunit
+# @USAGE: <old-name> <new-name>
+# @DESCRIPTION:
+# Install systemd user unit with a new name. Uses newins, thus it
+# is fatal in EAPI 4 and non-fatal in earlier EAPIs.
+systemd_newuserunit() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ (
+ insinto "$(_systemd_get_userunitdir)"
+ newins "${@}"
+ )
+}
+
# @FUNCTION: systemd_install_serviced
# @USAGE: <conf-file> [<service.d>]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-10-22 15:14 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-22 15:14 UTC (permalink / raw
To: gentoo-commits
mgorny 13/10/22 15:14:40
Modified: ChangeLog systemd.eclass
Log:
Add systemd_enable_ntpunit wrt bug #458132.
Revision Changes Path
1.1030 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1030&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1030&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1029&r2=1.1030
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1029
retrieving revision 1.1030
diff -u -r1.1029 -r1.1030
--- ChangeLog 20 Oct 2013 21:45:31 -0000 1.1029
+++ ChangeLog 22 Oct 2013 15:14:40 -0000 1.1030
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1029 2013/10/20 21:45:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1030 2013/10/22 15:14:40 mgorny Exp $
+
+ 22 Oct 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Add systemd_enable_ntpunit wrt bug #458132.
20 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Updates from qt overlay: drop USE="c++0x" from 4.8.5 and later versions; warn
1.31 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.30&r2=1.31
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- systemd.eclass 12 Sep 2013 11:46:41 -0000 1.30
+++ systemd.eclass 22 Oct 2013 15:14:40 -0000 1.31
@@ -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/eclass/systemd.eclass,v 1.30 2013/09/12 11:46:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.31 2013/10/22 15:14:40 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -218,6 +218,53 @@
dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}"
}
+# @FUNCTION: systemd_enable_ntpunit
+# @USAGE: <NN-name> <service>...
+# @DESCRIPTION:
+# Add an NTP service provider to the list of implementations
+# in timedated. <NN-name> defines the newly-created ntp-units.d priority
+# and name, while the remaining arguments list service units that will
+# be added to that file.
+#
+# Uses doins, thus it is fatal in EAPI 4 and non-fatal in earlier
+# EAPIs.
+#
+# Doc: http://www.freedesktop.org/wiki/Software/systemd/timedated/
+systemd_enable_ntpunit() {
+ debug-print-function ${FUNCNAME} "${@}"
+ if [[ ${#} -lt 2 ]]; then
+ die "Usage: systemd_enable_ntpunit <NN-name> <service>..."
+ fi
+
+ local ntpunit_name=${1}
+ local services=( "${@:2}" )
+
+ if [[ ${ntpunit_name} != [0-9][0-9]-* ]]; then
+ die "ntpunit.d file must be named NN-name where NN are digits."
+ elif [[ ${ntpunit_name} == *.list ]]; then
+ die "The .list suffix is appended implicitly to ntpunit.d name."
+ fi
+
+ local unitdir=$(systemd_get_unitdir)
+ local s
+ for s in "${services[@]}"; do
+ if [[ ! -f "${D}${unitdir}/${s}" ]]; then
+ die "ntp-units.d provider ${s} not installed (yet?) in \${D}."
+ fi
+ echo "${s}" >> "${T}"/${ntpunit_name}.list
+ done
+
+ (
+ insinto "$(_systemd_get_utildir)"/ntp-units.d
+ doins "${T}"/${ntpunit_name}.list
+ )
+ local ret=${?}
+
+ rm "${T}"/${ntpunit_name}.list || die
+
+ return ${ret}
+}
+
# @FUNCTION: systemd_with_unitdir
# @USAGE: [<configure-option-name>]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-09-12 11:46 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-12 11:46 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/12 11:46:41
Modified: ChangeLog systemd.eclass
Log:
Introduce systemd_install_serviced() to install foo.service.d/00gentoo.conf files.
Revision Changes Path
1.959 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.959&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.959&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.958&r2=1.959
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.958
retrieving revision 1.959
diff -u -r1.958 -r1.959
--- ChangeLog 11 Sep 2013 08:53:18 -0000 1.958
+++ ChangeLog 12 Sep 2013 11:46:41 -0000 1.959
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.958 2013/09/11 08:53:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.959 2013/09/12 11:46:41 mgorny Exp $
+
+ 12 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Introduce systemd_install_serviced() to install foo.service.d/00gentoo.conf
+ files.
11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Change @USAGE style.
1.30 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.29&r2=1.30
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- systemd.eclass 11 Sep 2013 08:53:18 -0000 1.29
+++ systemd.eclass 12 Sep 2013 11:46:41 -0000 1.30
@@ -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/eclass/systemd.eclass,v 1.29 2013/09/11 08:53:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.30 2013/09/12 11:46:41 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -133,6 +133,35 @@
)
}
+# @FUNCTION: systemd_install_serviced
+# @USAGE: <conf-file> [<service.d>]
+# @DESCRIPTION:
+# Install the file <conf-file> as service.d/00gentoo.conf template.
+# The <service.d> argument specifies the configured service name.
+# If not specified, the configuration file name will be used with .conf
+# suffix stripped (e.g. foo.service.conf -> foo.service).
+systemd_install_serviced() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local src=${1}
+ local service=${2}
+
+ [[ ${src} ]] || die "No file specified"
+
+ if [[ ! ${service} ]]; then
+ [[ ${src} == *.conf ]] || die "Source file needs .conf suffix"
+ service=${src##*/}
+ service=${service%.conf}
+ fi
+ # avoid potentially common mistake
+ [[ ${service} == *.d ]] && die "Service must not have .d suffix"
+
+ (
+ insinto /etc/systemd/system/"${service}".d
+ newins "${src}" 00gentoo.conf
+ )
+}
+
# @FUNCTION: systemd_dotmpfilesd
# @USAGE: <tmpfilesd>...
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-09-11 8:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-11 8:53 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/11 08:53:18
Modified: ChangeLog systemd.eclass
Log:
Change @USAGE style.
Revision Changes Path
1.958 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.958&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.958&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.957&r2=1.958
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.957
retrieving revision 1.958
diff -u -r1.957 -r1.958
--- ChangeLog 11 Sep 2013 08:50:07 -0000 1.957
+++ ChangeLog 11 Sep 2013 08:53:18 -0000 1.958
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.957 2013/09/11 08:50:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.958 2013/09/11 08:53:18 mgorny Exp $
+
+ 11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Change @USAGE style.
11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Deprecate systemd_to_myeconfargs(). It's redundant and unnecessarily
1.29 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.28&r2=1.29
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- systemd.eclass 11 Sep 2013 08:50:07 -0000 1.28
+++ systemd.eclass 11 Sep 2013 08:53:18 -0000 1.29
@@ -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/eclass/systemd.eclass,v 1.28 2013/09/11 08:50:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.29 2013/09/11 08:53:18 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -106,7 +106,7 @@
}
# @FUNCTION: systemd_dounit
-# @USAGE: unit1 [...]
+# @USAGE: <unit>...
# @DESCRIPTION:
# Install systemd unit(s). Uses doins, thus it is fatal in EAPI 4
# and non-fatal in earlier EAPIs.
@@ -120,7 +120,7 @@
}
# @FUNCTION: systemd_newunit
-# @USAGE: oldname newname
+# @USAGE: <old-name> <new-name>
# @DESCRIPTION:
# Install systemd unit with a new name. Uses newins, thus it is fatal
# in EAPI 4 and non-fatal in earlier EAPIs.
@@ -134,7 +134,7 @@
}
# @FUNCTION: systemd_dotmpfilesd
-# @USAGE: tmpfilesd1 [...]
+# @USAGE: <tmpfilesd>...
# @DESCRIPTION:
# Install systemd tmpfiles.d files. Uses doins, thus it is fatal
# in EAPI 4 and non-fatal in earlier EAPIs.
@@ -153,7 +153,7 @@
}
# @FUNCTION: systemd_newtmpfilesd
-# @USAGE: oldname newname.conf
+# @USAGE: <old-name> <new-name>.conf
# @DESCRIPTION:
# Install systemd tmpfiles.d file under a new name. Uses newins, thus it
# is fatal in EAPI 4 and non-fatal in earlier EAPIs.
@@ -170,7 +170,7 @@
}
# @FUNCTION: systemd_enable_service
-# @USAGE: target service
+# @USAGE: <target> <service>
# @DESCRIPTION:
# Enable service in desired target, e.g. install a symlink for it.
# Uses dosym, thus it is fatal in EAPI 4 and non-fatal in earlier
@@ -190,7 +190,7 @@
}
# @FUNCTION: systemd_with_unitdir
-# @USAGE: [configure option]
+# @USAGE: [<configure-option-name>]
# @DESCRIPTION:
# Output '--with-systemdsystemunitdir' as expected by systemd-aware configure
# scripts. This function always succeeds. Its output may be quoted in order
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-09-11 8:50 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-11 8:50 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/11 08:50:07
Modified: ChangeLog systemd.eclass
Log:
Deprecate systemd_to_myeconfargs(). It's redundant and unnecessarily confusing.
Revision Changes Path
1.957 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.957&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.957&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.956&r2=1.957
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -r1.956 -r1.957
--- ChangeLog 11 Sep 2013 07:58:00 -0000 1.956
+++ ChangeLog 11 Sep 2013 08:50:07 -0000 1.957
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.956 2013/09/11 07:58:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.957 2013/09/11 08:50:07 mgorny Exp $
+
+ 11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Deprecate systemd_to_myeconfargs(). It's redundant and unnecessarily
+ confusing.
11 Sep 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Use subshells instead of "local INSDESTTREE" for doins/newins since that
1.28 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.27&r2=1.28
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- systemd.eclass 11 Sep 2013 07:58:00 -0000 1.27
+++ systemd.eclass 11 Sep 2013 08:50:07 -0000 1.28
@@ -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/eclass/systemd.eclass,v 1.27 2013/09/11 07:58:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.28 2013/09/11 08:50:07 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -12,20 +12,20 @@
# @EXAMPLE:
#
# @CODE
-# inherit autotools-utils systemd
+# inherit systemd
#
# src_configure() {
# local myeconfargs=(
# --enable-foo
# --disable-bar
+# "$(systemd_with_unitdir)"
# )
#
-# systemd_to_myeconfargs
-# autotools-utils_src_configure
+# econf "${myeconfargs[@]}"
# }
# @CODE
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
case ${EAPI:-0} in
0|1|2|3|4|5) ;;
@@ -227,6 +227,9 @@
systemd_to_myeconfargs() {
debug-print-function ${FUNCNAME} "${@}"
+ eqawarn 'systemd_to_myeconfargs() is deprecated and will be removed on 2013-10-11.'
+ eqawarn 'Please use $(systemd_with_unitdir) instead.'
+
myeconfargs=(
"${myeconfargs[@]}"
--with-systemdsystemunitdir="$(systemd_get_unitdir)"
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-07-27 10:36 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-27 10:36 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/27 10:36:55
Modified: ChangeLog systemd.eclass
Log:
Introduce systemd_is_booted() to allow ebuilds to warn consistently for things that require systemd. Bug #478342.
Revision Changes Path
1.896 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.896&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.896&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.895&r2=1.896
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -r1.895 -r1.896
--- ChangeLog 27 Jul 2013 10:18:13 -0000 1.895
+++ ChangeLog 27 Jul 2013 10:36:55 -0000 1.896
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.895 2013/07/27 10:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.896 2013/07/27 10:36:55 mgorny Exp $
+
+ 27 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Introduce systemd_is_booted() to allow ebuilds to warn consistently for
+ things that require systemd. Bug #478342.
27 Jul 2013; Michał Górny <mgorny@gentoo.org> subversion.eclass:
Export working copy information after the update rather than in
1.26 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.25&r2=1.26
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- systemd.eclass 13 Apr 2013 22:49:21 -0000 1.25
+++ systemd.eclass 27 Jul 2013 10:36:55 -0000 1.26
@@ -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/eclass/systemd.eclass,v 1.25 2013/04/13 22:49:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.26 2013/07/27 10:36:55 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -252,3 +252,25 @@
debug-print "${FUNCNAME}: journalctl not found."
fi
}
+
+# @FUNCTION: systemd_is_booted
+# @DESCRIPTION:
+# Check whether the system was booted using systemd.
+#
+# This should be used purely for informational purposes, e.g. warning
+# user that he needs to use systemd. Installed files or application
+# behavior *must not* rely on this. Please remember to check MERGE_TYPE
+# to not trigger the check on binary package build hosts!
+#
+# Returns 0 if systemd is used to boot the system, 1 otherwise.
+#
+# See: man sd_booted
+systemd_is_booted() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ -d /run/systemd/system ]]
+ local ret=${?}
+
+ debug-print "${FUNCNAME}: [[ -d /run/systemd/system ]] -> ${ret}"
+ return ${ret}
+}
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-04-13 22:49 Mike Gilbert (floppym)
0 siblings, 0 replies; 19+ messages in thread
From: Mike Gilbert (floppym) @ 2013-04-13 22:49 UTC (permalink / raw
To: gentoo-commits
floppym 13/04/13 22:49:21
Modified: ChangeLog systemd.eclass
Log:
Replace basename usage with a shell parameter replacement.
Revision Changes Path
1.788 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.788&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.788&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.787&r2=1.788
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- ChangeLog 13 Apr 2013 22:35:53 -0000 1.787
+++ ChangeLog 13 Apr 2013 22:49:21 -0000 1.788
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.787 2013/04/13 22:35:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.788 2013/04/13 22:49:21 floppym Exp $
+
+ 13 Apr 2013; Mike Gilbert <floppym@gentoo.org> systemd.eclass:
+ Replace basename usage with a shell parameter replacement.
13 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Use pkg-config to query systemd directories.
1.25 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.24&r2=1.25
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- systemd.eclass 13 Apr 2013 22:36:51 -0000 1.24
+++ systemd.eclass 13 Apr 2013 22:49:21 -0000 1.25
@@ -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/eclass/systemd.eclass,v 1.24 2013/04/13 22:36:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.25 2013/04/13 22:49:21 floppym Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -179,7 +179,7 @@
local target=${1}
local service=${2}
local ud=$(_systemd_get_unitdir)
- local destname=$(basename "${service}")
+ local destname=${service##*/}
dodir "${ud}"/"${target}".wants && \
dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}"
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-04-13 22:35 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-04-13 22:35 UTC (permalink / raw
To: gentoo-commits
mgorny 13/04/13 22:35:53
Modified: ChangeLog systemd.eclass
Log:
Use pkg-config to query systemd directories.
Revision Changes Path
1.787 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.787&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.787&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.786&r2=1.787
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- ChangeLog 13 Apr 2013 19:15:04 -0000 1.786
+++ ChangeLog 13 Apr 2013 22:35:53 -0000 1.787
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.786 2013/04/13 19:15:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.787 2013/04/13 22:35:53 mgorny Exp $
+
+ 13 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Use pkg-config to query systemd directories.
13 Apr 2013; Michael Weber <xmw@gentoo.org> cmake-multilib.eclass:
Pass ${@} in phase functions. Approved by author on dev-ml.
1.23 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.22&r2=1.23
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- systemd.eclass 18 Mar 2013 06:29:03 -0000 1.22
+++ systemd.eclass 13 Apr 2013 22:35:53 -0000 1.23
@@ -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/eclass/systemd.eclass,v 1.22 2013/03/18 06:29:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.23 2013/04/13 22:35:53 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -25,17 +25,25 @@
# }
# @CODE
+inherit toolchain-funcs
+
case ${EAPI:-0} in
0|1|2|3|4|5) ;;
*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
esac
+DEPEND="virtual/pkgconfig"
+
# @FUNCTION: _systemd_get_unitdir
# @INTERNAL
# @DESCRIPTION:
# Get unprefixed unitdir.
_systemd_get_unitdir() {
- echo /usr/lib/systemd/system
+ if $(tc-getPKG_CONFIG) --exists systemd; then
+ echo "$($(tc-getPKG_CONFIG) --variable=systemdsystemunitdir systemd)"
+ else
+ echo /usr/lib/systemd/system
+ fi
}
# @FUNCTION: systemd_get_unitdir
@@ -49,6 +57,18 @@
echo "${EPREFIX}$(_systemd_get_unitdir)"
}
+# @FUNCTION: _systemd_get_userunitdir
+# @INTERNAL
+# @DESCRIPTION:
+# Get unprefixed userunitdir.
+_systemd_get_userunitdir() {
+ if $($(tc-getPKG_CONFIG) --exists systemd); then
+ echo "$($(tc-getPKG_CONFIG) --variable=systemduserunitdir systemd)"
+ else
+ echo /usr/lib/systemd/user
+ fi
+}
+
# @FUNCTION: systemd_get_userunitdir
# @DESCRIPTION:
# Output the path for the systemd user unit directory (not including
@@ -58,7 +78,19 @@
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
debug-print-function ${FUNCNAME} "${@}"
- echo "${EPREFIX}/usr/lib/systemd/user"
+ echo "${EPREFIX}$(_systemd_get_userunitdir)"
+}
+
+# @FUNCTION: _systemd_get_utildir
+# @INTERNAL
+# @DESCRIPTION:
+# Get unprefixed utildir.
+_systemd_get_utildir() {
+ if $($(tc-getPKG_CONFIG) --exists systemd); then
+ echo "$($(tc-getPKG_CONFIG) --variable=systemdutildir systemd)"
+ else
+ echo /usr/lib/systemd
+ fi
}
# @FUNCTION: systemd_get_utildir
@@ -70,7 +102,7 @@
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
debug-print-function ${FUNCNAME} "${@}"
- echo "${EPREFIX}/usr/lib/systemd"
+ echo "${EPREFIX}$(_systemd_get_utildir)"
}
# @FUNCTION: systemd_dounit
@@ -210,6 +242,7 @@
debug-print-function ${FUNCNAME} "${@}"
# Make sure to work on the correct system.
+
local journalctl=${EPREFIX}/usr/bin/journalctl
if [[ -x ${journalctl} ]]; then
ebegin "Updating systemd journal catalogs"
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2013-03-18 6:29 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-18 6:29 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/18 06:29:03
Modified: ChangeLog systemd.eclass
Log:
Update the maintainer to systemd@.
Revision Changes Path
1.742 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.742&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.742&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.741&r2=1.742
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.741
retrieving revision 1.742
diff -u -r1.741 -r1.742
--- ChangeLog 16 Mar 2013 19:20:34 -0000 1.741
+++ ChangeLog 18 Mar 2013 06:29:03 -0000 1.742
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.741 2013/03/16 19:20:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.742 2013/03/18 06:29:03 mgorny Exp $
+
+ 18 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Update the maintainer to systemd@.
16 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mysql.eclass,
mysql-autotools.eclass:
1.22 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.21&r2=1.22
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- systemd.eclass 31 Dec 2012 13:09:09 -0000 1.21
+++ systemd.eclass 18 Mar 2013 06:29:03 -0000 1.22
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.21 2012/12/31 13:09:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.22 2013/03/18 06:29:03 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
-# mgorny@gentoo.org
+# systemd@gentoo.org
# @BLURB: helper functions to install systemd units
# @DESCRIPTION:
# This eclass provides a set of functions to install unit files for
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-12-31 13:09 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-31 13:09 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/31 13:09:09
Modified: ChangeLog systemd.eclass
Log:
Add function to get user unit directory, as requested in bug #449304.
Revision Changes Path
1.585 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.585&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.585&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.584&r2=1.585
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- ChangeLog 31 Dec 2012 13:08:12 -0000 1.584
+++ ChangeLog 31 Dec 2012 13:09:09 -0000 1.585
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.584 2012/12/31 13:08:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.585 2012/12/31 13:09:09 mgorny Exp $
+
+ 31 Dec 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Add function to get user unit directory, as requested in bug #449304.
31 Dec 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Add function to update systemd journal catalog database.
1.21 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.20&r2=1.21
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- systemd.eclass 31 Dec 2012 13:08:12 -0000 1.20
+++ systemd.eclass 31 Dec 2012 13:09:09 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.20 2012/12/31 13:08:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.21 2012/12/31 13:09:09 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -49,6 +49,18 @@
echo "${EPREFIX}$(_systemd_get_unitdir)"
}
+# @FUNCTION: systemd_get_userunitdir
+# @DESCRIPTION:
+# Output the path for the systemd user unit directory (not including
+# ${D}). This function always succeeds, even if systemd is not
+# installed.
+systemd_get_userunitdir() {
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+ debug-print-function ${FUNCNAME} "${@}"
+
+ echo "${EPREFIX}/usr/lib/systemd/user"
+}
+
# @FUNCTION: systemd_get_utildir
# @DESCRIPTION:
# Output the path for the systemd utility directory (not including
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-12-31 13:08 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-31 13:08 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/31 13:08:12
Modified: ChangeLog systemd.eclass
Log:
Add function to update systemd journal catalog database.
Revision Changes Path
1.584 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.584&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.584&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.583&r2=1.584
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- ChangeLog 31 Dec 2012 09:27:00 -0000 1.583
+++ ChangeLog 31 Dec 2012 13:08:12 -0000 1.584
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.583 2012/12/31 09:27:00 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.584 2012/12/31 13:08:12 mgorny Exp $
+
+ 31 Dec 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Add function to update systemd journal catalog database.
31 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
vdr-plugin-2.eclass; better detection of new Makefile handling, fixed some
1.20 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.19&r2=1.20
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- systemd.eclass 21 Nov 2012 09:06:42 -0000 1.19
+++ systemd.eclass 31 Dec 2012 13:08:12 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.19 2012/11/21 09:06:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.20 2012/12/31 13:08:12 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -184,3 +184,26 @@
--with-systemdsystemunitdir="$(systemd_get_unitdir)"
)
}
+
+# @FUNCTION: systemd_update_catalog
+# @DESCRIPTION:
+# Update the journald catalog. This needs to be called after installing
+# or removing catalog files.
+#
+# If systemd is not installed, no operation will be done. The catalog
+# will be (re)built once systemd is installed.
+#
+# See: http://www.freedesktop.org/wiki/Software/systemd/catalog
+systemd_update_catalog() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ # Make sure to work on the correct system.
+ local journalctl=${EPREFIX}/usr/bin/journalctl
+ if [[ -x ${journalctl} ]]; then
+ ebegin "Updating systemd journal catalogs"
+ journalctl --update-catalog
+ eend $?
+ else
+ debug-print "${FUNCNAME}: journalctl not found."
+ fi
+}
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-10-30 21:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-30 21:56 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/30 21:56:31
Modified: ChangeLog systemd.eclass
Log:
Add systemd_with_utildir() as well.
Revision Changes Path
1.488 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.488&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.488&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.487&r2=1.488
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- ChangeLog 30 Oct 2012 21:29:32 -0000 1.487
+++ ChangeLog 30 Oct 2012 21:56:31 -0000 1.488
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.487 2012/10/30 21:29:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.488 2012/10/30 21:56:31 mgorny Exp $
+
+ 30 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Add systemd_with_utildir() as well.
30 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Introduce systemd_get_utildir() wrt bug #440320.
1.18 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.17&r2=1.18
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- systemd.eclass 30 Oct 2012 21:29:32 -0000 1.17
+++ systemd.eclass 30 Oct 2012 21:56:31 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.17 2012/10/30 21:29:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.18 2012/10/30 21:56:31 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -164,6 +164,17 @@
echo --with-${optname}="$(systemd_get_unitdir)"
}
+# @FUNCTION: systemd_with_utildir
+# @DESCRIPTION:
+# Output '--with-systemdsystemutildir' as used by some packages to install
+# systemd helpers. This function always succeeds. Its output may be quoted
+# in order to preserve whitespace in paths.
+systemd_with_utildir() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ echo --with-systemdutildir="$(systemd_get_utildir)"
+}
+
# @FUNCTION: systemd_to_myeconfargs
# @DESCRIPTION:
# Add '--with-systemdsystemunitdir' as expected by systemd-aware configure
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-10-30 21:29 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-30 21:29 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/30 21:29:32
Modified: ChangeLog systemd.eclass
Log:
Introduce systemd_get_utildir() wrt bug #440320.
Revision Changes Path
1.487 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.487&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.487&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.486&r2=1.487
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- ChangeLog 30 Oct 2012 20:24:09 -0000 1.486
+++ ChangeLog 30 Oct 2012 21:29:32 -0000 1.487
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.486 2012/10/30 20:24:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.487 2012/10/30 21:29:32 mgorny Exp $
+
+ 30 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Introduce systemd_get_utildir() wrt bug #440320.
30 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Replace "echo -n" with "echo", bash removes trailing newline in subshells
1.17 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.16&r2=1.17
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- systemd.eclass 30 Oct 2012 20:24:09 -0000 1.16
+++ systemd.eclass 30 Oct 2012 21:29:32 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.16 2012/10/30 20:24:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.17 2012/10/30 21:29:32 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -49,6 +49,18 @@
echo "${EPREFIX}$(_systemd_get_unitdir)"
}
+# @FUNCTION: systemd_get_utildir
+# @DESCRIPTION:
+# Output the path for the systemd utility directory (not including
+# ${D}). This function always succeeds, even if systemd is not
+# installed.
+systemd_get_utildir() {
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+ debug-print-function ${FUNCNAME} "${@}"
+
+ echo "${EPREFIX}/usr/lib/systemd"
+}
+
# @FUNCTION: systemd_dounit
# @USAGE: unit1 [...]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-10-30 20:24 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-30 20:24 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/30 20:24:09
Modified: ChangeLog systemd.eclass
Log:
Replace "echo -n" with "echo", bash removes trailing newline in subshells anyway.
Revision Changes Path
1.486 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.486&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.486&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.485&r2=1.486
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- ChangeLog 30 Oct 2012 17:22:33 -0000 1.485
+++ ChangeLog 30 Oct 2012 20:24:09 -0000 1.486
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.485 2012/10/30 17:22:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.486 2012/10/30 20:24:09 mgorny Exp $
+
+ 30 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Replace "echo -n" with "echo", bash removes trailing newline in subshells
+ anyway.
30 Oct 2012; Michał Górny <mgorny@gentoo.org> python-distutils-ng.eclass:
Fix Prefix support, wrt bug #423323.
1.16 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.15&r2=1.16
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- systemd.eclass 27 Sep 2012 16:35:42 -0000 1.15
+++ systemd.eclass 30 Oct 2012 20:24:09 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.15 2012/09/27 16:35:42 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.16 2012/10/30 20:24:09 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -35,7 +35,7 @@
# @DESCRIPTION:
# Get unprefixed unitdir.
_systemd_get_unitdir() {
- echo -n /usr/lib/systemd/system
+ echo /usr/lib/systemd/system
}
# @FUNCTION: systemd_get_unitdir
@@ -46,7 +46,7 @@
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
debug-print-function ${FUNCNAME} "${@}"
- echo -n "${EPREFIX}$(_systemd_get_unitdir)"
+ echo "${EPREFIX}$(_systemd_get_unitdir)"
}
# @FUNCTION: systemd_dounit
@@ -149,7 +149,7 @@
debug-print-function ${FUNCNAME} "${@}"
local optname=${1:-systemdsystemunitdir}
- echo -n --with-${optname}="$(systemd_get_unitdir)"
+ echo --with-${optname}="$(systemd_get_unitdir)"
}
# @FUNCTION: systemd_to_myeconfargs
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-08-27 21:55 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-08-27 21:55 UTC (permalink / raw
To: gentoo-commits
mgorny 12/08/27 21:55:01
Modified: ChangeLog systemd.eclass
Log:
Drop blockers for ancient systemd versions.
Revision Changes Path
1.381 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.381&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.381&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.380&r2=1.381
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- ChangeLog 27 Aug 2012 21:54:19 -0000 1.380
+++ ChangeLog 27 Aug 2012 21:55:01 -0000 1.381
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.380 2012/08/27 21:54:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.381 2012/08/27 21:55:01 mgorny Exp $
+
+ 27 Aug 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Drop blockers for ancient systemd versions.
27 Aug 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
tmpfiles.d: ensure .conf suffix when installing.
1.14 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.13&r2=1.14
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- systemd.eclass 27 Aug 2012 21:54:19 -0000 1.13
+++ systemd.eclass 27 Aug 2012 21:55:01 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.13 2012/08/27 21:54:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.14 2012/08/27 21:55:01 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -30,10 +30,6 @@
*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
esac
-# Block systemd version without the migration helper.
-DEPEND="!<sys-apps/systemd-29-r4
- !=sys-apps/systemd-37-r1"
-
# @FUNCTION: _systemd_get_unitdir
# @INTERNAL
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-08-27 21:54 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-08-27 21:54 UTC (permalink / raw
To: gentoo-commits
mgorny 12/08/27 21:54:19
Modified: ChangeLog systemd.eclass
Log:
tmpfiles.d: ensure .conf suffix when installing.
Revision Changes Path
1.380 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.380&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.380&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.379&r2=1.380
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- ChangeLog 27 Aug 2012 21:53:04 -0000 1.379
+++ ChangeLog 27 Aug 2012 21:54:19 -0000 1.380
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.379 2012/08/27 21:53:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.380 2012/08/27 21:54:19 mgorny Exp $
+
+ 27 Aug 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ tmpfiles.d: ensure .conf suffix when installing.
27 Aug 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Add systemd_newtmpfilesd().
1.13 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.12&r2=1.13
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- systemd.eclass 27 Aug 2012 21:53:04 -0000 1.12
+++ systemd.eclass 27 Aug 2012 21:54:19 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.12 2012/08/27 21:53:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.13 2012/08/27 21:54:19 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -89,6 +89,11 @@
systemd_dotmpfilesd() {
debug-print-function ${FUNCNAME} "${@}"
+ for f; do
+ [[ ${f} == *.conf ]] \
+ || die 'tmpfiles.d files need to have .conf suffix.'
+ done
+
(
insinto /usr/lib/tmpfiles.d/
doins "${@}"
@@ -103,6 +108,9 @@
systemd_newtmpfilesd() {
debug-print-function ${FUNCNAME} "${@}"
+ [[ ${2} == *.conf ]] \
+ || die 'tmpfiles.d files need to have .conf suffix.'
+
(
insinto /usr/lib/tmpfiles.d/
newins "${@}"
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-08-27 21:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-08-27 21:53 UTC (permalink / raw
To: gentoo-commits
mgorny 12/08/27 21:53:04
Modified: ChangeLog systemd.eclass
Log:
Add systemd_newtmpfilesd().
Revision Changes Path
1.379 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.379&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.379&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.378&r2=1.379
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- ChangeLog 22 Aug 2012 01:41:12 -0000 1.378
+++ ChangeLog 27 Aug 2012 21:53:04 -0000 1.379
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.378 2012/08/22 01:41:12 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.379 2012/08/27 21:53:04 mgorny Exp $
+
+ 27 Aug 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Add systemd_newtmpfilesd().
22 Aug 2012; Christoph Junghans <ottxor@gentoo.org> unpacker.eclass:
added support for cpio archives
1.12 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.11&r2=1.12
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- systemd.eclass 7 Jan 2012 17:53:47 -0000 1.11
+++ systemd.eclass 27 Aug 2012 21:53:04 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.11 2012/01/07 17:53:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.12 2012/08/27 21:53:04 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -95,6 +95,20 @@
)
}
+# @FUNCTION: systemd_newtmpfilesd
+# @USAGE: oldname newname.conf
+# @DESCRIPTION:
+# Install systemd tmpfiles.d file under a new name. Uses newins, thus it
+# is fatal in EAPI 4 and non-fatal in earlier EAPIs.
+systemd_newtmpfilesd() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ (
+ insinto /usr/lib/tmpfiles.d/
+ newins "${@}"
+ )
+}
+
# @FUNCTION: systemd_enable_service
# @USAGE: target service
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass
@ 2012-01-07 17:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-07 17:53 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/07 17:53:47
Modified: ChangeLog systemd.eclass
Log:
Install systemd units to /usr/lib.
Revision Changes Path
1.74 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.73&r2=1.74
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog 6 Jan 2012 21:32:48 -0000 1.73
+++ ChangeLog 7 Jan 2012 17:53:47 -0000 1.74
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.73 2012/01/06 21:32:48 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.74 2012/01/07 17:53:47 mgorny Exp $
+
+ 07 Jan 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Install systemd units to /usr/lib.
06 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mysql.eclass, mysql-autotools.eclass, mysql-cmake.eclass, mysql-v2.eclass,
1.11 eclass/systemd.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.10&r2=1.11
Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- systemd.eclass 5 Jan 2012 23:20:02 -0000 1.10
+++ systemd.eclass 7 Jan 2012 17:53:47 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.10 2012/01/05 23:20:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.11 2012/01/07 17:53:47 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -30,12 +30,16 @@
*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
esac
+# Block systemd version without the migration helper.
+DEPEND="!<sys-apps/systemd-29-r4
+ !=sys-apps/systemd-37-r1"
+
# @FUNCTION: _systemd_get_unitdir
# @INTERNAL
# @DESCRIPTION:
# Get unprefixed unitdir.
_systemd_get_unitdir() {
- echo -n /lib/systemd/system
+ echo -n /usr/lib/systemd/system
}
# @FUNCTION: systemd_get_unitdir
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2014-05-31 10:23 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 7:58 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog systemd.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2014-05-31 10:23 Michal Gorny (mgorny)
2013-10-22 15:14 Michal Gorny (mgorny)
2013-09-12 11:46 Michal Gorny (mgorny)
2013-09-11 8:53 Michal Gorny (mgorny)
2013-09-11 8:50 Michal Gorny (mgorny)
2013-07-27 10:36 Michal Gorny (mgorny)
2013-04-13 22:49 Mike Gilbert (floppym)
2013-04-13 22:35 Michal Gorny (mgorny)
2013-03-18 6:29 Michal Gorny (mgorny)
2012-12-31 13:09 Michal Gorny (mgorny)
2012-12-31 13:08 Michal Gorny (mgorny)
2012-10-30 21:56 Michal Gorny (mgorny)
2012-10-30 21:29 Michal Gorny (mgorny)
2012-10-30 20:24 Michal Gorny (mgorny)
2012-08-27 21:55 Michal Gorny (mgorny)
2012-08-27 21:54 Michal Gorny (mgorny)
2012-08-27 21:53 Michal Gorny (mgorny)
2012-01-07 17:53 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