[systemd-commits] 2 commits - Makefile.am po/POTFILES.skip src/.gitignore src/org.freedesktop.systemd1.policy.in src/org.freedesktop.systemd1.policy.in.in TODO
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Jul 11 16:11:50 PDT 2011
Makefile.am | 38 ++++++++++++++++++++-------
TODO | 4 ++
po/POTFILES.skip | 19 +++++++++++++
src/.gitignore | 4 ++
src/org.freedesktop.systemd1.policy.in | 41 ------------------------------
src/org.freedesktop.systemd1.policy.in.in | 41 ++++++++++++++++++++++++++++++
6 files changed, 96 insertions(+), 51 deletions(-)
New commits:
commit 9356a6c656357fe67b310cbbb270c6ccd1048e82
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jul 12 01:11:27 2011 +0200
build-sys: fix make distcheck
diff --git a/Makefile.am b/Makefile.am
index 96e8838..e5eeda3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -411,7 +411,6 @@ EXTRA_DIST = \
units/user at .service.in \
systemd.pc.in \
introspect.awk \
- src/org.freedesktop.systemd1.policy.in \
src/73-seat-late.rules.in
if ENABLE_BINFMT
@@ -475,17 +474,26 @@ dist_doc_DATA = \
pkgconfigdata_DATA = \
systemd.pc
-nodist_polkitpolicy_DATA = \
- src/org.freedesktop.systemd1.policy
-
-dist_polkitpolicy_in_files = \
+# Passed through intltool only
+polkitpolicy_in_files = \
src/org.freedesktop.hostname1.policy.in \
src/org.freedesktop.locale1.policy.in \
src/org.freedesktop.timedate1.policy.in \
src/org.freedesktop.login1.policy.in
+# First passed through sed, followed by intltool
+polkitpolicy_in_in_files = \
+ src/org.freedesktop.systemd1.policy.in.in
+
+nodist_polkitpolicy_DATA = \
+ $(polkitpolicy_in_files:.policy.in=.policy) \
+ $(polkitpolicy_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+ $(polkitpolicy_in_files) \
+ $(polkitpolicy_in_in_files)
+
@INTLTOOL_POLICY_RULE@
-polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
noinst_LTLIBRARIES = \
libsystemd-basic.la \
@@ -1357,7 +1365,7 @@ man/%: man/%.in Makefile
%.pc: %.pc.in Makefile
$(SED_PROCESS)
-src/%.policy: src/%.policy.in Makefile
+src/%.policy.in: src/%.policy.in.in Makefile
$(SED_PROCESS)
src/%.rules: src/%.rules.in Makefile
@@ -1383,8 +1391,8 @@ CLEANFILES = \
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA) \
- $(polkitpolicy_DATA) \
- src/org.freedesktop.systemd1.policy
+ $(nodist_polkitpolicy_DATA) \
+ src/73-seat-late.rules
if HAVE_VALAC
CLEANFILES += \
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..192f3b6
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,19 @@
+src/dbus-automount.c
+src/dbus-device.c
+src/dbus-job.c
+src/dbus-manager.c
+src/dbus-mount.c
+src/dbus-path.c
+src/dbus-service.c
+src/dbus-snapshot.c
+src/dbus-socket.c
+src/dbus-swap.c
+src/dbus-target.c
+src/dbus-timer.c
+src/dbus-unit.c
+src/hostnamed.c
+src/localed.c
+src/org.freedesktop.systemd1.policy.in.in
+src/timedated.c
+units/systemd-readahead-done.service.in
+units/user at .service.in
diff --git a/src/.gitignore b/src/.gitignore
index de3bb5f..8832dd6 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,7 @@
+org.freedesktop.hostname1.policy
+org.freedesktop.locale1.policy
+org.freedesktop.login1.policy
+org.freedesktop.timedate1.policy
org.freedesktop.systemd1.policy
gnome-ask-password-agent.c
systemd-interfaces.c
diff --git a/src/org.freedesktop.systemd1.policy.in b/src/org.freedesktop.systemd1.policy.in
deleted file mode 100644
index 52a28d4..0000000
--- a/src/org.freedesktop.systemd1.policy.in
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-
-<!--
- This file is part of systemd.
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
--->
-
-<policyconfig>
-
- <vendor>The systemd Project</vendor>
- <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
-
- <action id="org.freedesktop.systemd1.reply-password">
- <description>Send passphrase back to system</description>
- <message>Authentication is required to send the entered passphrase back to the system.</message>
- <defaults>
- <allow_any>no</allow_any>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.exec.path">@rootlibexecdir@/systemd-reply-password</annotate>
- </action>
-
- <action id="org.freedesktop.systemd1.bus-access">
- <description>Privileged system and service manager access</description>
- <message>Authentication is required to access the system and service manager.</message>
- <defaults>
- <allow_any>no</allow_any>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.exec.path">@bindir@/systemd-stdio-bridge</annotate>
- </action>
-
-</policyconfig>
diff --git a/src/org.freedesktop.systemd1.policy.in.in b/src/org.freedesktop.systemd1.policy.in.in
new file mode 100644
index 0000000..1771314
--- /dev/null
+++ b/src/org.freedesktop.systemd1.policy.in.in
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?> <!--*-nxml-*-->
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<!--
+ This file is part of systemd.
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+-->
+
+<policyconfig>
+
+ <vendor>The systemd Project</vendor>
+ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
+
+ <action id="org.freedesktop.systemd1.reply-password">
+ <_description>Send passphrase back to system</_description>
+ <_message>Authentication is required to send the entered passphrase back to the system.</_message>
+ <defaults>
+ <allow_any>no</allow_any>
+ <allow_inactive>no</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">@rootlibexecdir@/systemd-reply-password</annotate>
+ </action>
+
+ <action id="org.freedesktop.systemd1.bus-access">
+ <_description>Privileged system and service manager access</_description>
+ <_message>Authentication is required to access the system and service manager.</_message>
+ <defaults>
+ <allow_any>no</allow_any>
+ <allow_inactive>no</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">@bindir@/systemd-stdio-bridge</annotate>
+ </action>
+
+</policyconfig>
commit 7a41c61168632501489a4d054619b86f529a02e7
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jul 12 00:47:50 2011 +0200
build-sys: add a number of missing header files to EXTRA_DIST
diff --git a/Makefile.am b/Makefile.am
index 3ca0b80..96e8838 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -608,7 +608,17 @@ EXTRA_DIST += \
src/shutdownd.h \
src/umount.h \
src/readahead-common.h \
- src/ask-password-api.h
+ src/ask-password-api.h \
+ src/pager.h \
+ src/sysfs-show.h \
+ src/polkit.h \
+ src/logind.h \
+ src/logind-device.h \
+ src/logind-seat.h \
+ src/logind-session.h \
+ src/logind-user.h \
+ src/logind-acl.h \
+ src/dbus-loop.h
MANPAGES = \
man/systemd.1 \
diff --git a/TODO b/TODO
index afd83b8..cdb295d 100644
--- a/TODO
+++ b/TODO
@@ -20,6 +20,10 @@ F15 External:
Features:
+* add conditions for file executability
+
+* allow creating fifos with tmpfiles
+
* implement Register= switch in .socket units to enable registration
in Avahi, RPC and other socket registration services.
More information about the systemd-commits
mailing list