[systemd-commits] 3 commits - Makefile.am shell-completion/zsh src/core
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Sat Aug 3 07:25:42 PDT 2013
Makefile.am | 22 +++++++++++++++++-----
shell-completion/zsh/_kernel-install | 26 ++++++++++++++++++++++++++
src/core/systemd.pc.in | 3 +++
3 files changed, 46 insertions(+), 5 deletions(-)
New commits:
commit 692ec7c998d5f889376686e4d83b696f1712e13e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Sat Aug 3 10:18:21 2013 -0400
build-sys: link with librt if linking with libsd-daemon-int
In fba1ea0 'build: do not link everything with -lrt (and
therefore -pthread)' librt was removed from the list of
libraries. But libsd-daemon-internal also uses symbols from
librt and librt must thus be added everywhere where
libsd-daemon-interal is used, or otherwise linking might
fail:
/usr/bin/ld: ./.libs/libudev-core.a(sd-daemon.o): undefined reference to symbol 'mq_getattr@@GLIBC_2.3.4'
/usr/bin/ld: note: 'mq_getattr@@GLIBC_2.3.4' is defined in DSO /lib64/librt.so.1 so try adding it to the linker command line
diff --git a/Makefile.am b/Makefile.am
index b9c2835..b8b8d06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2090,6 +2090,7 @@ libudev_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-id128-internal.la
pkgconfiglib_DATA += \
@@ -2261,6 +2262,7 @@ libudev_core_la_LIBADD = \
libudev-private.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@ -2647,7 +2649,8 @@ libsystemd_id128_la_LDFLAGS = \
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
@@ -2800,6 +2803,7 @@ test_journal_init_SOURCES = \
test_journal_init_LDADD = \
libsystemd-shared.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-journal.la
test_journal_verify_SOURCES = \
@@ -2866,6 +2870,7 @@ libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
@@ -3815,7 +3820,8 @@ libsystemd_login_la_LDFLAGS = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
libsystemd_login_internal_la_SOURCES = \
$(libsystemd_login_la_SOURCES)
@@ -3843,6 +3849,7 @@ pam_systemd_la_LIBADD = \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
@@ -4027,7 +4034,8 @@ _reader_la_LIBADD = \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
login_la_SOURCES = \
src/python-systemd/login.c \
@@ -4050,7 +4058,8 @@ login_la_LIBADD = \
libsystemd-journal.la \
libsystemd-login.la \
libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
commit 7eb942c4086c563ca08f1b94c974d896eedb2e64
Author: Daniel Wallace <danielwallace at gtmanfred.com>
Date: Fri Aug 2 21:38:14 2013 -0500
zsh completion: add _kernel-install
diff --git a/Makefile.am b/Makefile.am
index 1d7abfd..b9c2835 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -347,6 +347,7 @@ dist_zshcompletion_DATA = \
shell-completion/zsh/_systemctl \
shell-completion/zsh/_journalctl \
shell-completion/zsh/_udevadm \
+ shell-completion/zsh/_kernel-install \
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_systemd
diff --git a/shell-completion/zsh/_kernel-install b/shell-completion/zsh/_kernel-install
new file mode 100644
index 0000000..0655188
--- /dev/null
+++ b/shell-completion/zsh/_kernel-install
@@ -0,0 +1,26 @@
+#compdef kernel-install
+
+_images(){
+ if [[ "$words[2]" == "remove" ]]; then
+ _message 'No more options'
+ else
+ _path_files -W /boot/ -P /boot/ -g "vmlinuz-*"
+ fi
+}
+
+_kernels(){
+ read _MACHINE_ID < /etc/machine-id
+ _kernel=( /lib/modules/[0-9]* )
+ if [[ "$cmd" == "remove" && -n "$_MACHINE_ID" ]]; then
+ _kernel=( /lib/modules/[0-9]* "/boot/$_MACHINE_ID"/[0-9]* )
+ fi
+ _kernel=( ${_kernel##*/} )
+ _describe "installed kernels" _kernel
+}
+
+_arguments \
+ '1::add or remove:(add remove)' \
+ '2::kernel versions:_kernels' \
+ '3::kernel images:_images'
+
+#vim: set ft=zsh sw=4 ts=4 et
commit d267e69da42f51ed0b34b59c0e3bc988127b95a5
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Aug 1 22:58:03 2013 -0400
pkg-config: export systemd{system,user}generatordir and catalogdir
We export the location of a bunch of directories this way,
so it makes sense to add those three. Especially catalogdir
is something that we want people to add things to.
Note on the naming: the first two are tied closely to systemd
itself, so I prefixed them with "systemd". The third one is
rather more generic, so no prefix.
https://bugs.freedesktop.org/show_bug.cgi?id=67635
diff --git a/Makefile.am b/Makefile.am
index 8e64aaa..1d7abfd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,9 +82,9 @@ userunitdir=$(prefix)/lib/systemd/user
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(prefix)/lib/systemd/user-generators
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
@@ -4106,6 +4106,8 @@ substitutions = \
'|catalogdir=$(catalogdir)|' \
'|tmpfilesdir=$(tmpfilesdir)|' \
'|sysctldir=$(sysctldir)|' \
+ '|systemgeneratordir=$(systemgeneratordir)|' \
+ '|usergeneratordir=$(usergeneratordir)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index 2f49d5d..de0f649 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -16,6 +16,9 @@ systemdsystemconfdir=@pkgsysconfdir@/system
systemduserconfdir=@pkgsysconfdir@/user
systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system
systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
+systemdsystemgeneratordir=@systemgeneratordir@
+systemdusergeneratordir=@usergeneratordir@
+catalogdir=@catalogdir@
Name: systemd
Description: systemd System and Service Manager
More information about the systemd-commits
mailing list