* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-01-15 16:02 aldot at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: aldot at uclibc.org @ 2007-01-15 16:02 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-01-15 08:02:45 -0800 (Mon, 15 Jan 2007)
New Revision: 17313
Log:
- ignore error if var/run/dbus already exists. Thanks whirm for noticing
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-01-15 16:01:34 UTC (rev 17312)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-01-15 16:02:45 UTC (rev 17313)
@@ -58,7 +58,7 @@
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
- mkdir $(TARGET_DIR)/var/run/dbus
+ -mkdir $(TARGET_DIR)/var/run/dbus
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install
rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/dbus-1.0
rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-07-08 13:20 aldot at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 13:20 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 06:20:46 -0700 (Sun, 08 Jul 2007)
New Revision: 19036
Log:
- fix looking for libexpat.so in wrong place (Cristian Ionescu-Idbohrn)
- bump version
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-07-08 13:13:29 UTC (rev 19035)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-07-08 13:20:46 UTC (rev 19036)
@@ -3,7 +3,7 @@
# dbus
#
#############################################################
-DBUS_VER:=1.0.0
+DBUS_VER:=1.1.1
DBUS_SOURCE:=dbus-$(DBUS_VER).tar.gz
DBUS_SITE:=http://dbus.freedesktop.org/releases/dbus/
DBUS_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VER)
@@ -18,7 +18,7 @@
$(DBUS_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
$(DBUS_CAT) $(DL_DIR)/$(DBUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(DBUS_DIR)/.unpacked
+ touch $@
$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
(cd $(DBUS_DIR); rm -rf config.cache; \
@@ -48,10 +48,10 @@
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-system-pid-file=/var/run/messagebus.pid \
);
- touch $(DBUS_DIR)/.configured
+ touch $@
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
- $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/lib/libexpat.so" -C $(DBUS_DIR) all
+ $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_DIR) all
$(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
@@ -59,15 +59,15 @@
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
-mkdir $(TARGET_DIR)/var/run/dbus
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install
- rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/dbus-1.0
- rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la
- rm -f $(TARGET_DIR)/usr/lib/libdbus-1.so
+ rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
+ rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \
+ $(TARGET_DIR)/usr/lib/libdbus-1.so
-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0
$(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install
$(INSTALL) -m 0755 -D package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
rm -f $(TARGET_DIR)/etc/init.d/messagebus
rm -rf $(TARGET_DIR)/usr/man
- rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
+ -rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
rm -rf $(TARGET_DIR)/etc/rc.d
dbus: uclibc expat $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-07-17 15:19 ulf at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ulf at uclibc.org @ 2007-07-17 15:19 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-17 08:19:18 -0700 (Tue, 17 Jul 2007)
New Revision: 19136
Log:
Make dbus depend on libxml2 and link with lib
Modified:
trunk/buildroot/package/dbus/Config.in
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/Config.in
===================================================================
--- trunk/buildroot/package/dbus/Config.in 2007-07-17 15:17:42 UTC (rev 19135)
+++ trunk/buildroot/package/dbus/Config.in 2007-07-17 15:19:18 UTC (rev 19136)
@@ -2,6 +2,7 @@
bool "dbus"
default n
select BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_LIBXML2
help
The D-Bus message bus system.
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-07-17 15:17:42 UTC (rev 19135)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-07-17 15:19:18 UTC (rev 19136)
@@ -51,7 +51,7 @@
touch $@
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
- $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_DIR) all
+ $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so $(STAGING_DIR)/usr/lib/libxml2.so" -C $(DBUS_DIR) all
$(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
@@ -70,7 +70,7 @@
-rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
rm -rf $(TARGET_DIR)/etc/rc.d
-dbus: uclibc expat $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc expat libxml2-headers $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-08-21 12:09 aldot at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: aldot at uclibc.org @ 2007-08-21 12:09 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-21 05:09:53 -0700 (Tue, 21 Aug 2007)
New Revision: 19613
Log:
- fix installation of dbus.
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-08-21 11:25:30 UTC (rev 19612)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-08-21 12:09:53 UTC (rev 19613)
@@ -57,14 +57,14 @@
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
- -mkdir $(TARGET_DIR)/var/run/dbus
+ -mkdir $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \
$(TARGET_DIR)/usr/lib/libdbus-1.so
-$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0
$(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install
- $(INSTALL) -m 0755 -D package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
+ $(INSTALL) -m 0755 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
rm -f $(TARGET_DIR)/etc/init.d/messagebus
rm -rf $(TARGET_DIR)/usr/man
-rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-22 17:12 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-22 17:12 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-22 09:12:19 -0800 (Thu, 22 Nov 2007)
New Revision: 20476
Log:
Make XML library used by D-Bus selectable instead of requiring both Expat
and libxml2.
Modified:
trunk/buildroot/package/dbus/Config.in
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/Config.in
===================================================================
--- trunk/buildroot/package/dbus/Config.in 2007-11-22 17:05:28 UTC (rev 20475)
+++ trunk/buildroot/package/dbus/Config.in 2007-11-22 17:12:19 UTC (rev 20476)
@@ -1,9 +1,27 @@
config BR2_PACKAGE_DBUS
bool "dbus"
default n
- select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_LIBXML2
help
The D-Bus message bus system.
http://www.freedesktop.org/wiki/Software/dbus
+
+choice
+ prompt "XML library to use"
+ depends BR2_PACKAGE_DBUS
+ default BR2_DBUS_LIBXML2 if BR2_PACKAGE_LIBXML2
+ default BR2_DBUS_EXPAT
+ help
+ Select the XML library to use with D-Bus. Select Expat
+ unless you have specific reasons for using libxml2 as
+ Expat is significant smaller.
+
+ config BR2_DBUS_EXPAT
+ bool "Expat"
+ select BR2_PACKAGE_EXPAT
+
+ config BR2_DBUS_LIBXML2
+ bool "libxml2"
+ select BR2_PACKAGE_LIBXML2
+
+endchoice
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-22 17:05:28 UTC (rev 20475)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-22 17:12:19 UTC (rev 20476)
@@ -11,6 +11,14 @@
DBUS_BINARY:=bus/dbus-daemon
DBUS_TARGET_BINARY:=usr/bin/dbus-daemon
+ifeq ($(strip $(BR2_DBUS_EXPAT)),y)
+DBUS_XML:=expat
+DBUS_XML_DEP:=expat
+else
+DBUS_XML:=libxml
+DBUS_XML_DEP:=libxml2-headers
+endif
+
$(DL_DIR)/$(DBUS_SOURCE):
$(WGET) -P $(DL_DIR) $(DBUS_SITE)/$(DBUS_SOURCE)
@@ -44,14 +52,14 @@
--disable-static \
--enable-dnotify \
--without-x \
- --without-xml \
+ --with-xml=$(DBUS_XML) \
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-system-pid-file=/var/run/messagebus.pid \
)
touch $@
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
- $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so $(STAGING_DIR)/usr/lib/libxml2.so" -C $(DBUS_DIR) all
+ $(MAKE) -C $(DBUS_DIR) all
$(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
@@ -70,7 +78,7 @@
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
rm -rf $(TARGET_DIR)/etc/rc.d
-dbus: uclibc expat libxml2-headers $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-23 9:46 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 9:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 01:46:42 -0800 (Fri, 23 Nov 2007)
New Revision: 20490
Log:
soname changed
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-23 09:27:05 UTC (rev 20489)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-23 09:46:42 UTC (rev 20490)
@@ -70,7 +70,7 @@
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \
$(TARGET_DIR)/usr/lib/libdbus-1.so
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.3.0
$(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install
$(INSTALL) -m 0755 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
rm -f $(TARGET_DIR)/etc/init.d/messagebus
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-23 10:00 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 10:00 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 02:00:07 -0800 (Fri, 23 Nov 2007)
New Revision: 20491
Log:
Use BR2_HAVE_MANPAGES
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-23 09:46:42 UTC (rev 20490)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-23 10:00:07 UTC (rev 20491)
@@ -74,7 +74,9 @@
$(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install
$(INSTALL) -m 0755 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
rm -f $(TARGET_DIR)/etc/init.d/messagebus
+ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
+endif
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
rm -rf $(TARGET_DIR)/etc/rc.d
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-23 11:43 jacmet at uclibc.org
2007-11-23 12:50 ` Ivan Kuten
0 siblings, 1 reply; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 11:43 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 03:42:59 -0800 (Fri, 23 Nov 2007)
New Revision: 20494
Log:
Fix target install, install helper programs as well as strip executables
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-23 11:25:13 UTC (rev 20493)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-23 11:42:59 UTC (rev 20494)
@@ -66,19 +66,17 @@
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install
- rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
- rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \
- $(TARGET_DIR)/usr/lib/libdbus-1.so
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.3.0
- $(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install
+ $(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIP)' \
+ initdir=/etc/init.d -C $(DBUS_DIR)/dbus install-strip
+ rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
+ $(TARGET_DIR)/usr/lib/libdbus-1.la \
+ $(TARGET_DIR)/usr/include/dbus-1.0 \
+ $(TARGET_DIR)/usr/lib/pkgconfig
$(INSTALL) -m 0755 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
rm -f $(TARGET_DIR)/etc/init.d/messagebus
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
endif
- rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
- rm -rf $(TARGET_DIR)/etc/rc.d
dbus: uclibc $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-23 11:44 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 11:44 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 03:44:00 -0800 (Fri, 23 Nov 2007)
New Revision: 20495
Log:
Do a full install to staging_dir so pkgconfig files also gets installed
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-23 11:42:59 UTC (rev 20494)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-23 11:44:00 UTC (rev 20495)
@@ -62,7 +62,7 @@
$(MAKE) -C $(DBUS_DIR) all
$(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2007-11-23 12:50 ` Ivan Kuten
@ 2007-11-23 12:33 ` Peter Korsgaard
0 siblings, 0 replies; 44+ messages in thread
From: Peter Korsgaard @ 2007-11-23 12:33 UTC (permalink / raw)
To: buildroot
>>>>> "Ivan" == Ivan Kuten <ivan.kuten@promwad.com> writes:
Hi,
Ivan> Are you sure that you need to remove $(TARGET_DIR)/usr/lib/pkgconfig
Ivan> there could be other *.pc as well?
That shouldn't happend, and as we don't support pkgconfig on the
target it wouldn't be of any use anyway.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2007-11-23 11:43 jacmet at uclibc.org
@ 2007-11-23 12:50 ` Ivan Kuten
2007-11-23 12:33 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: Ivan Kuten @ 2007-11-23 12:50 UTC (permalink / raw)
To: buildroot
jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2007-11-23 03:42:59 -0800 (Fri, 23 Nov 2007)
> New Revision: 20494
>
> Log:
> Fix target install, install helper programs as well as strip executables
>
> + $(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIP)' \
> + initdir=/etc/init.d -C $(DBUS_DIR)/dbus install-strip
> + rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
> + $(TARGET_DIR)/usr/lib/libdbus-1.la \
> + $(TARGET_DIR)/usr/include/dbus-1.0 \
> + $(TARGET_DIR)/usr/lib/pkgconfig
Hi jacmet,
Are you sure that you need to remove $(TARGET_DIR)/usr/lib/pkgconfig
there could be other *.pc as well?
Regards,
Ivan
--------------------------------
Embedded Linux engineer,
Promwad Company: http://www.promwad.com/
Homepage : http://www.ivankuten.com/
--------------------------------
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-23 13:21 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 13:21 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 05:21:15 -0800 (Fri, 23 Nov 2007)
New Revision: 20498
Log:
Generate uuid at startup if needed
Modified:
trunk/buildroot/package/dbus/S97messagebus
Changeset:
Modified: trunk/buildroot/package/dbus/S97messagebus
===================================================================
--- trunk/buildroot/package/dbus/S97messagebus 2007-11-23 13:11:42 UTC (rev 20497)
+++ trunk/buildroot/package/dbus/S97messagebus 2007-11-23 13:21:15 UTC (rev 20498)
@@ -22,6 +22,7 @@
start() {
echo -n "Starting system message bus: "
+ dbus-uuidgen --ensure
dbus-daemon --system
RETVAL=$?
echo "done"
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-23 15:46 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 15:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 07:46:18 -0800 (Fri, 23 Nov 2007)
New Revision: 20504
Log:
Ups, STRIP is called STRIPCMD nowadays
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-23 15:45:30 UTC (rev 20503)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-23 15:46:18 UTC (rev 20504)
@@ -66,7 +66,7 @@
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d
- $(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIP)' \
+ $(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' \
initdir=/etc/init.d -C $(DBUS_DIR)/dbus install-strip
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
$(TARGET_DIR)/usr/lib/libdbus-1.la \
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-25 14:49 ulf at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ulf at uclibc.org @ 2007-11-25 14:49 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-25 06:49:45 -0800 (Sun, 25 Nov 2007)
New Revision: 20533
Log:
Fix dependency loop in dbus
Modified:
trunk/buildroot/package/dbus/Config.in
Changeset:
Modified: trunk/buildroot/package/dbus/Config.in
===================================================================
--- trunk/buildroot/package/dbus/Config.in 2007-11-25 12:53:25 UTC (rev 20532)
+++ trunk/buildroot/package/dbus/Config.in 2007-11-25 14:49:45 UTC (rev 20533)
@@ -1,11 +1,15 @@
config BR2_PACKAGE_DBUS
bool "dbus"
default n
+ depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
help
The D-Bus message bus system.
http://www.freedesktop.org/wiki/Software/dbus
+comment "dbus not available (need expat or libxml2)
+ depends on !BR2_PACKAGE_EXPAT && !BR2_PACKAGE_LIBXML2
+
choice
prompt "XML library to use"
depends BR2_PACKAGE_DBUS
@@ -17,11 +21,11 @@
Expat is significant smaller.
config BR2_DBUS_EXPAT
- bool "Expat"
- select BR2_PACKAGE_EXPAT
+ bool "Expat"
+ depends on BR2_PACKAGE_EXPAT
config BR2_DBUS_LIBXML2
- bool "libxml2"
- select BR2_PACKAGE_LIBXML2
+ bool "libxml2"
+ depends on BR2_PACKAGE_LIBXML2
endchoice
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-25 23:30 ulf at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ulf at uclibc.org @ 2007-11-25 23:30 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-25 15:30:29 -0800 (Sun, 25 Nov 2007)
New Revision: 20534
Log:
Fix syntax error in dbus
Modified:
trunk/buildroot/package/dbus/Config.in
Changeset:
Modified: trunk/buildroot/package/dbus/Config.in
===================================================================
--- trunk/buildroot/package/dbus/Config.in 2007-11-25 14:49:45 UTC (rev 20533)
+++ trunk/buildroot/package/dbus/Config.in 2007-11-25 23:30:29 UTC (rev 20534)
@@ -7,7 +7,7 @@
http://www.freedesktop.org/wiki/Software/dbus
-comment "dbus not available (need expat or libxml2)
+comment "dbus not available (need expat or libxml2)"
depends on !BR2_PACKAGE_EXPAT && !BR2_PACKAGE_LIBXML2
choice
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2007-11-26 15:47 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2007-11-26 15:47 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-26 07:47:41 -0800 (Mon, 26 Nov 2007)
New Revision: 20546
Log:
Really fix target install (typo in r20494)
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2007-11-26 15:39:02 UTC (rev 20545)
+++ trunk/buildroot/package/dbus/dbus.mk 2007-11-26 15:47:41 UTC (rev 20546)
@@ -67,7 +67,7 @@
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d
$(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' \
- initdir=/etc/init.d -C $(DBUS_DIR)/dbus install-strip
+ initdir=/etc/init.d -C $(DBUS_DIR) install-strip
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
$(TARGET_DIR)/usr/lib/libdbus-1.la \
$(TARGET_DIR)/usr/include/dbus-1.0 \
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-01-30 13:57 vanokuten at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: vanokuten at uclibc.org @ 2008-01-30 13:57 UTC (permalink / raw)
To: buildroot
Author: vanokuten
Date: 2008-01-30 05:57:31 -0800 (Wed, 30 Jan 2008)
New Revision: 20924
Log:
create /var/lib/dbus
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-01-29 10:33:34 UTC (rev 20923)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-01-30 13:57:31 UTC (rev 20924)
@@ -65,7 +65,7 @@
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
- mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d
+ mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
$(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' \
initdir=/etc/init.d -C $(DBUS_DIR) install-strip
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-03-04 12:19 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2008-03-04 12:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-04 04:19:13 -0800 (Tue, 04 Mar 2008)
New Revision: 21161
Log:
dbus: start earlier
Start dbus early enough so other services can use it (E.G. avahi).
Added:
trunk/buildroot/package/dbus/S30dbus
Removed:
trunk/buildroot/package/dbus/S97messagebus
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Copied: trunk/buildroot/package/dbus/S30dbus (from rev 21160, trunk/buildroot/package/dbus/S97messagebus)
===================================================================
--- trunk/buildroot/package/dbus/S30dbus (rev 0)
+++ trunk/buildroot/package/dbus/S30dbus 2008-03-04 12:19:13 UTC (rev 21161)
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# messagebus: The D-BUS systemwide message bus
+#
+# chkconfig: 345 97 03
+# description: This is a daemon which broadcasts notifications of system events \
+# and other messages. See http://www.freedesktop.org/software/dbus/
+#
+# processname: dbus-daemon
+# pidfile: /var/run/messagebus.pid
+#
+
+# Sanity checks.
+[ -x /usr/bin/dbus-daemon ] || exit 0
+
+# Create needed directories.
+[ -d /var/run/dbus ] || mkdir -p /var/run/dbus
+[ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
+
+RETVAL=0
+
+start() {
+ echo -n "Starting system message bus: "
+
+ dbus-uuidgen --ensure
+ dbus-daemon --system
+ RETVAL=$?
+ echo "done"
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dbus-daemon
+}
+
+stop() {
+ echo -n "Stopping system message bus: "
+
+ ## we don't want to kill all the per-user $processname, we want
+ ## to use the pid file *only*; because we use the fake nonexistent
+ ## program name "$servicename" that should be safe-ish
+ killall dbus-daemon
+ RETVAL=$?
+ echo "done"
+ if [ $RETVAL -eq 0 ]; then
+ rm -f /var/lock/subsys/dbus-daemon
+ rm -f /var/run/messagebus.pid
+ fi
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status $processname
+ RETVAL=$?
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ condrestart)
+ if [ -f /var/lock/subsys/$servicename ]; then
+ stop
+ start
+ fi
+ ;;
+ reload)
+ echo "Message bus can't reload its configuration, you have to restart it"
+ RETVAL=$?
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ ;;
+esac
+exit $RETVAL
Deleted: trunk/buildroot/package/dbus/S97messagebus
===================================================================
--- trunk/buildroot/package/dbus/S97messagebus 2008-03-04 11:36:25 UTC (rev 21160)
+++ trunk/buildroot/package/dbus/S97messagebus 2008-03-04 12:19:13 UTC (rev 21161)
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# messagebus: The D-BUS systemwide message bus
-#
-# chkconfig: 345 97 03
-# description: This is a daemon which broadcasts notifications of system events \
-# and other messages. See http://www.freedesktop.org/software/dbus/
-#
-# processname: dbus-daemon
-# pidfile: /var/run/messagebus.pid
-#
-
-# Sanity checks.
-[ -x /usr/bin/dbus-daemon ] || exit 0
-
-# Create needed directories.
-[ -d /var/run/dbus ] || mkdir -p /var/run/dbus
-[ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
-
-RETVAL=0
-
-start() {
- echo -n "Starting system message bus: "
-
- dbus-uuidgen --ensure
- dbus-daemon --system
- RETVAL=$?
- echo "done"
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dbus-daemon
-}
-
-stop() {
- echo -n "Stopping system message bus: "
-
- ## we don't want to kill all the per-user $processname, we want
- ## to use the pid file *only*; because we use the fake nonexistent
- ## program name "$servicename" that should be safe-ish
- killall dbus-daemon
- RETVAL=$?
- echo "done"
- if [ $RETVAL -eq 0 ]; then
- rm -f /var/lock/subsys/dbus-daemon
- rm -f /var/run/messagebus.pid
- fi
-}
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status $processname
- RETVAL=$?
- ;;
- restart)
- stop
- start
- ;;
- condrestart)
- if [ -f /var/lock/subsys/$servicename ]; then
- stop
- start
- fi
- ;;
- reload)
- echo "Message bus can't reload its configuration, you have to restart it"
- RETVAL=$?
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
- ;;
-esac
-exit $RETVAL
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-03-04 11:36:25 UTC (rev 21160)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-03-04 12:19:13 UTC (rev 21161)
@@ -72,7 +72,7 @@
$(TARGET_DIR)/usr/lib/libdbus-1.la \
$(TARGET_DIR)/usr/include/dbus-1.0 \
$(TARGET_DIR)/usr/lib/pkgconfig
- $(INSTALL) -m 0755 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d
+ $(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d
rm -f $(TARGET_DIR)/etc/init.d/messagebus
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
@@ -84,7 +84,7 @@
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
rm -f $(TARGET_DIR)/etc/dbus-1/system.conf
rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/etc/dbus-1/system.d
- rm -f $(TARGET_DIR)/etc/init.d/S97messagebus
+ rm -f $(TARGET_DIR)/etc/init.d/S30dbus
rm -f $(TARGET_DIR)/usr/lib/libdbus-1.so*
rm -f $(TARGET_DIR)/usr/bin/dbus-daemon
rm -rf $(TARGET_DIR)/tmp/dbus
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-03-06 18:46 ninevoltz at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:46 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:46:36 -0800 (Thu, 06 Mar 2008)
New Revision: 21249
Log:
fixed dbus makefile
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-03-06 18:40:08 UTC (rev 21248)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-03-06 18:46:36 UTC (rev 21249)
@@ -16,7 +16,7 @@
DBUS_XML_DEP:=expat
else
DBUS_XML:=libxml
-DBUS_XML_DEP:=libxml2-headers
+DBUS_XML_DEP:=libxml2
endif
$(DL_DIR)/$(DBUS_SOURCE):
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-03-12 14:51 ninevoltz at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-12 14:51 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-12 07:51:32 -0700 (Wed, 12 Mar 2008)
New Revision: 21317
Log:
fix dbus makefile to install with or without stripping
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-03-12 13:57:59 UTC (rev 21316)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-03-12 14:51:32 UTC (rev 21317)
@@ -66,8 +66,13 @@
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
+ifeq ($(BR2_STRIP_none),y)
+ $(MAKE) DESTDIR=$(TARGET_DIR) \
+ initdir=/etc/init.d -C $(DBUS_DIR) install
+else
$(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' \
initdir=/etc/init.d -C $(DBUS_DIR) install-strip
+endif
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
$(TARGET_DIR)/usr/lib/libdbus-1.la \
$(TARGET_DIR)/usr/include/dbus-1.0 \
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-03-31 19:36 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 19:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-31 12:36:08 -0700 (Mon, 31 Mar 2008)
New Revision: 21598
Log:
dbus: use dbus-daemon as target for staging_dir installation
Use dbus-daemon as target for staging_dir installation instead of
library, as that changes name with soname changes.
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-03-31 15:07:48 UTC (rev 21597)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-03-31 19:36:08 UTC (rev 21598)
@@ -61,10 +61,10 @@
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
$(MAKE) -C $(DBUS_DIR) all
-$(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY)
+$(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
-$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
+$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
ifeq ($(BR2_STRIP_none),y)
$(MAKE) DESTDIR=$(TARGET_DIR) \
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-04-06 13:33 ulf at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ulf at uclibc.org @ 2008-04-06 13:33 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-04-06 06:32:59 -0700 (Sun, 06 Apr 2008)
New Revision: 21656
Log:
Make sure XML deps are available before building dbus
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-04-06 13:14:07 UTC (rev 21655)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-04-06 13:32:59 UTC (rev 21656)
@@ -28,7 +28,7 @@
$(DBUS_CAT) $(DL_DIR)/$(DBUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
+$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
(cd $(DBUS_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-06-15 20:20 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2008-06-15 20:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-15 13:20:33 -0700 (Sun, 15 Jun 2008)
New Revision: 22358
Log:
dbus: depend on exact XML dep so it isn't always considered out-of-date
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-06-15 20:15:27 UTC (rev 22357)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-06-15 20:20:33 UTC (rev 22358)
@@ -13,10 +13,17 @@
ifeq ($(strip $(BR2_DBUS_EXPAT)),y)
DBUS_XML:=expat
-DBUS_XML_DEP:=expat
+# depend on the exact library file instead of expat so dbus isn't always
+# considered out-of-date
+DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
-DBUS_XML_DEP:=libxml2
+# depend on the exact target instead of libxml2 so dbus isn't always
+# considered out-of-date.
+# It would be neat to use $(LIBXML2_TARGET_INSTALL_STAGING) here,
+# but the libxml2 makefile is only parsed after dbus, so that doesn't work
+DBUS_XML_DEP:=$(BUILD_DIR)/libxml2-2.6.29/.stamp_staging_installed
+$(LIBXML2_TARGET_INSTALL_STAGING)
endif
$(DL_DIR)/$(DBUS_SOURCE):
@@ -83,7 +90,7 @@
rm -rf $(TARGET_DIR)/usr/share/man
endif
-dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2008-06-20 21:45 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2008-06-20 21:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-20 14:45:21 -0700 (Fri, 20 Jun 2008)
New Revision: 22461
Log:
dbus: depend on libxml2-install-staging instead for libxml2
Makefile.autools.in doesn't have proper dependencies set up for
the .stamp files, so use the libxml2-install-staging target instead.
This does unfortunately mean that dbus is always considered out of
date, but atleast it works.
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2008-06-20 20:20:54 UTC (rev 22460)
+++ trunk/buildroot/package/dbus/dbus.mk 2008-06-20 21:45:21 UTC (rev 22461)
@@ -18,12 +18,9 @@
DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
-# depend on the exact target instead of libxml2 so dbus isn't always
-# considered out-of-date.
-# It would be neat to use $(LIBXML2_TARGET_INSTALL_STAGING) here,
-# but the libxml2 makefile is only parsed after dbus, so that doesn't work
-DBUS_XML_DEP:=$(BUILD_DIR)/libxml2-2.6.29/.stamp_staging_installed
-$(LIBXML2_TARGET_INSTALL_STAGING)
+# Makefile.autotools.in unfortunately has broken dependency handling,
+# so we cannot do the same for libxml2
+DBUS_XML_DEP:=libxml2-install-staging
endif
$(DL_DIR)/$(DBUS_SOURCE):
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-01-25 20:55 ulf at uclibc.org
2009-01-25 21:00 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: ulf at uclibc.org @ 2009-01-25 20:55 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-25 20:55:31 +0000 (Sun, 25 Jan 2009)
New Revision: 25021
Log:
Stop dbus continuos rebuild, fix deps
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-25 20:53:43 UTC (rev 25020)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-25 20:55:31 UTC (rev 25021)
@@ -15,14 +15,17 @@
DBUS_XML:=expat
# depend on the exact library file instead of expat so dbus isn't always
# considered out-of-date
-DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
# Makefile.autotools.in unfortunately has broken dependency handling,
# so we cannot do the same for libxml2
-DBUS_XML_DEP:=libxml2-install-staging
+DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
+#libxml2-install-staging
endif
+DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
+
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@@ -64,9 +67,12 @@
$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
$(MAKE) -C $(DBUS_DIR) all
+ touch $@
$(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdbus-1.la
+ touch $@
$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-25 20:55 ulf at uclibc.org
@ 2009-01-25 21:00 ` Peter Korsgaard
2009-01-25 23:31 ` Ulf Samuelsson
0 siblings, 1 reply; 44+ messages in thread
From: Peter Korsgaard @ 2009-01-25 21:00 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-25 20:55:31 +0000 (Sun, 25 Jan 2009)
ulf> New Revision: 25021
ulf> Log:
ulf> Stop dbus continuos rebuild, fix deps
ulf> Modified:
ulf> trunk/buildroot/package/dbus/dbus.mk
ulf> Changeset:
ulf> Modified: trunk/buildroot/package/dbus/dbus.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/package/dbus/dbus.mk 2009-01-25 20:53:43 UTC (rev 25020)
ulf> +++ trunk/buildroot/package/dbus/dbus.mk 2009-01-25 20:55:31 UTC (rev 25021)
ulf> @@ -15,14 +15,17 @@
ulf> DBUS_XML:=expat
ulf> # depend on the exact library file instead of expat so dbus isn't always
ulf> # considered out-of-date
ulf> -DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
ulf> +DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
ulf> else
ulf> DBUS_XML:=libxml
ulf> # Makefile.autotools.in unfortunately has broken dependency handling,
ulf> # so we cannot do the same for libxml2
ulf> -DBUS_XML_DEP:=libxml2-install-staging
ulf> +DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
ulf> +#libxml2-install-staging
ulf> endif
ulf> +DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
Why the dance with DBUS_XML_DEP_LIB ?
Is all of this actually needed? As the toplevel Makefile run
sequentially it seems to me that it would be enough to just add expat
/ libxml2 to the dbus: line.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-25 21:00 ` Peter Korsgaard
@ 2009-01-25 23:31 ` Ulf Samuelsson
2009-01-26 6:02 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: Ulf Samuelsson @ 2009-01-25 23:31 UTC (permalink / raw)
To: buildroot
s?n 2009-01-25 klockan 22:00 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf <ulf@uclibc.org> writes:
>
> ulf> Author: ulf
> ulf> Date: 2009-01-25 20:55:31 +0000 (Sun, 25 Jan 2009)
> ulf> New Revision: 25021
>
> ulf> Log:
> ulf> Stop dbus continuos rebuild, fix deps
>
> ulf> Modified:
> ulf> trunk/buildroot/package/dbus/dbus.mk
>
>
> ulf> Changeset:
> ulf> Modified: trunk/buildroot/package/dbus/dbus.mk
> ulf> ===================================================================
> ulf> --- trunk/buildroot/package/dbus/dbus.mk 2009-01-25 20:53:43 UTC (rev 25020)
> ulf> +++ trunk/buildroot/package/dbus/dbus.mk 2009-01-25 20:55:31 UTC (rev 25021)
> ulf> @@ -15,14 +15,17 @@
> ulf> DBUS_XML:=expat
> ulf> # depend on the exact library file instead of expat so dbus isn't always
> ulf> # considered out-of-date
> ulf> -DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> ulf> +DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> ulf> else
> ulf> DBUS_XML:=libxml
> ulf> # Makefile.autotools.in unfortunately has broken dependency handling,
> ulf> # so we cannot do the same for libxml2
> ulf> -DBUS_XML_DEP:=libxml2-install-staging
> ulf> +DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
> ulf> +#libxml2-install-staging
> ulf> endif
>
> ulf> +DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
>
> Why the dance with DBUS_XML_DEP_LIB ?
>
> Is all of this actually needed? As the toplevel Makefile run
> sequentially it seems to me that it would be enough to just add expat
> / libxml2 to the dbus: line.
Feel free to optimize and test.
BR
Ulf Samuelsson
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-25 23:31 ` Ulf Samuelsson
@ 2009-01-26 6:02 ` Peter Korsgaard
0 siblings, 0 replies; 44+ messages in thread
From: Peter Korsgaard @ 2009-01-26 6:02 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
ulf> +DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
>>
>> Why the dance with DBUS_XML_DEP_LIB ?
>>
>> Is all of this actually needed? As the toplevel Makefile run
>> sequentially it seems to me that it would be enough to just add expat
>> / libxml2 to the dbus: line.
Ulf> Feel free to optimize and test.
For the 2nd part ok, but WHY did you now just add DBUS_XML_DEP_LIB?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-01-30 13:54 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2009-01-30 13:54 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-30 13:54:47 +0000 (Fri, 30 Jan 2009)
New Revision: 25168
Log:
dbus: fix xml dependency and stop continous rebuilds
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-30 13:54:42 UTC (rev 25167)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-30 13:54:47 UTC (rev 25168)
@@ -13,19 +13,12 @@
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
-# depend on the exact library file instead of expat so dbus isn't always
-# considered out-of-date
-DBUS_XML_DEP_LIB:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP:=expat
else
DBUS_XML:=libxml
-# Makefile.autotools.in unfortunately has broken dependency handling,
-# so we cannot do the same for libxml2
-DBUS_XML_DEP_LIB:=$(LIBXML2_HOOK_POST_INSTALL)
-#libxml2-install-staging
+DBUS_XML_DEP:=libxml2
endif
-DBUS_XML_DEP:=$(DBUS_XML_DEP_LIB)
-
$(DL_DIR)/$(DBUS_SOURCE):
$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
@@ -35,7 +28,7 @@
$(DBUS_CAT) $(DL_DIR)/$(DBUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
+$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
(cd $(DBUS_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
@@ -93,7 +86,7 @@
rm -rf $(TARGET_DIR)/usr/share/man
endif
-dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-01-31 12:02 ulf at uclibc.org
2009-01-31 13:09 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: ulf at uclibc.org @ 2009-01-31 12:02 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-31 12:02:40 +0000 (Sat, 31 Jan 2009)
New Revision: 25176
Log:
dbus dependencies needs to be ready before ./configure
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-31 10:18:23 UTC (rev 25175)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-31 12:02:40 UTC (rev 25176)
@@ -28,7 +28,7 @@
$(DBUS_CAT) $(DL_DIR)/$(DBUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
+$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
(cd $(DBUS_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
@@ -113,3 +113,9 @@
ifeq ($(BR2_PACKAGE_DBUS),y)
TARGETS+=dbus
endif
+
+dbus-status:
+ @echo BR2_DBUS_EXPAT=$(BR2_DBUS_EXPAT)
+ @echo DBUS_XML=$(DBUS_XML)
+ @echo DBUS_XML_DEP=$(DBUS_XML_DEP)
+
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-31 12:02 [Buildroot] svn commit: trunk/buildroot/package/dbus ulf at uclibc.org
@ 2009-01-31 13:09 ` Peter Korsgaard
0 siblings, 0 replies; 44+ messages in thread
From: Peter Korsgaard @ 2009-01-31 13:09 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-31 12:02:40 +0000 (Sat, 31 Jan 2009)
ulf> New Revision: 25176
ulf> Log:
ulf> dbus dependencies needs to be ready before ./configure
So now we're back to how it was before you started changing it,
E.G. continous rebuilds.
ulf> +
ulf> +dbus-status:
ulf> + @echo BR2_DBUS_EXPAT=$(BR2_DBUS_EXPAT)
ulf> + @echo DBUS_XML=$(DBUS_XML)
ulf> + @echo DBUS_XML_DEP=$(DBUS_XML_DEP)
Please don't add all those debugging foo-status.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-01-31 18:39 jacmet at uclibc.org
2009-01-31 20:52 ` Ulf Samuelsson
0 siblings, 1 reply; 44+ messages in thread
From: jacmet at uclibc.org @ 2009-01-31 18:39 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-31 18:39:55 +0000 (Sat, 31 Jan 2009)
New Revision: 25181
Log:
dbus: revert to pre-r25021 situation
Revert to pre-r25021 situation, but add extra comments explaining the
situation.
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-31 18:39:49 UTC (rev 25180)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-31 18:39:55 UTC (rev 25181)
@@ -13,10 +13,18 @@
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
-DBUS_XML_DEP:=expat
+# depend on the exact library file instead of expat so dbus isn't always
+# considered out-of-date
+DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
-DBUS_XML_DEP:=libxml2
+# Makefile.autotools.in unfortunately has broken dependency handling,
+# so we cannot do the same for libxml2 as the targets (like
+# libxml2-install-staging) are phony and hence, dbus will always be
+# considered out-of-date. Using the corresponding .stamp_* files (E.G.
+# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
+# information between them.
+DBUS_XML_DEP:=libxml2-install-staging
endif
$(DL_DIR)/$(DBUS_SOURCE):
@@ -86,7 +94,7 @@
rm -rf $(TARGET_DIR)/usr/share/man
endif
-dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
@@ -113,9 +121,3 @@
ifeq ($(BR2_PACKAGE_DBUS),y)
TARGETS+=dbus
endif
-
-dbus-status:
- @echo BR2_DBUS_EXPAT=$(BR2_DBUS_EXPAT)
- @echo DBUS_XML=$(DBUS_XML)
- @echo DBUS_XML_DEP=$(DBUS_XML_DEP)
-
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-31 18:39 jacmet at uclibc.org
@ 2009-01-31 20:52 ` Ulf Samuelsson
2009-01-31 21:20 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: Ulf Samuelsson @ 2009-01-31 20:52 UTC (permalink / raw)
To: buildroot
l?r 2009-01-31 klockan 18:39 +0000 skrev jacmet at uclibc.org:
> Author: jacmet
> Date: 2009-01-31 18:39:55 +0000 (Sat, 31 Jan 2009)
> New Revision: 25181
>
> Log:
> dbus: revert to pre-r25021 situation
>
> Revert to pre-r25021 situation, but add extra comments explaining the
> situation.
>
> Modified:
> trunk/buildroot/package/dbus/dbus.mk
Why are you doing this?
You are AGAIN breaking boards...
Please fix this ASAP!
BR
Ulf Samuelsson
>
>
> Changeset:
> Modified: trunk/buildroot/package/dbus/dbus.mk
> ===================================================================
> --- trunk/buildroot/package/dbus/dbus.mk 2009-01-31 18:39:49 UTC (rev 25180)
> +++ trunk/buildroot/package/dbus/dbus.mk 2009-01-31 18:39:55 UTC (rev 25181)
> @@ -13,10 +13,18 @@
>
> ifeq ($(BR2_DBUS_EXPAT),y)
> DBUS_XML:=expat
> -DBUS_XML_DEP:=expat
> +# depend on the exact library file instead of expat so dbus isn't always
> +# considered out-of-date
> +DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> else
> DBUS_XML:=libxml
> -DBUS_XML_DEP:=libxml2
> +# Makefile.autotools.in unfortunately has broken dependency handling,
> +# so we cannot do the same for libxml2 as the targets (like
> +# libxml2-install-staging) are phony and hence, dbus will always be
> +# considered out-of-date. Using the corresponding .stamp_* files (E.G.
> +# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
> +# information between them.
> +DBUS_XML_DEP:=libxml2-install-staging
> endif
>
> $(DL_DIR)/$(DBUS_SOURCE):
> @@ -86,7 +94,7 @@
> rm -rf $(TARGET_DIR)/usr/share/man
> endif
>
> -dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
> +dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
>
> dbus-clean:
> rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
> @@ -113,9 +121,3 @@
> ifeq ($(BR2_PACKAGE_DBUS),y)
> TARGETS+=dbus
> endif
> -
> -dbus-status:
> - @echo BR2_DBUS_EXPAT=$(BR2_DBUS_EXPAT)
> - @echo DBUS_XML=$(DBUS_XML)
> - @echo DBUS_XML_DEP=$(DBUS_XML_DEP)
> -
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-01-31 21:01 ulf at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: ulf at uclibc.org @ 2009-01-31 21:01 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-31 21:01:24 +0000 (Sat, 31 Jan 2009)
New Revision: 25194
Log:
Unbreak Peters 'fixes' to dbus for a second time
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-31 20:49:59 UTC (rev 25193)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-31 21:01:24 UTC (rev 25194)
@@ -13,18 +13,10 @@
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
-# depend on the exact library file instead of expat so dbus isn't always
-# considered out-of-date
-DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP:=expat
else
DBUS_XML:=libxml
-# Makefile.autotools.in unfortunately has broken dependency handling,
-# so we cannot do the same for libxml2 as the targets (like
-# libxml2-install-staging) are phony and hence, dbus will always be
-# considered out-of-date. Using the corresponding .stamp_* files (E.G.
-# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
-# information between them.
-DBUS_XML_DEP:=libxml2-install-staging
+DBUS_XML_DEP:=libxml2
endif
$(DL_DIR)/$(DBUS_SOURCE):
@@ -94,7 +86,7 @@
rm -rf $(TARGET_DIR)/usr/share/man
endif
-dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
@@ -121,3 +113,5 @@
ifeq ($(BR2_PACKAGE_DBUS),y)
TARGETS+=dbus
endif
+
+
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-31 20:52 ` Ulf Samuelsson
@ 2009-01-31 21:20 ` Peter Korsgaard
2009-01-31 21:55 ` Ulf Samuelsson
0 siblings, 1 reply; 44+ messages in thread
From: Peter Korsgaard @ 2009-01-31 21:20 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
Ulf> l?r 2009-01-31 klockan 18:39 +0000 skrev jacmet at uclibc.org:
>> Author: jacmet
>> Date: 2009-01-31 18:39:55 +0000 (Sat, 31 Jan 2009)
>> New Revision: 25181
>>
>> Log:
>> dbus: revert to pre-r25021 situation
>>
>> Revert to pre-r25021 situation, but add extra comments explaining the
>> situation.
>>
>> Modified:
>> trunk/buildroot/package/dbus/dbus.mk
Ulf> Why are you doing this?
Ulf> You are AGAIN breaking boards...
What? What is broken? A wee bit more detail would be handy.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-31 21:20 ` Peter Korsgaard
@ 2009-01-31 21:55 ` Ulf Samuelsson
2009-01-31 22:26 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: Ulf Samuelsson @ 2009-01-31 21:55 UTC (permalink / raw)
To: buildroot
l?r 2009-01-31 klockan 22:20 +0100 skrev Peter Korsgaard:
> >>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
>
> Ulf> l?r 2009-01-31 klockan 18:39 +0000 skrev jacmet at uclibc.org:
> >> Author: jacmet
> >> Date: 2009-01-31 18:39:55 +0000 (Sat, 31 Jan 2009)
> >> New Revision: 25181
> >>
> >> Log:
> >> dbus: revert to pre-r25021 situation
> >>
> >> Revert to pre-r25021 situation, but add extra comments explaining the
> >> situation.
> >>
> >> Modified:
> >> trunk/buildroot/package/dbus/dbus.mk
>
> Ulf> Why are you doing this?
>
> Ulf> You are AGAIN breaking boards...
>
> What? What is broken? A wee bit more detail would be handy.
>
The problem is that you make dbus depend on expat/libxml2.
To build dbus, you need to do a number of things
extract
patch
configure
make
install staging dir
install target
dbus = "ready"
If you make "dbus" depend on "libxml2", then
libxml2 can be built at ANY time between start of make
until the "dbus" install target rule is executed
which will complete the dbus build.
"dbus" needs to have access to the libraries already
at "configure" time, or the build will abort.
It so happens that "dbus" configure starts before
libxml2 is built for some unclear reason.
Therefore *?"dbus-configured"* meeds to be dependent on
"expat" | "libxml2".
Then they are built before the configure starts
and the build will complete without errors.
You were right that it is OK to depend on libxml2|expat
instead of strange libraries/goals.
but the solution was not complete which broke the build.
BR
Ulf Samuelsson
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-31 21:55 ` Ulf Samuelsson
@ 2009-01-31 22:26 ` Peter Korsgaard
0 siblings, 0 replies; 44+ messages in thread
From: Peter Korsgaard @ 2009-01-31 22:26 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
Hi,
Ulf> Why are you doing this?
>>
Ulf> You are AGAIN breaking boards...
>>
>> What? What is broken? A wee bit more detail would be handy.
>>
Ulf> The problem is that you make dbus depend on expat/libxml2.
No, I make the configure target of dbus depend on expat/libxml2 being
installed into staging.
Ulf> To build dbus, you need to do a number of things
Ulf> extract
Ulf> patch
Ulf> configure
Ulf> make
Ulf> install staging dir
Ulf> install target
Ulf> dbus = "ready"
Ulf> If you make "dbus" depend on "libxml2", then
Ulf> libxml2 can be built at ANY time between start of make
Ulf> until the "dbus" install target rule is executed
Ulf> which will complete the dbus build.
Which is why I don't do that.
Ulf> "dbus" needs to have access to the libraries already
Ulf> at "configure" time, or the build will abort.
Ulf> It so happens that "dbus" configure starts before
Ulf> libxml2 is built for some unclear reason.
Because the dbus makefile is listed before the libxml2 one.
Ulf> Therefore *?"dbus-configured"* meeds to be dependent on
Ulf> "expat" | "libxml2".
Almost, it needs to depend on a non-phony target providing the
expat/libxml2 library/headers in staging dir.
Ulf> Then they are built before the configure starts
Ulf> and the build will complete without errors.
Ulf> You were right that it is OK to depend on libxml2|expat
Ulf> instead of strange libraries/goals.
Ulf> but the solution was not complete which broke the build.
Where isn't it complete? Your commit (besides removing valuable
comments) made dbus configure depend on the phony expat target instead
of the real rule, so dbus will alreads be considered out of date for
expat (just like for libxml2, but as the (deleted) comment states,
there's not much to do about that besides fixing up
Makefile.autotools.in which I DONT suggest we do before the release.
This should ofcourse be seen in the light of all your dbus.mk changes
since the 25th to "fix continous rebuilds" ;)
In other words, I don't see where I'm "AGAIN breaking boards..."
Just to check, I did a build of at91rm9200df_defconfig, and the dbus
build completed without any errors, so unless I hear otherwise from
you, I WILL revert your revert.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-01-31 22:53 jacmet at uclibc.org
2009-02-01 5:58 ` Hamish Moffatt
0 siblings, 1 reply; 44+ messages in thread
From: jacmet at uclibc.org @ 2009-01-31 22:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-31 22:53:35 +0000 (Sat, 31 Jan 2009)
New Revision: 25201
Log:
dbus: revert r25194 (Unbreak Peters 'fixes' to dbus for a second time)
It was a bogus revert.
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-01-31 21:45:57 UTC (rev 25200)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-01-31 22:53:35 UTC (rev 25201)
@@ -13,10 +13,18 @@
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
-DBUS_XML_DEP:=expat
+# depend on the exact library file instead of expat so dbus isn't always
+# considered out-of-date
+DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
DBUS_XML:=libxml
-DBUS_XML_DEP:=libxml2
+# Makefile.autotools.in unfortunately has broken dependency handling,
+# so we cannot do the same for libxml2 as the targets (like
+# libxml2-install-staging) are phony and hence, dbus will always be
+# considered out-of-date. Using the corresponding .stamp_* files (E.G.
+# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
+# information between them.
+DBUS_XML_DEP:=libxml2-install-staging
endif
$(DL_DIR)/$(DBUS_SOURCE):
@@ -86,7 +94,7 @@
rm -rf $(TARGET_DIR)/usr/share/man
endif
-dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
@@ -113,5 +121,3 @@
ifeq ($(BR2_PACKAGE_DBUS),y)
TARGETS+=dbus
endif
-
-
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-01-31 22:53 jacmet at uclibc.org
@ 2009-02-01 5:58 ` Hamish Moffatt
2009-02-01 6:31 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: Hamish Moffatt @ 2009-02-01 5:58 UTC (permalink / raw)
To: buildroot
On Sat, Jan 31, 2009 at 10:53:36PM +0000, jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2009-01-31 22:53:35 +0000 (Sat, 31 Jan 2009)
> New Revision: 25201
>
> Log:
> dbus: revert r25194 (Unbreak Peters 'fixes' to dbus for a second time)
>
> It was a bogus revert.
Are we having fun yet?
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-02-01 5:58 ` Hamish Moffatt
@ 2009-02-01 6:31 ` Peter Korsgaard
2009-02-01 10:58 ` Ulf Samuelsson
0 siblings, 1 reply; 44+ messages in thread
From: Peter Korsgaard @ 2009-02-01 6:31 UTC (permalink / raw)
To: buildroot
>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
>> dbus: revert r25194 (Unbreak Peters 'fixes' to dbus for a second time)
>>
>> It was a bogus revert.
Hamish> Are we having fun yet?
Yeah, I know it's silly.
I know it's mainly a social problem, but to me it again shows the need
from moving from the svn code ghetto approach to git's approach with
patches to the list and finally pull requests to the maintainer.
E.G. get the code reviewed BEFORE it gets into the tree, and not
afterwards.
But let's discuss this after the release.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-02-01 6:31 ` Peter Korsgaard
@ 2009-02-01 10:58 ` Ulf Samuelsson
2009-02-01 13:17 ` Peter Korsgaard
0 siblings, 1 reply; 44+ messages in thread
From: Ulf Samuelsson @ 2009-02-01 10:58 UTC (permalink / raw)
To: buildroot
s?n 2009-02-01 klockan 07:31 +0100 skrev Peter Korsgaard:
> >>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
>
> >> dbus: revert r25194 (Unbreak Peters 'fixes' to dbus for a second time)
> >>
> >> It was a bogus revert.
>
> Hamish> Are we having fun yet?
>
> Yeah, I know it's silly.
>
> I know it's mainly a social problem, but to me it again shows the need
> from moving from the svn code ghetto approach to git's approach with
> patches to the list and finally pull requests to the maintainer.
>
> E.G. get the code reviewed BEFORE it gets into the tree, and not
> afterwards.
?As long as you allow a commit to the main tree without
testing by others you will have a problem.
I have proposed to go to git, but that was not of interest
until the uclibc project did so.
I also proposed a method allowing commits which
does not interfere with the main build, but that was also shot down,
I seem to remember that you claimed that this functionality
can be handled by svn and tags.
BR
Ulf Samuelsson
>
> But let's discuss this after the release.
>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
2009-02-01 10:58 ` Ulf Samuelsson
@ 2009-02-01 13:17 ` Peter Korsgaard
0 siblings, 0 replies; 44+ messages in thread
From: Peter Korsgaard @ 2009-02-01 13:17 UTC (permalink / raw)
To: buildroot
>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
Ulf> ?As long as you allow a commit to the main tree without
Ulf> testing by others you will have a problem.
Ulf> I have proposed to go to git, but that was not of interest
Ulf> until the uclibc project did so.
Who says it's not of interest? I'm pretty sure the general agreement
is that we'll move to git sooner or later, and the same was discussed
during the uclibc.org reinstall. Back then we had more urgent issues
to handle, and not all is taken care of yet (E.G. issues from the old
bugtracker, the commit mails are still using the wrong URLs and so
on).
Just getting git up and running is easy (hey, it's installed on
uclibc.org so we could have it NOW), it's all the extra things like
gitweb/cgit, commit messages to the mailing list, a maintainers system
with submaintainers and an agreed upon procedure for finally getting
changes in the official (E.G. mine) tree.
A lot of these infrastructure issues would be shared with
busybox/uclibc as well, so it makes sense to sync.
But we can certainly discuss how to handle the BR specific procedures
so we're ready (either here on the list or IRL at FOSDEM).
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-02-22 20:12 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2009-02-22 20:12 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-22 20:12:50 +0000 (Sun, 22 Feb 2009)
New Revision: 25413
Log:
dbus: convert to Makefile.autotools.in and bump version
Added:
trunk/buildroot/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Added: trunk/buildroot/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch
===================================================================
--- trunk/buildroot/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch (rev 0)
+++ trunk/buildroot/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch 2009-02-22 20:12:50 UTC (rev 25413)
@@ -0,0 +1,33 @@
+dbus-daemon-launch-helper: fix build with libxml
+
+dbus-daemon-launch-helper links with the trival config parser, which
+doesn't provide bus_config_parser_check_doctype(), like the big parser does.
+The libxml loader unfortunately wants to call it, so this breaks the build.
+
+Fix it by including a dummy bus_config_parser_check_doctype() in the trivial
+config parser.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ bus/config-parser-trivial.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: dbus-1.2.12/bus/config-parser-trivial.c
+===================================================================
+--- dbus-1.2.12.orig/bus/config-parser-trivial.c
++++ dbus-1.2.12/bus/config-parser-trivial.c
+@@ -310,6 +310,14 @@
+ return &parser->service_dirs;
+ }
+
++dbus_bool_t
++bus_config_parser_check_doctype (BusConfigParser *parser,
++ const char *doctype,
++ DBusError *error)
++{
++ return TRUE;
++}
++
+ #ifdef DBUS_BUILD_TESTS
+ #include <stdio.h>
+ #include "test.h"
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-02-22 10:57:23 UTC (rev 25412)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-02-22 20:12:50 UTC (rev 25413)
@@ -3,53 +3,31 @@
# dbus
#
#############################################################
-DBUS_VERSION:=1.1.1
-DBUS_SOURCE:=dbus-$(DBUS_VERSION).tar.gz
-DBUS_SITE:=http://dbus.freedesktop.org/releases/dbus/
-DBUS_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)
-DBUS_CAT:=$(ZCAT)
-DBUS_BINARY:=bus/dbus-daemon
-DBUS_TARGET_BINARY:=usr/bin/dbus-daemon
+DBUS_VERSION = 1.2.12
+DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
+DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_INSTALL_STAGING = YES
+DBUS_INSTALL_TARGET = YES
+ifeq ($(BR2_ENABLE_DEBUG),y)
+# install-exec doesn't install the config file
+DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+else
+# install-strip uses host strip
+DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip STRIPPROG="$(STRIPCMD)"
+endif
+DBUS_DEPENDENCIES = uclibc pkgconfig
+
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
-# depend on the exact library file instead of expat so dbus isn't always
-# considered out-of-date
-DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_DEPENDENCIES += ezxml
else
DBUS_XML:=libxml
-# Makefile.autotools.in unfortunately has broken dependency handling,
-# so we cannot do the same for libxml2 as the targets (like
-# libxml2-install-staging) are phony and hence, dbus will always be
-# considered out-of-date. Using the corresponding .stamp_* files (E.G.
-# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
-# information between them.
-DBUS_XML_DEP:=libxml2-install-staging
+DBUS_DEPENDENCIES += libxml2
endif
-$(DL_DIR)/$(DBUS_SOURCE):
- $(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
-
-dbus-source: $(DL_DIR)/$(DBUS_SOURCE)
-
-$(DBUS_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
- $(DBUS_CAT) $(DL_DIR)/$(DBUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
- (cd $(DBUS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ac_cv_have_abstract_sockets=yes \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --localstatedir=/var \
- --program-prefix="" \
- --sysconfdir=/etc \
+DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
+DBUS_CONF_OPT = --program-prefix="" \
--with-dbus-user=dbus \
--disable-tests \
--disable-asserts \
@@ -62,62 +40,11 @@
--without-x \
--with-xml=$(DBUS_XML) \
--with-system-socket=/var/run/dbus/system_bus_socket \
- --with-system-pid-file=/var/run/messagebus.pid \
- )
- touch $@
+ --with-system-pid-file=/var/run/messagebus.pid
-$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
- $(MAKE) -C $(DBUS_DIR) all
- touch $@
+$(eval $(call AUTOTARGETS,package,dbus))
-$(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdbus-1.la
- touch $@
-
-$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
- mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
-ifeq ($(BR2_STRIP_none),y)
- $(MAKE) DESTDIR=$(TARGET_DIR) \
- initdir=/etc/init.d -C $(DBUS_DIR) install
-else
- $(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' \
- initdir=/etc/init.d -C $(DBUS_DIR) install-strip
-endif
- rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \
- $(TARGET_DIR)/usr/lib/libdbus-1.la \
- $(TARGET_DIR)/usr/include/dbus-1.0 \
- $(TARGET_DIR)/usr/lib/pkgconfig
+$(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
+ rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
$(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d
- rm -f $(TARGET_DIR)/etc/init.d/messagebus
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
-
-dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
-
-dbus-clean:
- rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
- rm -f $(TARGET_DIR)/etc/dbus-1/system.conf
- rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/etc/dbus-1/system.d
- rm -f $(TARGET_DIR)/etc/init.d/S30dbus
- rm -f $(TARGET_DIR)/usr/lib/libdbus-1.so*
- rm -f $(TARGET_DIR)/usr/bin/dbus-daemon
- rm -rf $(TARGET_DIR)/tmp/dbus
- rm -f $(STAGING_DIR)/usr/lib/libdbus-1.*
- rm -rf $(STAGING_DIR)/usr/lib/dbus-1.0
- rm -rf $(STAGING_DIR)/usr/include/dbus-1.0
- rmdir --ignore-fail-on-non-empty $(STAGING_DIR)/usr/include
- -$(MAKE) -C $(DBUS_DIR) clean
-
-dbus-dirclean:
- rm -rf $(DBUS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DBUS),y)
-TARGETS+=dbus
-endif
+ touch $@
^ permalink raw reply [flat|nested] 44+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/dbus
@ 2009-02-24 11:13 jacmet at uclibc.org
0 siblings, 0 replies; 44+ messages in thread
From: jacmet at uclibc.org @ 2009-02-24 11:13 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-24 11:13:56 +0000 (Tue, 24 Feb 2009)
New Revision: 25439
Log:
dbus: fix expat typo
Modified:
trunk/buildroot/package/dbus/dbus.mk
Changeset:
Modified: trunk/buildroot/package/dbus/dbus.mk
===================================================================
--- trunk/buildroot/package/dbus/dbus.mk 2009-02-24 10:05:15 UTC (rev 25438)
+++ trunk/buildroot/package/dbus/dbus.mk 2009-02-24 11:13:56 UTC (rev 25439)
@@ -20,7 +20,7 @@
ifeq ($(BR2_DBUS_EXPAT),y)
DBUS_XML:=expat
-DBUS_DEPENDENCIES += ezxml
+DBUS_DEPENDENCIES += expat
else
DBUS_XML:=libxml
DBUS_DEPENDENCIES += libxml2
^ permalink raw reply [flat|nested] 44+ messages in thread
end of thread, other threads:[~2009-02-24 11:13 UTC | newest]
Thread overview: 44+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-31 12:02 [Buildroot] svn commit: trunk/buildroot/package/dbus ulf at uclibc.org
2009-01-31 13:09 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2009-02-24 11:13 jacmet at uclibc.org
2009-02-22 20:12 jacmet at uclibc.org
2009-01-31 22:53 jacmet at uclibc.org
2009-02-01 5:58 ` Hamish Moffatt
2009-02-01 6:31 ` Peter Korsgaard
2009-02-01 10:58 ` Ulf Samuelsson
2009-02-01 13:17 ` Peter Korsgaard
2009-01-31 21:01 ulf at uclibc.org
2009-01-31 18:39 jacmet at uclibc.org
2009-01-31 20:52 ` Ulf Samuelsson
2009-01-31 21:20 ` Peter Korsgaard
2009-01-31 21:55 ` Ulf Samuelsson
2009-01-31 22:26 ` Peter Korsgaard
2009-01-30 13:54 jacmet at uclibc.org
2009-01-25 20:55 ulf at uclibc.org
2009-01-25 21:00 ` Peter Korsgaard
2009-01-25 23:31 ` Ulf Samuelsson
2009-01-26 6:02 ` Peter Korsgaard
2008-06-20 21:45 jacmet at uclibc.org
2008-06-15 20:20 jacmet at uclibc.org
2008-04-06 13:33 ulf at uclibc.org
2008-03-31 19:36 jacmet at uclibc.org
2008-03-12 14:51 ninevoltz at uclibc.org
2008-03-06 18:46 ninevoltz at uclibc.org
2008-03-04 12:19 jacmet at uclibc.org
2008-01-30 13:57 vanokuten at uclibc.org
2007-11-26 15:47 jacmet at uclibc.org
2007-11-25 23:30 ulf at uclibc.org
2007-11-25 14:49 ulf at uclibc.org
2007-11-23 15:46 jacmet at uclibc.org
2007-11-23 13:21 jacmet at uclibc.org
2007-11-23 11:44 jacmet at uclibc.org
2007-11-23 11:43 jacmet at uclibc.org
2007-11-23 12:50 ` Ivan Kuten
2007-11-23 12:33 ` Peter Korsgaard
2007-11-23 10:00 jacmet at uclibc.org
2007-11-23 9:46 jacmet at uclibc.org
2007-11-22 17:12 jacmet at uclibc.org
2007-08-21 12:09 aldot at uclibc.org
2007-07-17 15:19 ulf at uclibc.org
2007-07-08 13:20 aldot at uclibc.org
2007-01-15 16:02 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox