diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-10-17 13:21:57 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-26 14:13:10 +0100 |
commit | 59664648c7ed79d98b98d950930d207a7bb9293f (patch) | |
tree | a2e53d415b1e74fa337c2fca698eb39a540401b0 | |
parent | 241027b4a9ba9e0660db8b94310d5e139b35b8cd (diff) | |
download | ptxdist-59664648c7ed79d98b98d950930d207a7bb9293f.tar.gz ptxdist-59664648c7ed79d98b98d950930d207a7bb9293f.tar.xz |
[dbus] use automatic autogen instead of autogen patch
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r-- | patches/dbus-1.2.14/0003-hand-picked-autoreconf.patch | 40 | ||||
l--------- | patches/dbus-1.2.14/autogen.sh | 1 | ||||
-rw-r--r-- | patches/dbus-1.2.14/series | 1 |
3 files changed, 1 insertions, 41 deletions
diff --git a/patches/dbus-1.2.14/0003-hand-picked-autoreconf.patch b/patches/dbus-1.2.14/0003-hand-picked-autoreconf.patch deleted file mode 100644 index 1342c6bad..000000000 --- a/patches/dbus-1.2.14/0003-hand-picked-autoreconf.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8781754fd9f4305b02794eaa2810803adbd37364 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Sun, 31 May 2009 09:44:27 +0200 -Subject: [PATCH 3/3] hand picked autoreconf - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - dbus/Makefile.in | 2 +- - tools/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dbus/Makefile.in b/dbus/Makefile.in -index e02c910..aaab7fd 100644 ---- a/dbus/Makefile.in -+++ b/dbus/Makefile.in -@@ -308,7 +308,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - configdir = $(sysconfdir)/dbus-1 - INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION \ -- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ -+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" - -diff --git a/tools/Makefile.in b/tools/Makefile.in -index 479fd3e..b638e15 100644 ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -299,7 +299,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - configdir = $(sysconfdir)/dbus-1 --INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" -+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" - dbus_send_SOURCES = \ - dbus-print-message.c \ - dbus-print-message.h \ --- -1.6.3.1 - diff --git a/patches/dbus-1.2.14/autogen.sh b/patches/dbus-1.2.14/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/dbus-1.2.14/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/dbus-1.2.14/series b/patches/dbus-1.2.14/series index ba1388e9d..430010de0 100644 --- a/patches/dbus-1.2.14/series +++ b/patches/dbus-1.2.14/series @@ -1,3 +1,2 @@ 0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch 0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch -0003-hand-picked-autoreconf.patch |