[pulseaudio-commits] 3 commits - configure.ac doxygen/.gitignore .gitignore man/.gitignore po/.gitignore src/daemon src/.gitignore src/modules src/pulse src/pulsecore src/tests src/utils
Lennart Poettering
lennart at kemper.freedesktop.org
Tue May 15 05:18:31 PDT 2012
.gitignore | 4 ++--
configure.ac | 4 ++--
doxygen/.gitignore | 6 ++++--
man/.gitignore | 10 ++++++----
po/.gitignore | 30 ++++++++++++++++--------------
src/.gitignore | 4 ++--
src/daemon/Makefile | 1 +
src/modules/Makefile | 7 +++++++
src/pulse/Makefile | 1 +
src/pulsecore/Makefile | 1 +
src/pulsecore/core-util.c | 8 ++++----
src/tests/Makefile | 1 +
src/utils/Makefile | 1 +
13 files changed, 48 insertions(+), 30 deletions(-)
New commits:
commit 08d4f8e2c3b319943b6a3a3ac3072752e8c7786b
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue May 15 14:17:58 2012 +0200
build-sys: readd stub makefiles to subdirectories to make building with emacs easier
diff --git a/.gitignore b/.gitignore
index 9290ad2..0635e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,8 @@ intltool-update.in
*.pc
PulseAudioConfig.cmake
PulseAudioConfigVersion.cmake
-Makefile
-Makefile.in
+/Makefile
+/Makefile.in
aclocal.m4
autom4te.cache
compile
diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a709d16..189d6c7 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -1,2 +1,4 @@
-doxygen.conf
-html
+/doxygen.conf
+/html/
+/Makefile
+/Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
index c213238..abf96d9 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,4 +1,6 @@
-*.1
-*.1.xml
-*.5
-*.5.xml
+/*.1
+/*.1.xml
+/*.5
+/*.5.xml
+/Makefile
+/Makefile.in
diff --git a/po/.gitignore b/po/.gitignore
index d212a2a..1ebb427 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,14 +1,16 @@
-.intltool-merge-cache
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-boldquot.sed
-en at boldquot.header
-en at quot.header
-insert-header.sin
-pulseaudio.pot
-quot.sed
-remove-potcdate.sin
-*.mo
-*.gmo
+/.intltool-merge-cache
+/Makefile.in.in
+/Makevars.template
+/POTFILES
+/Rules-quot
+/boldquot.sed
+/en at boldquot.header
+/en at quot.header
+/insert-header.sin
+/pulseaudio.pot
+/quot.sed
+/remove-potcdate.sin
+/*.mo
+/*.gmo
+/Makefile
+/Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
index f77749b..83c18d3 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,8 +4,8 @@ TAGS
*.la
.deps
.libs
-Makefile
-Makefile.in
+/Makefile
+/Makefile.in
proximity-helper
client.conf
daemon.conf
diff --git a/src/daemon/Makefile b/src/daemon/Makefile
new file mode 120000
index 0000000..f5b1dba
--- /dev/null
+++ b/src/daemon/Makefile
@@ -0,0 +1 @@
+../modules/Makefile
\ No newline at end of file
diff --git a/src/modules/Makefile b/src/modules/Makefile
new file mode 100644
index 0000000..5332f25
--- /dev/null
+++ b/src/modules/Makefile
@@ -0,0 +1,7 @@
+all:
+ $(MAKE) -C ..
+
+clean:
+ $(MAKE) -C .. clean
+
+.PHONY: all clean
diff --git a/src/pulse/Makefile b/src/pulse/Makefile
new file mode 120000
index 0000000..f5b1dba
--- /dev/null
+++ b/src/pulse/Makefile
@@ -0,0 +1 @@
+../modules/Makefile
\ No newline at end of file
diff --git a/src/pulsecore/Makefile b/src/pulsecore/Makefile
new file mode 120000
index 0000000..f5b1dba
--- /dev/null
+++ b/src/pulsecore/Makefile
@@ -0,0 +1 @@
+../modules/Makefile
\ No newline at end of file
diff --git a/src/tests/Makefile b/src/tests/Makefile
new file mode 120000
index 0000000..f5b1dba
--- /dev/null
+++ b/src/tests/Makefile
@@ -0,0 +1 @@
+../modules/Makefile
\ No newline at end of file
diff --git a/src/utils/Makefile b/src/utils/Makefile
new file mode 120000
index 0000000..f5b1dba
--- /dev/null
+++ b/src/utils/Makefile
@@ -0,0 +1 @@
+../modules/Makefile
\ No newline at end of file
commit bea524cb7aafad1be122f0a4b580ae3df9dc1d40
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue May 15 14:12:38 2012 +0200
util: use the return value of gethosid() as fallback, not the address of the function
Yikes!
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index fe68965..d896061 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -2749,7 +2749,7 @@ char *pa_machine_id(void) {
#ifndef OS_IS_WIN32
/* If no hostname was set we use the POSIX hostid. It's usually
* the IPv4 address. Might not be that stable. */
- return pa_sprintf_malloc("%08lx", (unsigned long) gethostid);
+ return pa_sprintf_malloc("%08lx", (unsigned long) gethostid());
#else
return NULL;
#endif
commit 10f146ddc889c2300d69198eeedb1672b7f87022
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue May 15 14:10:34 2012 +0200
util: /etc/machine-id should be tried first, the D-Bus only as fallback for legacy systems
diff --git a/configure.ac b/configure.ac
index 1936d7c..8f680a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -945,9 +945,9 @@ AC_SUBST(HAVE_DBUS)
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
-PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
+PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
-PA_MACHINE_ID_FALLBACK="${sysconfdir}/machine-id"
+PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 2900e3c..fe68965 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -2726,9 +2726,9 @@ char *pa_machine_id(void) {
/* The returned value is supposed be some kind of ascii identifier
* that is unique and stable across reboots. */
- /* First we try the D-Bus UUID, which is the best option we have,
- * since it fits perfectly our needs and is not as volatile as the
- * hostname which might be set from dhcp. */
+ /* First we try the /etc/machine-id, which is the best option we
+ * have, since it fits perfectly our needs and is not as volatile
+ * as the hostname which might be set from dhcp. */
if ((f = pa_fopen_cloexec(PA_MACHINE_ID, "r")) ||
(f = pa_fopen_cloexec(PA_MACHINE_ID_FALLBACK, "r"))) {
More information about the pulseaudio-commits
mailing list