[systemd-commits] 3 commits - Makefile.am libsystemd-daemon.pc.in libsystemd-id128.pc.in src/journal src/libsystemd-daemon.pc.in src/libsystemd-id128.pc.in src/libsystemd-id128.sym src/sd-id128.c src/systemd src/systemd.pc.in systemd.pc.in
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Jan 6 16:38:04 PST 2012
Makefile.am | 12 ++++++------
libsystemd-daemon.pc.in | 19 -------------------
libsystemd-id128.pc.in | 18 ------------------
src/journal/journalctl.c | 18 +++++++++---------
src/libsystemd-daemon.pc.in | 19 +++++++++++++++++++
src/libsystemd-id128.pc.in | 18 ++++++++++++++++++
src/libsystemd-id128.sym | 1 -
src/sd-id128.c | 4 ++--
src/systemd.pc.in | 20 ++++++++++++++++++++
src/systemd/sd-id128.h | 2 --
systemd.pc.in | 20 --------------------
11 files changed, 74 insertions(+), 77 deletions(-)
New commits:
commit e4bac488f9eee315c86ff2f6d15341be58a87a8a
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat Jan 7 01:37:39 2012 +0100
sd-id128: let's make our API a bit smaller, since sd_id128_make_v4_uuid() is dispensable
diff --git a/src/libsystemd-id128.sym b/src/libsystemd-id128.sym
index c4d1cf5..2373fe6 100644
--- a/src/libsystemd-id128.sym
+++ b/src/libsystemd-id128.sym
@@ -14,7 +14,6 @@ global:
sd_id128_to_string;
sd_id128_from_string;
sd_id128_randomize;
- sd_id128_make_v4_uuid;
sd_id128_get_machine;
sd_id128_get_boot;
local:
diff --git a/src/sd-id128.c b/src/sd-id128.c
index 289bcdc..b4184e1 100644
--- a/src/sd-id128.c
+++ b/src/sd-id128.c
@@ -74,7 +74,7 @@ _public_ int sd_id128_from_string(const char s[33], sd_id128_t *ret) {
return 0;
}
-_public_ sd_id128_t sd_id128_make_v4_uuid(sd_id128_t id) {
+static sd_id128_t make_v4_uuid(sd_id128_t id) {
/* Stolen from generate_random_uuid() of drivers/char/random.c
* in the kernel sources */
@@ -216,6 +216,6 @@ _public_ int sd_id128_randomize(sd_id128_t *ret) {
* only guarantee this for newly generated UUIDs, not for
* pre-existing ones.*/
- *ret = sd_id128_make_v4_uuid(t);
+ *ret = make_v4_uuid(t);
return 0;
}
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index d835cf4..22fcb93 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -39,8 +39,6 @@ int sd_id128_from_string(const char s[33], sd_id128_t *ret);
int sd_id128_randomize(sd_id128_t *ret);
-sd_id128_t sd_id128_make_v4_uuid(sd_id128_t id);
-
int sd_id128_get_machine(sd_id128_t *ret);
int sd_id128_get_boot(sd_id128_t *ret);
commit 39f7f5c108a55b8f6898154d4f7702a3443ac4d0
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat Jan 7 01:37:15 2012 +0100
journalctl: rename --new-id to --new-id128 in order not to introduce yet another new name
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 914dd8d..393601c 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -44,7 +44,7 @@ static bool arg_show_all = false;
static bool arg_no_pager = false;
static int arg_lines = -1;
static bool arg_no_tail = false;
-static bool arg_new_id = false;
+static bool arg_new_id128 = false;
static int help(void) {
@@ -58,7 +58,7 @@ static int help(void) {
" -n --lines=INTEGER Journal entries to show\n"
" --no-tail Show all lines, even in follow mode\n"
" -o --output=STRING Change journal output mode (short, verbose, export, json)\n"
- " --new-id Generate a new 128 Bit id\n",
+ " --new-id128 Generate a new 128 Bit id\n",
program_invocation_short_name);
return 0;
@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
ARG_NO_TAIL,
- ARG_NEW_ID
+ ARG_NEW_ID128
};
static const struct option options[] = {
@@ -82,7 +82,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "all", no_argument, NULL, 'a' },
{ "lines", required_argument, NULL, 'n' },
{ "no-tail", no_argument, NULL, ARG_NO_TAIL },
- { "new-id", no_argument, NULL, ARG_NEW_ID },
+ { "new-id128", no_argument, NULL, ARG_NEW_ID128 },
{ NULL, 0, NULL, 0 }
};
@@ -138,8 +138,8 @@ static int parse_argv(int argc, char *argv[]) {
arg_no_tail = true;
break;
- case ARG_NEW_ID:
- arg_new_id = true;
+ case ARG_NEW_ID128:
+ arg_new_id128 = true;
break;
case '?':
@@ -157,7 +157,7 @@ static int parse_argv(int argc, char *argv[]) {
return 1;
}
-static int generate_new_id(void) {
+static int generate_new_id128(void) {
sd_id128_t id;
int r;
unsigned i;
@@ -198,8 +198,8 @@ int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
- if (arg_new_id) {
- r = generate_new_id();
+ if (arg_new_id128) {
+ r = generate_new_id128();
goto finish;
}
commit dd338f01f545fd29777d7c1a53c7c658a409cda6
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat Jan 7 01:36:36 2012 +0100
build-sys: move .pc files next to the matching sources
diff --git a/Makefile.am b/Makefile.am
index 2a7a38b..f5cef3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -366,7 +366,7 @@ EXTRA_DIST += \
units/fsck at .service.in \
units/fsck-root.service.in \
units/user at .service.in \
- systemd.pc.in \
+ src/systemd.pc.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
@@ -437,7 +437,7 @@ dist_doc_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
- systemd.pc
+ src/systemd.pc
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
@@ -1115,7 +1115,7 @@ lib_LTLIBRARIES += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
- libsystemd-daemon.pc
+ src/libsystemd-daemon.pc
MANPAGES += \
man/sd-daemon.7 \
@@ -1138,7 +1138,7 @@ man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
- libsystemd-daemon.pc.in \
+ src/libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
@@ -1174,7 +1174,7 @@ lib_LTLIBRARIES += \
libsystemd-id128.la
pkgconfiglib_DATA += \
- libsystemd-id128.pc
+ src/libsystemd-id128.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
@@ -1196,7 +1196,7 @@ UNINSTALL_EXEC_HOOKS += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
- libsystemd-id128.pc.in \
+ src/libsystemd-id128.pc.in \
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
diff --git a/libsystemd-daemon.pc.in b/libsystemd-daemon.pc.in
deleted file mode 100644
index 8bb3a74..0000000
--- a/libsystemd-daemon.pc.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: systemd
-Description: systemd Daemon Utility Library
-URL: @PACKAGE_URL@
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lsystemd-daemon
-Cflags: -I${includedir}
diff --git a/libsystemd-id128.pc.in b/libsystemd-id128.pc.in
deleted file mode 100644
index 4d984fd..0000000
--- a/libsystemd-id128.pc.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: systemd
-Description: systemd 128 Bit ID Utility Library
-URL: @PACKAGE_URL@
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lsystemd-id128
-Cflags: -I${includedir}
diff --git a/src/libsystemd-daemon.pc.in b/src/libsystemd-daemon.pc.in
new file mode 100644
index 0000000..8bb3a74
--- /dev/null
+++ b/src/libsystemd-daemon.pc.in
@@ -0,0 +1,19 @@
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: systemd
+Description: systemd Daemon Utility Library
+URL: @PACKAGE_URL@
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lsystemd-daemon
+Cflags: -I${includedir}
diff --git a/src/libsystemd-id128.pc.in b/src/libsystemd-id128.pc.in
new file mode 100644
index 0000000..4d984fd
--- /dev/null
+++ b/src/libsystemd-id128.pc.in
@@ -0,0 +1,18 @@
+# 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.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: systemd
+Description: systemd 128 Bit ID Utility Library
+URL: @PACKAGE_URL@
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lsystemd-id128
+Cflags: -I${includedir}
diff --git a/src/systemd.pc.in b/src/systemd.pc.in
new file mode 100644
index 0000000..29376e5
--- /dev/null
+++ b/src/systemd.pc.in
@@ -0,0 +1,20 @@
+# 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.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+systemdsystemunitdir=@systemunitdir@
+systemduserunitdir=@userunitdir@
+systemdsystemconfdir=@pkgsysconfdir@/system
+systemduserconfdir=@pkgsysconfdir@/user
+systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir}
+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir}
+
+Name: systemd
+Description: systemd System and Service Manager
+URL: @PACKAGE_URL@
+Version: @PACKAGE_VERSION@
diff --git a/systemd.pc.in b/systemd.pc.in
deleted file mode 100644
index 29376e5..0000000
--- a/systemd.pc.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-systemdsystemunitdir=@systemunitdir@
-systemduserunitdir=@userunitdir@
-systemdsystemconfdir=@pkgsysconfdir@/system
-systemduserconfdir=@pkgsysconfdir@/user
-systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir}
-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir}
-
-Name: systemd
-Description: systemd System and Service Manager
-URL: @PACKAGE_URL@
-Version: @PACKAGE_VERSION@
More information about the systemd-commits
mailing list