* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-06-24 16:02 correa at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: correa at uclibc.org @ 2008-06-24 16:02 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-06-24 09:02:22 -0700 (Tue, 24 Jun 2008)
New Revision: 22490
Log:
Fix avahi compile when libexpat is not selected
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-06-24 14:10:41 UTC (rev 22489)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-06-24 16:02:22 UTC (rev 22490)
@@ -26,12 +26,12 @@
ifeq ($(strip $(BR2_PACKAGE_AVAHI_DAEMON)),y)
AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-daemon
-AVAHI_DISABLE_EXPAT:=
+AVAHI_DISABLE_EXPAT:=--with-xml=expat
# depend on the exact library file instead of expat so avahi isn't always
# considered out-of-date
AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
-AVAHI_DISABLE_EXPAT:=--disable-expat
+AVAHI_DISABLE_EXPAT:=--disable-expat --with-xml=none
endif
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2009-01-28 15:12 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2009-01-28 15:12 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-28 15:12:05 +0000 (Wed, 28 Jan 2009)
New Revision: 25097
Log:
avahi-autoipd: fix issue with repeated builds
The avahi-autoipd target install step adds /var/lib/avahi-autoipd as a
symlink to /tmp/avahi-autoipd, which is fine, except if your /var/lib is
already a symlink to /tmp (E.G. like the default target_skeleton is).
If that's the case, then you end up adding a /tmp/avahi-autoipd symlink
pointing to itself, causing subsequent builds to fail
(Too many levels of symbolic links in the ln -sf call). Fix it by simply
first removing the symlink if it's there.
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2009-01-28 14:33:41 UTC (rev 25096)
+++ trunk/buildroot/package/avahi/avahi.mk 2009-01-28 15:12:05 UTC (rev 25097)
@@ -158,6 +158,7 @@
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
cp -af package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $@
+ rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-12-15 16:09 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-12-15 16:09 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-15 08:09:03 -0800 (Mon, 15 Dec 2008)
New Revision: 24419
Log:
avahi: make sure destination dirs exists
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-12-15 15:28:48 UTC (rev 24418)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-12-15 16:09:03 UTC (rev 24419)
@@ -151,20 +151,19 @@
touch $@
$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
- mkdir -p $(TARGET_DIR)/etc/avahi
- mkdir -p $(TARGET_DIR)/etc/init.d
- mkdir -p $(TARGET_DIR)/var/lib
- mkdir -p $(TARGET_DIR)/usr/share/udhcpc
+ mkdir -p $(addprefix $(TARGET_DIR),\
+ /etc/avahi /etc/init.d /var/lib /usr/share/udhcpc /usr/sbin)
cp -af $(STAGING_DIR)/etc/avahi/avahi-autoipd.action $(TARGET_DIR)/etc/avahi/
cp -af package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
cp -af package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
- cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $(TARGET_DIR)/usr/sbin/avahi-autoipd
+ cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $@
ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
$(TARGET_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.installed
- mkdir -p $(TARGET_DIR)/etc/avahi/services $(TARGET_DIR)/usr/lib
+ mkdir -p $(addprefix $(TARGET_DIR),\
+ /etc/avahi/services /usr/lib /usr/bin /usr/sbin)
cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/
@@ -176,8 +175,7 @@
cp -r $(STAGING_DIR)/etc/dbus-1/system.d/avahi-* \
$(TARGET_DIR)/etc/dbus-1/system.d/
endif
- cp $(STAGING_DIR)/usr/sbin/avahi-daemon \
- $(TARGET_DIR)/usr/sbin/avahi-daemon
+ cp $(STAGING_DIR)/usr/sbin/avahi-daemon $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
avahi: host-autoconf uclibc libdaemon $(if $(BR2_ENABLE_LOCALE),gettext libintl) $(AVAHI_TARGETS)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-12-04 16:13 egtvedt at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-04 16:13 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-04 08:13:08 -0800 (Thu, 04 Dec 2008)
New Revision: 24272
Log:
avahi: add dependency to host-autoconf
Avahi uses autoconf during ./configure, make sure it is available and used
before building avahi.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-12-04 16:10:44 UTC (rev 24271)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-12-04 16:13:08 UTC (rev 24272)
@@ -53,7 +53,7 @@
touch $@
$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXTRA_DEPS)
- (cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
+ (cd $(AVAHI_DIR) && rm -rf config.cache && PATH=$(TARGET_PATH) autoconf)
(cd $(AVAHI_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
@@ -180,7 +180,7 @@
$(TARGET_DIR)/usr/sbin/avahi-daemon
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-avahi: uclibc libdaemon $(if $(BR2_ENABLE_LOCALE),gettext libintl) $(AVAHI_TARGETS)
+avahi: host-autoconf uclibc libdaemon $(if $(BR2_ENABLE_LOCALE),gettext libintl) $(AVAHI_TARGETS)
avahi-clean:
-$(MAKE) -C $(AVAHI_DIR) distclean
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-10-01 10:28 egtvedt at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: egtvedt at uclibc.org @ 2008-10-01 10:28 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-10-01 03:28:44 -0700 (Wed, 01 Oct 2008)
New Revision: 23571
Log:
avahi: add dependencies in right order
This patch puts gettext and libintl before the avahi targets, thus making sure
they exist before avahi targets are built.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-09-30 22:37:29 UTC (rev 23570)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-10-01 10:28:44 UTC (rev 23571)
@@ -180,7 +180,7 @@
$(TARGET_DIR)/usr/sbin/avahi-daemon
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-avahi: uclibc libdaemon $(AVAHI_TARGETS) $(if $(BR2_ENABLE_LOCALE),gettext libintl)
+avahi: uclibc libdaemon $(if $(BR2_ENABLE_LOCALE),gettext libintl) $(AVAHI_TARGETS)
avahi-clean:
-$(MAKE) -C $(AVAHI_DIR) distclean
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-08-31 20:23 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-08-31 20:23 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-31 13:23:37 -0700 (Sun, 31 Aug 2008)
New Revision: 23285
Log:
avahi: don't use BASE_DIR to reference source files
dest != source if we want to support out-of-tree builds
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-08-31 06:26:40 UTC (rev 23284)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-08-31 20:23:37 UTC (rev 23285)
@@ -156,9 +156,9 @@
mkdir -p $(TARGET_DIR)/var/lib
mkdir -p $(TARGET_DIR)/usr/share/udhcpc
cp -af $(STAGING_DIR)/etc/avahi/avahi-autoipd.action $(TARGET_DIR)/etc/avahi/
- cp -af $(BASE_DIR)/package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
+ cp -af package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
- cp -af $(BASE_DIR)/package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
+ cp -af package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $(TARGET_DIR)/usr/sbin/avahi-autoipd
ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
@@ -168,7 +168,7 @@
cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/
- cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
+ cp -af package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
cp -dpf $(STAGING_DIR)/usr/bin/avahi-* $(TARGET_DIR)/usr/bin
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/avahi-*
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-08-27 7:29 jacmet at uclibc.org
2008-08-27 8:15 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-08-27 7:29 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-27 00:29:20 -0700 (Wed, 27 Aug 2008)
New Revision: 23235
Log:
avahi: fix build with BR2_ENABLE_LOCALE
Modified:
trunk/buildroot/package/avahi/Config.in
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/Config.in
===================================================================
--- trunk/buildroot/package/avahi/Config.in 2008-08-27 07:29:16 UTC (rev 23234)
+++ trunk/buildroot/package/avahi/Config.in 2008-08-27 07:29:20 UTC (rev 23235)
@@ -1,6 +1,8 @@
config BR2_PACKAGE_AVAHI
bool "avahi"
select BR2_PACKAGE_LIBDAEMON
+ select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
help
Avahi is a system which facilitates service
discovery on a local network.
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-08-27 07:29:16 UTC (rev 23234)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-08-27 07:29:20 UTC (rev 23235)
@@ -142,7 +142,7 @@
touch $@
$(AVAHI_DIR)/.compiled: $(AVAHI_DIR)/.configured
- $(MAKE) -C $(AVAHI_DIR)
+ $(MAKE) -C $(AVAHI_DIR) $(if $(BR2_ENABLE_LOCALE),LIBS=-lintl)
touch $@
$(AVAHI_DIR)/.installed: $(AVAHI_DIR)/.compiled
@@ -180,7 +180,7 @@
$(TARGET_DIR)/usr/sbin/avahi-daemon
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-avahi: uclibc libdaemon $(AVAHI_TARGETS)
+avahi: uclibc libdaemon $(AVAHI_TARGETS) $(if $(BR2_ENABLE_LOCALE),gettext libintl)
avahi-clean:
-$(MAKE) -C $(AVAHI_DIR) distclean
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2008-08-27 7:29 jacmet at uclibc.org
@ 2008-08-27 8:15 ` Bernhard Reutner-Fischer
2008-08-27 8:28 ` Peter Korsgaard
0 siblings, 1 reply; 41+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-08-27 8:15 UTC (permalink / raw)
To: buildroot
On Wed, Aug 27, 2008 at 12:29:21AM -0700, jacmet at uclibc.org wrote:
>Author: jacmet
>Date: 2008-08-27 00:29:20 -0700 (Wed, 27 Aug 2008)
>New Revision: 23235
>Modified: trunk/buildroot/package/avahi/avahi.mk
>===================================================================
>--- trunk/buildroot/package/avahi/avahi.mk 2008-08-27 07:29:16 UTC (rev 23234)
>+++ trunk/buildroot/package/avahi/avahi.mk 2008-08-27 07:29:20 UTC (rev 23235)
>@@ -142,7 +142,7 @@
> touch $@
>
> $(AVAHI_DIR)/.compiled: $(AVAHI_DIR)/.configured
>- $(MAKE) -C $(AVAHI_DIR)
>+ $(MAKE) -C $(AVAHI_DIR) $(if $(BR2_ENABLE_LOCALE),LIBS=-lintl)
> touch $@
>
> $(AVAHI_DIR)/.installed: $(AVAHI_DIR)/.compiled
>@@ -180,7 +180,7 @@
> $(TARGET_DIR)/usr/sbin/avahi-daemon
> $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
>
>-avahi: uclibc libdaemon $(AVAHI_TARGETS)
>+avahi: uclibc libdaemon $(AVAHI_TARGETS) $(if $(BR2_ENABLE_LOCALE),gettext libintl)
are you sure that the order is correct? Getting this proper for toplevel
parallel make would be fun:
# make sure to set JLEVEL=1
$ make oldconfig
$ rm -rf {toolchain,build,project}_*
$ make -j avahi
^ permalink raw reply [flat|nested] 41+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/avahi
2008-08-27 8:15 ` Bernhard Reutner-Fischer
@ 2008-08-27 8:28 ` Peter Korsgaard
0 siblings, 0 replies; 41+ messages in thread
From: Peter Korsgaard @ 2008-08-27 8:28 UTC (permalink / raw)
To: buildroot
>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
Hi,
>> -avahi: uclibc libdaemon $(AVAHI_TARGETS)
>> +avahi: uclibc libdaemon $(AVAHI_TARGETS) $(if $(BR2_ENABLE_LOCALE),gettext libintl)
Bernhard> are you sure that the order is correct? Getting this proper for toplevel
Bernhard> parallel make would be fun:
Bernhard> # make sure to set JLEVEL=1
Bernhard> $ make oldconfig
Bernhard> $ rm -rf {toolchain,build,project}_*
Bernhard> $ make -j avahi
No it isn't, but neither is the rest of buildroot ;) That's why we
don't support parallel toplevel make. For it to work we would have to
make the configure steps depend on the staging install of the user
libs, and so on.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-08-27 7:29 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-08-27 7:29 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-27 00:29:13 -0700 (Wed, 27 Aug 2008)
New Revision: 23233
Log:
avahi: don't depend on busybox
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-08-27 07:29:09 UTC (rev 23232)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-08-27 07:29:13 UTC (rev 23233)
@@ -180,7 +180,7 @@
$(TARGET_DIR)/usr/sbin/avahi-daemon
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
+avahi: uclibc libdaemon $(AVAHI_TARGETS)
avahi-clean:
-$(MAKE) -C $(AVAHI_DIR) distclean
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-08-04 19:08 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:08:15 -0700 (Mon, 04 Aug 2008)
New Revision: 23035
Log:
avahi: select expat
Modified:
trunk/buildroot/package/avahi/Config.in
Changeset:
Modified: trunk/buildroot/package/avahi/Config.in
===================================================================
--- trunk/buildroot/package/avahi/Config.in 2008-08-04 19:08:12 UTC (rev 23034)
+++ trunk/buildroot/package/avahi/Config.in 2008-08-04 19:08:15 UTC (rev 23035)
@@ -22,13 +22,9 @@
config BR2_PACKAGE_AVAHI_DAEMON
bool "mDNS/DNS-SD daemon"
depends on BR2_PACKAGE_AVAHI
- depends on BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_EXPAT
help
The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf
architecture (also known as "Rendezvous" or "Bonjour").
The daemon registers local IP addresses and services using
mDNS/DNS-SD.
-
-comment "mDNS/DNS-SD daemon - disabled (requires expat)"
- depends on BR2_PACKAGE_AVAHI
- depends on !BR2_PACKAGE_EXPAT
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-06-13 14:19 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-06-13 14:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-13 07:19:13 -0700 (Fri, 13 Jun 2008)
New Revision: 22325
Log:
avahi: make sure usr/lib/ exists
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-06-13 13:49:59 UTC (rev 22324)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-06-13 14:19:13 UTC (rev 22325)
@@ -164,7 +164,7 @@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
$(TARGET_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.installed
- mkdir -p $(TARGET_DIR)/etc/avahi/services
+ mkdir -p $(TARGET_DIR)/etc/avahi/services $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-03-31 19:56 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 19:56 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-31 12:56:58 -0700 (Mon, 31 Mar 2008)
New Revision: 21601
Log:
avahi: bump version
Modified:
trunk/buildroot/package/avahi/avahi.mk
trunk/buildroot/package/avahi/uclibc.patch
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-03-31 19:50:05 UTC (rev 21600)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-03-31 19:56:58 UTC (rev 21601)
@@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VERSION:=0.6.21
+AVAHI_VERSION:=0.6.22
AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VERSION)
AVAHI_SITE:=http://www.avahi.org/download/
AVAHI_SOURCE:=avahi-$(AVAHI_VERSION).tar.gz
@@ -120,6 +120,7 @@
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--disable-glib \
+ --disable-gobject \
--disable-qt3 \
--disable-qt4 \
--disable-gtk \
Modified: trunk/buildroot/package/avahi/uclibc.patch
===================================================================
--- trunk/buildroot/package/avahi/uclibc.patch 2008-03-31 19:50:05 UTC (rev 21600)
+++ trunk/buildroot/package/avahi/uclibc.patch 2008-03-31 19:56:58 UTC (rev 21601)
@@ -1,11 +1,11 @@
-diff -urN avahi-0.6.14-orig/avahi-core/socket.c avahi-0.6.14/avahi-core/socket.c
---- avahi-0.6.14-orig/avahi-core/socket.c 2006-08-31 10:18:03.000000000 -0700
-+++ avahi-0.6.14/avahi-core/socket.c 2006-09-21 19:01:31.000000000 -0700
-@@ -394,13 +394,13 @@
+diff -urpN avahi-0.6.22.orig/avahi-core/socket.c avahi-0.6.22/avahi-core/socket.c
+--- avahi-0.6.22.orig/avahi-core/socket.c 2007-12-16 22:03:08.000000000 +0100
++++ avahi-0.6.22/avahi-core/socket.c 2008-03-31 17:13:24.000000000 +0200
+@@ -394,13 +394,13 @@ int avahi_open_socket_ipv6(int no_reuse)
avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno));
goto fail;
}
--
+-
+#ifdef IPV6_V6ONLY
yes = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
^ permalink raw reply [flat|nested] 41+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-03-31 19:43 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 19:43 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-31 12:43:50 -0700 (Mon, 31 Mar 2008)
New Revision: 21599
Log:
avahi: make sure /etc/dbus-1/system.d exists in target dir
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-03-31 19:36:08 UTC (rev 21598)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-03-31 19:43:50 UTC (rev 21599)
@@ -171,6 +171,7 @@
ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
cp -dpf $(STAGING_DIR)/usr/bin/avahi-* $(TARGET_DIR)/usr/bin
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/avahi-*
+ mkdir -p $(TARGET_DIR)/etc/dbus-1/system.d/
cp -r $(STAGING_DIR)/etc/dbus-1/system.d/avahi-* \
$(TARGET_DIR)/etc/dbus-1/system.d/
endif
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-03-31 14:28 jacmet at uclibc.org
2008-04-04 1:52 ` Hebbar
0 siblings, 1 reply; 41+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 14:28 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-31 07:28:38 -0700 (Mon, 31 Mar 2008)
New Revision: 21594
Log:
avahi: depend on dbus-daemon in staging_dir
Depend on dbus-daemon in staging_dir instead of in target_dir as
fakeroot updates the timestamp on the target_dir version every time,
so the avahi makefile thinks it always needs to recompile avahi.
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-03-31 09:51:59 UTC (rev 21593)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-03-31 14:28:38 UTC (rev 21594)
@@ -37,7 +37,7 @@
ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
AVAHI_DISABLE_DBUS:=
-AVAHI_EXTRA_DEPS+=$(TARGET_DIR)/usr/bin/dbus-daemon
+AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/bin/dbus-daemon
else
AVAHI_DISABLE_DBUS:=--disable-dbus
endif
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2008-03-31 14:28 jacmet at uclibc.org
@ 2008-04-04 1:52 ` Hebbar
2008-04-04 7:31 ` Peter Korsgaard
0 siblings, 1 reply; 41+ messages in thread
From: Hebbar @ 2008-04-04 1:52 UTC (permalink / raw)
To: buildroot
>
>Author: jacmet
>Date: 2008-03-31 07:28:38 -0700 (Mon, 31 Mar 2008)
>New Revision: 21594
>
>Log:
>avahi: depend on dbus-daemon in staging_dir
>
>Depend on dbus-daemon in staging_dir instead of in target_dir as
>fakeroot updates the timestamp on the target_dir version every time,
>so the avahi makefile thinks it always needs to recompile avahi.
Hi jacmet,
Thanks for this info. i always wondered why libusb, ncurses , zlib used to
run at the end everytime i give make world. when i looked at the respective
make file, i found that in (package): option, respective target_dir lib
files are mentioned which rather should point to staging_dir/usr/lib library
files. kindly let me know if this is correct. if correct, then i can send
pacthes to change this.
Regards
Gururaja
ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY)
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-avahi-tp16400626p16477104.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2008-04-04 1:52 ` Hebbar
@ 2008-04-04 7:31 ` Peter Korsgaard
2008-04-04 8:28 ` Gururaja Hebbar K R
0 siblings, 1 reply; 41+ messages in thread
From: Peter Korsgaard @ 2008-04-04 7:31 UTC (permalink / raw)
To: buildroot
>>>>> "Hebbar" == Hebbar <gururajakr@sanyo.co.in> writes:
>>
>> Author: jacmet
>> Date: 2008-03-31 07:28:38 -0700 (Mon, 31 Mar 2008)
>> New Revision: 21594
>>
>> Log:
>> avahi: depend on dbus-daemon in staging_dir
>>
>> Depend on dbus-daemon in staging_dir instead of in target_dir as
>> fakeroot updates the timestamp on the target_dir version every time,
>> so the avahi makefile thinks it always needs to recompile avahi.
Hebbar> Hi jacmet,
Hebbar> Thanks for this info. i always wondered why libusb, ncurses ,
Hebbar> zlib used to run at the end everytime i give make world. when
Hebbar> i looked at the respective make file, i found that in
Hebbar> (package): option, respective target_dir lib files are
Hebbar> mentioned which rather should point to staging_dir/usr/lib
Hebbar> library files. kindly let me know if this is correct. if
Hebbar> correct, then i can send pacthes to change this.
Do you still have that problem now?
Hebbar> Regards
Hebbar> Gururaja
Hebbar> ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
Hebbar> zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
Hebbar> libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY)
No, this seems correct to me. We need the files installed in
TARGET_DIR, so they cannot depend on the files in STAGING_DIR.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2008-04-04 7:31 ` Peter Korsgaard
@ 2008-04-04 8:28 ` Gururaja Hebbar K R
0 siblings, 0 replies; 41+ messages in thread
From: Gururaja Hebbar K R @ 2008-04-04 8:28 UTC (permalink / raw)
To: buildroot
Hi,
>Do you still have that problem now?
i have attached the output of my make world below. this happens even if
i type "make world" continuously like 5 times. As you said, if fakeroot
updates the timestamp of ncurses and zlib libraries, make target simply
runs targets $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) &
$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) irrespective of whether it
is actually needed.
> > Hebbar> ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
>
> > Hebbar> zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
>
> > Hebbar> libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY)
>
> No, this seems correct to me. We need the files installed in
TARGET_DIR, so they cannot depend on the files in STAGING_DIR.
I know this files need to be installed in target dir but i am little
confused about the target options points to $(TARGET_DIR)/ instead of
pointing to staging_dir
Thanks in advance
Regards
Gururaja
<snip>
<snip>
rm -rf /opt/buildroot/project_build_arm/uclibc/buildroot-config
mkdir -p /opt/buildroot/project_build_arm/uclibc
cp -dpRf package/config/buildroot-config
/opt/buildroot/project_build_arm/uclibc/buildroot-config
mkdir -p /opt/buildroot/project_build_arm/uclibc/root/usr/include
cp -dpf /opt/buildroot/build_arm/ncurses-5.6/include/curses.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/ncurses.h
cp -dpf /opt/buildroot/build_arm/ncurses-5.6/include/ncurses_dll.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/ncurses_dll.h
cp -dpf /opt/buildroot/build_arm/ncurses-5.6/include/term.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/
cp -dpf /opt/buildroot/build_arm/ncurses-5.6/include/unctrl.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/
cp -dpf /opt/buildroot/build_arm/ncurses-5.6/include/termcap.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/
cp -dpf /opt/buildroot/build_arm/ncurses-5.6/lib/libncurses.a
/opt/buildroot/project_build_arm/uclibc/root/usr/lib/
(cd /opt/buildroot/project_build_arm/uclibc/root/usr/lib; \
ln -fs libncurses.a libcurses.a; \
ln -fs libncurses.a libtermcap.a; \
)
(cd /opt/buildroot/project_build_arm/uclibc/root/usr/include; ln -fs
ncurses.h curses.h)
rm -f /opt/buildroot/project_build_arm/uclibc/root/lib/libncurses.so
(cd /opt/buildroot/project_build_arm/uclibc/root/usr/lib; ln -fs
../../lib/libncurses.so.5.6 libncurses.so)
/opt/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibcgnueabi-str
ip --remove-section=.comment --remove-section=.note --strip-unneeded
/opt/buildroot/project_build_arm/uclibc/root/lib/libncurses.so.5.6
touch -c
/opt/buildroot/project_build_arm/uclibc/root/usr/lib/libncurses.a
mkdir -p /opt/buildroot/project_build_arm/uclibc/root/usr/include
/opt/buildroot/project_build_arm/uclibc/root/usr/lib
cp -dpf /opt/buildroot/build_arm/staging_dir/usr/include/zlib.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/
cp -dpf /opt/buildroot/build_arm/staging_dir/usr/include/zconf.h
/opt/buildroot/project_build_arm/uclibc/root/usr/include/
cp -dpf /opt/buildroot/build_arm/staging_dir/usr/lib/libz.a
/opt/buildroot/project_build_arm/uclibc/root/usr/lib/
rm -f /opt/buildroot/project_build_arm/uclibc/root/lib/libz.so
/opt/buildroot/project_build_arm/uclibc/root/usr/lib/libz.so
ln -sf libz.so.1.2.3
/opt/buildroot/project_build_arm/uclibc/root/usr/lib/libz.so
touch -c /opt/buildroot/project_build_arm/uclibc/root/usr/lib/libz.a
rm -rf /opt/buildroot/project_build_arm/uclibc/root/usr/include
find /opt/buildroot/project_build_arm/uclibc/root/usr/lib -name '*.a'
-delete
find /opt/buildroot/project_build_arm/uclibc/root/lib -name '*.a'
-delete
find /opt/buildroot/project_build_arm/uclibc/root/usr/lib -name '*.la'
-delete
find /opt/buildroot/project_build_arm/uclibc/root/lib -name '*.la'
-delete
<snip>
<snip>
<snip>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-03-06 17:54 ninevoltz at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 17:54 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 09:54:47 -0800 (Thu, 06 Mar 2008)
New Revision: 21180
Log:
makefile cleanup for avahi
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-03-06 17:54:27 UTC (rev 21179)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-03-06 17:54:47 UTC (rev 21180)
@@ -145,11 +145,13 @@
touch $@
$(AVAHI_DIR)/.installed: $(AVAHI_DIR)/.compiled
+ mkdir -p $(STAGING_DIR)/etc/avahi
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR) install
touch $@
$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
mkdir -p $(TARGET_DIR)/etc/avahi
+ mkdir -p $(TARGET_DIR)/etc/init.d
mkdir -p $(TARGET_DIR)/var/lib
mkdir -p $(TARGET_DIR)/usr/share/udhcpc
cp -af $(STAGING_DIR)/etc/avahi/avahi-autoipd.action $(TARGET_DIR)/etc/avahi/
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2008-01-26 7:56 thomasez at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: thomasez at uclibc.org @ 2008-01-26 7:56 UTC (permalink / raw)
To: buildroot
Author: thomasez
Date: 2008-01-25 23:55:58 -0800 (Fri, 25 Jan 2008)
New Revision: 20904
Log:
Mail from Claus Klein:
make sure than target dir exist bevor instll to it:
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2008-01-25 22:46:34 UTC (rev 20903)
+++ trunk/buildroot/package/avahi/avahi.mk 2008-01-26 07:55:58 UTC (rev 20904)
@@ -151,6 +151,7 @@
$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
mkdir -p $(TARGET_DIR)/etc/avahi
mkdir -p $(TARGET_DIR)/var/lib
+ mkdir -p $(TARGET_DIR)/usr/share/udhcpc
cp -af $(STAGING_DIR)/etc/avahi/avahi-autoipd.action $(TARGET_DIR)/etc/avahi/
cp -af $(BASE_DIR)/package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-29 13:04 ulf at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 13:04 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 05:04:41 -0800 (Thu, 29 Nov 2007)
New Revision: 20587
Log:
Make avahi depend on packets, instead of selecting them
Modified:
trunk/buildroot/package/avahi/Config.in
Changeset:
Modified: trunk/buildroot/package/avahi/Config.in
===================================================================
--- trunk/buildroot/package/avahi/Config.in 2007-11-29 13:03:56 UTC (rev 20586)
+++ trunk/buildroot/package/avahi/Config.in 2007-11-29 13:04:41 UTC (rev 20587)
@@ -24,9 +24,13 @@
bool "mDNS/DNS-SD daemon"
default n
depends on BR2_PACKAGE_AVAHI
- select BR2_PACKAGE_EXPAT
+ depends BR2_PACKAGE_EXPAT
help
The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf
architecture (also known as "Rendezvous" or "Bonjour").
The daemon registers local IP addresses and services using
mDNS/DNS-SD.
+
+comment "mDNS/DNS-SD daemon - disabled (requires expat)"
+ depends on BR2_PACKAGE_AVAHI
+ depends !BR2_PACKAGE_EXPAT
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-26 15:39 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-11-26 15:39 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-26 07:39:02 -0800 (Mon, 26 Nov 2007)
New Revision: 20545
Log:
Ups, TARGET_CONFIGURE_* is needed to find pkg-config (r20501)
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-11-26 14:54:15 UTC (rev 20544)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-11-26 15:39:02 UTC (rev 20545)
@@ -55,6 +55,8 @@
$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXTRA_DEPS)
(cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
(cd $(AVAHI_DIR) && \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
ac_cv_func_strtod=yes \
ac_fsusage_space=yes \
fu_cv_sys_stat_statfs2_bsize=yes \
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-26 13:02 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-11-26 13:02 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-26 05:02:21 -0800 (Mon, 26 Nov 2007)
New Revision: 20543
Log:
Install dbus before avahi so dbus directories are available
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-11-26 12:23:13 UTC (rev 20542)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-11-26 13:02:21 UTC (rev 20543)
@@ -37,7 +37,7 @@
ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
AVAHI_DISABLE_DBUS:=
-AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/lib/libdbus-1.so
+AVAHI_EXTRA_DEPS+=$(TARGET_DIR)/usr/bin/dbus-daemon
else
AVAHI_DISABLE_DBUS:=--disable-dbus
endif
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-26 12:23 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-11-26 12:23 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-26 04:23:13 -0800 (Mon, 26 Nov 2007)
New Revision: 20542
Log:
Create target file at end of rule so it gets rerun on failure on any of the
sub steps (thanks Ulf).
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-11-26 07:23:27 UTC (rev 20541)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-11-26 12:23:13 UTC (rev 20542)
@@ -147,32 +147,31 @@
touch $@
$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
- cp $(STAGING_DIR)/usr/sbin/avahi-autoipd \
- $(TARGET_DIR)/usr/sbin/avahi-autoipd
mkdir -p $(TARGET_DIR)/etc/avahi
mkdir -p $(TARGET_DIR)/var/lib
- ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
cp -af $(STAGING_DIR)/etc/avahi/avahi-autoipd.action $(TARGET_DIR)/etc/avahi/
cp -af $(BASE_DIR)/package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
- cp -af $(BASE_DIR)/package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
+ cp -af $(BASE_DIR)/package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
+ cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $(TARGET_DIR)/usr/sbin/avahi-autoipd
+ ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
$(TARGET_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.installed
- cp $(STAGING_DIR)/usr/sbin/avahi-daemon \
- $(TARGET_DIR)/usr/sbin/avahi-daemon
- cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
mkdir -p $(TARGET_DIR)/etc/avahi/services
+ cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/
cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
cp -dpf $(STAGING_DIR)/usr/bin/avahi-* $(TARGET_DIR)/usr/bin
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/avahi-*
cp -r $(STAGING_DIR)/etc/dbus-1/system.d/avahi-* \
$(TARGET_DIR)/etc/dbus-1/system.d/
endif
+ cp $(STAGING_DIR)/usr/sbin/avahi-daemon \
+ $(TARGET_DIR)/usr/sbin/avahi-daemon
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-23 15:45 jacmet at uclibc.org
2007-11-23 16:30 ` Ulf Samuelsson
0 siblings, 1 reply; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 15:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 07:45:30 -0800 (Fri, 23 Nov 2007)
New Revision: 20503
Log:
Cleaned up install + clean targets, handle dbus files
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-11-23 15:40:32 UTC (rev 20502)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-11-23 15:45:30 UTC (rev 20503)
@@ -142,12 +142,13 @@
$(MAKE) -C $(AVAHI_DIR)
touch $@
-$(STAGING_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-autoipd install
- touch -c $@
+$(AVAHI_DIR)/.installed: $(AVAHI_DIR)/.compiled
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR) install
+ touch $@
-$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/usr/sbin/avahi-autoipd
- cp $^ $@
+$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
+ cp $(STAGING_DIR)/usr/sbin/avahi-autoipd \
+ $(TARGET_DIR)/usr/sbin/avahi-autoipd
mkdir -p $(TARGET_DIR)/etc/avahi
mkdir -p $(TARGET_DIR)/var/lib
ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
@@ -157,34 +158,32 @@
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-$(STAGING_DIR)/usr/lib/libavahi-common.so: $(AVAHI_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-common install
- touch -c $@
-
-$(STAGING_DIR)/usr/lib/libavahi-core.so: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-common.so
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-core install
- touch -c $@
-
-$(STAGING_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-core.so $(STAGING_DIR)/usr/lib/libavahi-common.so
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-daemon install
- touch -c $@
-
-$(TARGET_DIR)/usr/sbin/avahi-daemon: $(STAGING_DIR)/usr/sbin/avahi-daemon
- cp $^ $@
- cp -dpf $(STAGING_DIR)/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.installed
+ cp $(STAGING_DIR)/usr/sbin/avahi-daemon \
+ $(TARGET_DIR)/usr/sbin/avahi-daemon
+ cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
mkdir -p $(TARGET_DIR)/etc/avahi/services
+ cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/
cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
+ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
+ cp -dpf $(STAGING_DIR)/usr/bin/avahi-* $(TARGET_DIR)/usr/bin
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/avahi-*
+ cp -r $(STAGING_DIR)/etc/dbus-1/system.d/avahi-* \
+ $(TARGET_DIR)/etc/dbus-1/system.d/
+endif
avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
avahi-clean:
$(MAKE) -C $(AVAHI_DIR) distclean
- rm -rf $(TARGET_DIR)/etc/avahi
- rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
- rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
- rm -f $(TARGET_DIR)/usr/sbin/avahi-*
+ -rm -rf $(TARGET_DIR)/etc/avahi
+ -rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
+ -rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
+ -rm -f $(TARGET_DIR)/usr/sbin/avahi-*
+ -rm -f $(TARGET_DIR)/usr/bin/avahi-*
+ -rm -f $(TARGET_DIR)/usr/lib/libavahi-*
avahi-dirclean:
rm -rf $(AVAHI_DIR)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2007-11-23 15:45 jacmet at uclibc.org
@ 2007-11-23 16:30 ` Ulf Samuelsson
0 siblings, 0 replies; 41+ messages in thread
From: Ulf Samuelsson @ 2007-11-23 16:30 UTC (permalink / raw)
To: buildroot
Subject: [Buildroot] svn commit: trunk/buildroot/package/avahi
> Author: jacmet
> Date: 2007-11-23 07:45:30 -0800 (Fri, 23 Nov 2007)
> New Revision: 20503
>
It looks like avahi is broken.
If you have a dependency:
"a: x
create a
create b
create c"
and create b fails, then the next time "make" is run,a is present,
so the build will not try to create "b" or "c".
Pls fix the patch so that everything needs to be completed correctly.
> Log:
> Cleaned up install + clean targets, handle dbus files
>
> Modified:
> trunk/buildroot/package/avahi/avahi.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/avahi/avahi.mk
> ===================================================================
> --- trunk/buildroot/package/avahi/avahi.mk 2007-11-23 15:40:32 UTC (rev 20502)
> +++ trunk/buildroot/package/avahi/avahi.mk 2007-11-23 15:45:30 UTC (rev 20503)
> @@ -142,12 +142,13 @@
> $(MAKE) -C $(AVAHI_DIR)
> touch $@
>
> -$(STAGING_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.compiled
> - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-autoipd install
> - touch -c $@
> +$(AVAHI_DIR)/.installed: $(AVAHI_DIR)/.compiled
> + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR) install
> + touch $@
>
> -$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/usr/sbin/avahi-autoipd
> - cp $^ $@
> +$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
> + cp $(STAGING_DIR)/usr/sbin/avahi-autoipd \
> + $(TARGET_DIR)/usr/sbin/avahi-autoipd
> mkdir -p $(TARGET_DIR)/etc/avahi
> mkdir -p $(TARGET_DIR)/var/lib
> ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
> @@ -157,34 +158,32 @@
> chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
> $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
>
> -$(STAGING_DIR)/usr/lib/libavahi-common.so: $(AVAHI_DIR)/.compiled
> - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-common install
> - touch -c $@
> -
> -$(STAGING_DIR)/usr/lib/libavahi-core.so: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-common.so
> - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-core install
> - touch -c $@
> -
> -$(STAGING_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-core.so $(STAGING_DIR)/usr/lib/libavahi-common.so
> - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-daemon install
> - touch -c $@
> -
> -$(TARGET_DIR)/usr/sbin/avahi-daemon: $(STAGING_DIR)/usr/sbin/avahi-daemon
> - cp $^ $@
> - cp -dpf $(STAGING_DIR)/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
> +$(TARGET_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.installed
> + cp $(STAGING_DIR)/usr/sbin/avahi-daemon \
> + $(TARGET_DIR)/usr/sbin/avahi-daemon
> + cp -dpf $(STAGING_DIR)/usr/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
> mkdir -p $(TARGET_DIR)/etc/avahi/services
> + cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/
> cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
> $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
> $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so*
> +ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
> + cp -dpf $(STAGING_DIR)/usr/bin/avahi-* $(TARGET_DIR)/usr/bin
> + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/avahi-*
> + cp -r $(STAGING_DIR)/etc/dbus-1/system.d/avahi-* \
> + $(TARGET_DIR)/etc/dbus-1/system.d/
> +endif
>
> avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
>
> avahi-clean:
> $(MAKE) -C $(AVAHI_DIR) distclean
> - rm -rf $(TARGET_DIR)/etc/avahi
> - rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
> - rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
> - rm -f $(TARGET_DIR)/usr/sbin/avahi-*
> + -rm -rf $(TARGET_DIR)/etc/avahi
> + -rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
> + -rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
> + -rm -f $(TARGET_DIR)/usr/sbin/avahi-*
> + -rm -f $(TARGET_DIR)/usr/bin/avahi-*
> + -rm -f $(TARGET_DIR)/usr/lib/libavahi-*
>
> avahi-dirclean:
> rm -rf $(AVAHI_DIR)
>
> _______________________________________________
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-23 15:40 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 15:40 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 07:40:32 -0800 (Fri, 23 Nov 2007)
New Revision: 20502
Log:
Removed redundant configure settings
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-11-23 13:24:55 UTC (rev 20501)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-11-23 15:40:32 UTC (rev 20502)
@@ -113,17 +113,8 @@
--host=$(REAL_GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
--sysconfdir=/etc \
- --datadir=/usr/share \
--localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--disable-glib \
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-11-23 13:24 jacmet at uclibc.org
2007-11-25 8:28 ` Ulf Samuelsson
0 siblings, 1 reply; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-11-23 13:24 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-11-23 05:24:55 -0800 (Fri, 23 Nov 2007)
New Revision: 20501
Log:
Compile in dbus support if available
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-11-23 13:23:25 UTC (rev 20500)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-11-23 13:24:55 UTC (rev 20501)
@@ -22,17 +22,26 @@
AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-autoipd
endif
+AVAHI_EXTRA_DEPS:=
+
ifeq ($(strip $(BR2_PACKAGE_AVAHI_DAEMON)),y)
AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-daemon
AVAHI_DISABLE_EXPAT:=
# depend on the exact library file instead of expat so avahi isn't always
# considered out-of-date
-AVAHI_EXPAT_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
AVAHI_DISABLE_EXPAT:=--disable-expat
-AVAHI_EXPAT_DEP:=
+
endif
+ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
+AVAHI_DISABLE_DBUS:=
+AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/lib/libdbus-1.so
+else
+AVAHI_DISABLE_DBUS:=--disable-dbus
+endif
+
$(DL_DIR)/$(AVAHI_SOURCE):
$(WGET) -P $(DL_DIR) $(AVAHI_SITE)/$(AVAHI_SOURCE)
@@ -43,13 +52,9 @@
toolchain/patch-kernel.sh $(AVAHI_DIR) package/avahi/ \*.patch
touch $@
-$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
+$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXTRA_DEPS)
(cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
(cd $(AVAHI_DIR) && \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/usr/include" \
- LIBDAEMON_LIBS="-L$(STAGING_DIR)/lib -ldaemon" \
ac_cv_func_strtod=yes \
ac_fsusage_space=yes \
fu_cv_sys_stat_statfs2_bsize=yes \
@@ -125,7 +130,7 @@
--disable-qt3 \
--disable-qt4 \
--disable-gtk \
- --disable-dbus \
+ $(AVAHI_DISABLE_DBUS) \
$(AVAHI_DISABLE_EXPAT) \
--disable-gdbm \
--disable-python \
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2007-11-23 13:24 jacmet at uclibc.org
@ 2007-11-25 8:28 ` Ulf Samuelsson
2007-11-26 12:56 ` Peter Korsgaard
0 siblings, 1 reply; 41+ messages in thread
From: Ulf Samuelsson @ 2007-11-25 8:28 UTC (permalink / raw)
To: buildroot
fre 2007-11-23 klockan 05:24 -0800 skrev jacmet at uclibc.org:
> Author: jacmet
> Date: 2007-11-23 05:24:55 -0800 (Fri, 23 Nov 2007)
> New Revision: 20501
>
> Log:
> Compile in dbus support if available
>
> Modified:
> trunk/buildroot/package/avahi/avahi.mk
Could you please try this patch.
I dont have the time to test it right now.
>
> Changeset:
> Modified: trunk/buildroot/package/avahi/avahi.mk
> ===================================================================
> --- trunk/buildroot/package/avahi/avahi.mk 2007-11-23 13:23:25 UTC (rev 20500)
> +++ trunk/buildroot/package/avahi/avahi.mk 2007-11-23 13:24:55 UTC (rev 20501)
> @@ -22,17 +22,26 @@
> AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-autoipd
> endif
>
> +AVAHI_EXTRA_DEPS:=
> +
> ifeq ($(strip $(BR2_PACKAGE_AVAHI_DAEMON)),y)
> AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-daemon
> AVAHI_DISABLE_EXPAT:=
> # depend on the exact library file instead of expat so avahi isn't always
> # considered out-of-date
> -AVAHI_EXPAT_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
> +AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/lib/libexpat.so.1
> else
> AVAHI_DISABLE_EXPAT:=--disable-expat
> -AVAHI_EXPAT_DEP:=
> +
> endif
>
> +ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
> +AVAHI_DISABLE_DBUS:=
> +AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/lib/libdbus-1.so
> +else
> +AVAHI_DISABLE_DBUS:=--disable-dbus
> +endif
> +
> $(DL_DIR)/$(AVAHI_SOURCE):
> $(WGET) -P $(DL_DIR) $(AVAHI_SITE)/$(AVAHI_SOURCE)
>
> @@ -43,13 +52,9 @@
> toolchain/patch-kernel.sh $(AVAHI_DIR) package/avahi/ \*.patch
> touch $@
>
> -$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
> +$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXTRA_DEPS)
> (cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
> (cd $(AVAHI_DIR) && \
> - $(TARGET_CONFIGURE_OPTS) \
> - $(TARGET_CONFIGURE_ARGS) \
> - LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/usr/include" \
> - LIBDAEMON_LIBS="-L$(STAGING_DIR)/lib -ldaemon" \
> ac_cv_func_strtod=yes \
> ac_fsusage_space=yes \
> fu_cv_sys_stat_statfs2_bsize=yes \
> @@ -125,7 +130,7 @@
> --disable-qt3 \
> --disable-qt4 \
> --disable-gtk \
> - --disable-dbus \
> + $(AVAHI_DISABLE_DBUS) \
> $(AVAHI_DISABLE_EXPAT) \
> --disable-gdbm \
> --disable-python \
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
--
Best Regards
Ulf Samuelsson
Atmel Nordic AB
Mail: Box 2033, 174 50 Sundbyberg
Visit:Kavalleriv?gen 24, 174 58 Sundbyberg
Phone: +46 8 441 54 22, GSM: +46 706 22 44 57
eMail: ulf at atmel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: avahi.patch
Type: text/x-patch
Size: 2218 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20071125/dbee2ce1/attachment.bin
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-09-03 9:02 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-09-03 9:02 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-09-03 02:02:10 -0700 (Mon, 03 Sep 2007)
New Revision: 19773
Log:
Bumped version
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-09-03 09:00:18 UTC (rev 19772)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-09-03 09:02:10 UTC (rev 19773)
@@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VERSION:=0.6.19
+AVAHI_VERSION:=0.6.21
AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VERSION)
AVAHI_SITE:=http://www.avahi.org/download/
AVAHI_SOURCE:=avahi-$(AVAHI_VERSION).tar.gz
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-08-28 8:05 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-08-28 8:05 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-08-28 01:05:25 -0700 (Tue, 28 Aug 2007)
New Revision: 19709
Log:
expat now installs into usr/lib
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-08-27 21:51:27 UTC (rev 19708)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-08-28 08:05:25 UTC (rev 19709)
@@ -27,7 +27,7 @@
AVAHI_DISABLE_EXPAT:=
# depend on the exact library file instead of expat so avahi isn't always
# considered out-of-date
-AVAHI_EXPAT_DEP:=$(STAGING_DIR)/lib/libexpat.so.1
+AVAHI_EXPAT_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
else
AVAHI_DISABLE_EXPAT:=--disable-expat
AVAHI_EXPAT_DEP:=
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-08-01 15:52 ulf at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: ulf at uclibc.org @ 2007-08-01 15:52 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-01 08:52:57 -0700 (Wed, 01 Aug 2007)
New Revision: 19391
Log:
Make avahi select LIBDAEMON instead of depending on it.
Modified:
trunk/buildroot/package/avahi/Config.in
Changeset:
Modified: trunk/buildroot/package/avahi/Config.in
===================================================================
--- trunk/buildroot/package/avahi/Config.in 2007-08-01 12:11:44 UTC (rev 19390)
+++ trunk/buildroot/package/avahi/Config.in 2007-08-01 15:52:57 UTC (rev 19391)
@@ -1,6 +1,6 @@
config BR2_PACKAGE_AVAHI
bool "avahi"
- depends on BR2_PACKAGE_LIBDAEMON
+ select BR2_PACKAGE_LIBDAEMON
default n
help
Avahi is a system which facilitates service
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-07-23 15:00 ulf at uclibc.org
2007-07-23 14:53 ` Bernhard Fischer
0 siblings, 1 reply; 41+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 15:00 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 08:00:37 -0700 (Mon, 23 Jul 2007)
New Revision: 19234
Log:
Make AVAHI depend on libdaemon
Modified:
trunk/buildroot/package/avahi/Config.in
Changeset:
Modified: trunk/buildroot/package/avahi/Config.in
===================================================================
--- trunk/buildroot/package/avahi/Config.in 2007-07-23 14:43:40 UTC (rev 19233)
+++ trunk/buildroot/package/avahi/Config.in 2007-07-23 15:00:37 UTC (rev 19234)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_AVAHI
bool "avahi"
+ depends on BR2_PACKAGE_LIBDAEMON
default n
help
Avahi is a system which facilitates service
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
2007-07-23 15:00 ulf at uclibc.org
@ 2007-07-23 14:53 ` Bernhard Fischer
0 siblings, 0 replies; 41+ messages in thread
From: Bernhard Fischer @ 2007-07-23 14:53 UTC (permalink / raw)
To: buildroot
On Mon, Jul 23, 2007 at 08:00:38AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-07-23 08:00:37 -0700 (Mon, 23 Jul 2007)
>New Revision: 19234
>
>Log:
>Make AVAHI depend on libdaemon
I think that a user will most likely not know that avahi depends on
libdaemon, so selecting libdaemon if avahi is selected sounds more
user-friendly to me. But then i don't use it, so feel free to ignore
this comment.
>
>Modified:
> trunk/buildroot/package/avahi/Config.in
>
>
>Changeset:
>Modified: trunk/buildroot/package/avahi/Config.in
>===================================================================
>--- trunk/buildroot/package/avahi/Config.in 2007-07-23 14:43:40 UTC (rev 19233)
>+++ trunk/buildroot/package/avahi/Config.in 2007-07-23 15:00:37 UTC (rev 19234)
>@@ -1,5 +1,6 @@
> config BR2_PACKAGE_AVAHI
> bool "avahi"
>+ depends on BR2_PACKAGE_LIBDAEMON
> default n
> help
> Avahi is a system which facilitates service
>
>_______________________________________________
>buildroot mailing list
>buildroot at uclibc.org
>http://busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-06-12 15:19 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-06-12 15:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-06-12 08:19:27 -0700 (Tue, 12 Jun 2007)
New Revision: 18802
Log:
Bumped version
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-06-12 13:21:08 UTC (rev 18801)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-06-12 15:19:27 UTC (rev 18802)
@@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VER:=0.6.18
+AVAHI_VER:=0.6.19
AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VER)
AVAHI_SITE:=http://www.avahi.org/download/
AVAHI_SOURCE:=avahi-$(AVAHI_VER).tar.gz
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-05-15 9:45 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-05-15 9:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-15 02:45:21 -0700 (Tue, 15 May 2007)
New Revision: 18620
Log:
Don't use libssp as it doesn't get installed
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-05-15 09:33:57 UTC (rev 18619)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-05-15 09:45:21 UTC (rev 18620)
@@ -135,6 +135,7 @@
--disable-pygtk \
--disable-mono \
--disable-monodoc \
+ --disable-stack-protector \
--with-distro=none \
--with-avahi-user=default \
--with-avahi-group=default \
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-05-09 14:03 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-05-09 14:03 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-09 07:03:32 -0700 (Wed, 09 May 2007)
New Revision: 18592
Log:
init scripts should be executable
Modified:
trunk/buildroot/package/avahi/S50avahi-daemon
Changeset:
Property changes on: trunk/buildroot/package/avahi/S50avahi-daemon
___________________________________________________________________
Name: svn:executable
+ *
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-05-09 13:38 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-05-09 13:38 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-09 06:38:37 -0700 (Wed, 09 May 2007)
New Revision: 18591
Log:
avahi-daemon support
Added:
trunk/buildroot/package/avahi/S50avahi-daemon
Modified:
trunk/buildroot/package/avahi/Config.in
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/Config.in
===================================================================
--- trunk/buildroot/package/avahi/Config.in 2007-05-09 12:50:08 UTC (rev 18590)
+++ trunk/buildroot/package/avahi/Config.in 2007-05-09 13:38:37 UTC (rev 18591)
@@ -2,7 +2,30 @@
bool "avahi"
default n
help
- Avahi is a system which facilitates service
- discovery on a local network.
+ Avahi is a system which facilitates service
+ discovery on a local network.
http://www.avahi.org/
+
+config BR2_PACKAGE_AVAHI_AUTOIPD
+ bool " IPv4LL network address configuration daemon"
+ default y
+ depends on BR2_PACKAGE_AVAHI
+ help
+ Avahi-autoipd implements IPv4LL, "Dynamic Configuration of
+ IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for
+ automatic IP address configuration from the link-local
+ 169.254.0.0/16 range without the need for a central server.
+ It is primarily intended to be used in ad-hoc networks which
+ lack a DHCP server.
+
+config BR2_PACKAGE_AVAHI_DAEMON
+ bool " mDNS/DNS-SD daemon"
+ default n
+ depends on BR2_PACKAGE_AVAHI
+ select BR2_PACKAGE_EXPAT
+ help
+ The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf
+ architecture (also known as "Rendezvous" or "Bonjour").
+ The daemon registers local IP addresses and services using
+ mDNS/DNS-SD.
Added: trunk/buildroot/package/avahi/S50avahi-daemon
===================================================================
--- trunk/buildroot/package/avahi/S50avahi-daemon (rev 0)
+++ trunk/buildroot/package/avahi/S50avahi-daemon 2007-05-09 13:38:37 UTC (rev 18591)
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# avahi-daemon init script
+
+DAEMON=/usr/sbin/avahi-daemon
+case "$1" in
+ start)
+ $DAEMON -c || $DAEMON -D
+ ;;
+ stop)
+ $DAEMON -c && $DAEMON -k
+ ;;
+ reload)
+ $DAEMON -c && $DAEMON -r
+ ;;
+ *)
+ echo "Usage: S50avahi-daemon {start|stop|reload}" >&2
+ exit 1
+ ;;
+esac
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-05-09 12:50:08 UTC (rev 18590)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-05-09 13:38:37 UTC (rev 18591)
@@ -16,6 +16,23 @@
AVAHI_SOURCE:=avahi-$(AVAHI_VER).tar.gz
AVAHI_CAT:=$(ZCAT)
+AVAHI_TARGETS:=
+
+ifeq ($(strip $(BR2_PACKAGE_AVAHI_AUTOIPD)),y)
+AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-autoipd
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_AVAHI_DAEMON)),y)
+AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-daemon
+AVAHI_DISABLE_EXPAT:=
+# depend on the exact library file instead of expat so avahi isn't always
+# considered out-of-date
+AVAHI_EXPAT_DEP:=$(STAGING_DIR)/lib/libexpat.so.1
+else
+AVAHI_DISABLE_EXPAT:=--disable-expat
+AVAHI_EXPAT_DEP:=
+endif
+
$(DL_DIR)/$(AVAHI_SOURCE):
$(WGET) -P $(DL_DIR) $(AVAHI_SITE)/$(AVAHI_SOURCE)
@@ -26,7 +43,7 @@
toolchain/patch-kernel.sh $(AVAHI_DIR) package/avahi/ \*.patch
touch $(AVAHI_DIR)/.unpacked
-$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked
+$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
(cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
( \
cd $(AVAHI_DIR) && \
@@ -111,7 +128,7 @@
--disable-qt4 \
--disable-gtk \
--disable-dbus \
- --disable-expat \
+ $(AVAHI_DISABLE_EXPAT) \
--disable-gdbm \
--disable-python \
--disable-python-dbus \
@@ -132,7 +149,7 @@
$(STAGING_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-autoipd install
- touch -c $(STAGING_DIR)/usr/sbin/avahi-autoipd
+ touch -c $@
$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/usr/sbin/avahi-autoipd
cp $^ $@
@@ -145,13 +162,34 @@
chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
$(STRIP) --strip-unneeded $@
-avahi: uclibc busybox libdaemon $(TARGET_DIR)/usr/sbin/avahi-autoipd
+$(STAGING_DIR)/usr/lib/libavahi-common.so: $(AVAHI_DIR)/.compiled
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-common install
+ touch -c $@
+$(STAGING_DIR)/usr/lib/libavahi-core.so: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-common.so
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-core install
+ touch -c $@
+
+$(STAGING_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-core.so $(STAGING_DIR)/usr/lib/libavahi-common.so
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-daemon install
+ touch -c $@
+
+$(TARGET_DIR)/usr/sbin/avahi-daemon: $(STAGING_DIR)/usr/sbin/avahi-daemon
+ cp $^ $@
+ cp -dpf $(STAGING_DIR)/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
+ mkdir -p $(TARGET_DIR)/etc/avahi/services
+ cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
+ $(STRIP) --strip-unneeded $@
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libavahi-*.so*
+
+avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
+
avahi-clean:
$(MAKE) -C $(AVAHI_DIR) distclean
rm -rf $(TARGET_DIR)/etc/avahi
rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
+ rm -f $(TARGET_DIR)/usr/sbin/avahi-*
avahi-dirclean:
rm -rf $(AVAHI_DIR)
^ permalink raw reply [flat|nested] 41+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-05-08 15:57 jacmet at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: jacmet at uclibc.org @ 2007-05-08 15:57 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-05-08 08:57:31 -0700 (Tue, 08 May 2007)
New Revision: 18584
Log:
Bumped version
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-05-08 15:19:13 UTC (rev 18583)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-05-08 15:57:31 UTC (rev 18584)
@@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VER:=0.6.14
+AVAHI_VER:=0.6.18
AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VER)
AVAHI_SITE:=http://www.avahi.org/download/
AVAHI_SOURCE:=avahi-$(AVAHI_VER).tar.gz
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/avahi
@ 2007-01-22 18:15 andersen at uclibc.org
0 siblings, 0 replies; 41+ messages in thread
From: andersen at uclibc.org @ 2007-01-22 18:15 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-22 10:15:35 -0800 (Mon, 22 Jan 2007)
New Revision: 17470
Log:
fix installation location
Modified:
trunk/buildroot/package/avahi/avahi.mk
Changeset:
Modified: trunk/buildroot/package/avahi/avahi.mk
===================================================================
--- trunk/buildroot/package/avahi/avahi.mk 2007-01-22 18:15:15 UTC (rev 17469)
+++ trunk/buildroot/package/avahi/avahi.mk 2007-01-22 18:15:35 UTC (rev 17470)
@@ -129,11 +129,11 @@
$(MAKE) -C $(AVAHI_DIR)
touch $(AVAHI_DIR)/.compiled
-$(STAGING_DIR)/sbin/avahi-autoipd: $(AVAHI_DIR)/.compiled
+$(STAGING_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-autoipd install
- touch -c $(STAGING_DIR)/sbin/avahi-autoipd
+ touch -c $(STAGING_DIR)/usr/sbin/avahi-autoipd
-$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/sbin/avahi-autoipd
+$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/usr/sbin/avahi-autoipd
cp $^ $@
mkdir -p $(TARGET_DIR)/etc/avahi
mkdir -p $(TARGET_DIR)/var/lib
^ permalink raw reply [flat|nested] 41+ messages in thread
end of thread, other threads:[~2009-01-28 15:12 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-24 16:02 [Buildroot] svn commit: trunk/buildroot/package/avahi correa at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-28 15:12 jacmet at uclibc.org
2008-12-15 16:09 jacmet at uclibc.org
2008-12-04 16:13 egtvedt at uclibc.org
2008-10-01 10:28 egtvedt at uclibc.org
2008-08-31 20:23 jacmet at uclibc.org
2008-08-27 7:29 jacmet at uclibc.org
2008-08-27 8:15 ` Bernhard Reutner-Fischer
2008-08-27 8:28 ` Peter Korsgaard
2008-08-27 7:29 jacmet at uclibc.org
2008-08-04 19:08 jacmet at uclibc.org
2008-06-13 14:19 jacmet at uclibc.org
2008-03-31 19:56 jacmet at uclibc.org
2008-03-31 19:43 jacmet at uclibc.org
2008-03-31 14:28 jacmet at uclibc.org
2008-04-04 1:52 ` Hebbar
2008-04-04 7:31 ` Peter Korsgaard
2008-04-04 8:28 ` Gururaja Hebbar K R
2008-03-06 17:54 ninevoltz at uclibc.org
2008-01-26 7:56 thomasez at uclibc.org
2007-11-29 13:04 ulf at uclibc.org
2007-11-26 15:39 jacmet at uclibc.org
2007-11-26 13:02 jacmet at uclibc.org
2007-11-26 12:23 jacmet at uclibc.org
2007-11-23 15:45 jacmet at uclibc.org
2007-11-23 16:30 ` Ulf Samuelsson
2007-11-23 15:40 jacmet at uclibc.org
2007-11-23 13:24 jacmet at uclibc.org
2007-11-25 8:28 ` Ulf Samuelsson
2007-11-26 12:56 ` Peter Korsgaard
2007-09-03 9:02 jacmet at uclibc.org
2007-08-28 8:05 jacmet at uclibc.org
2007-08-01 15:52 ulf at uclibc.org
2007-07-23 15:00 ulf at uclibc.org
2007-07-23 14:53 ` Bernhard Fischer
2007-06-12 15:19 jacmet at uclibc.org
2007-05-15 9:45 jacmet at uclibc.org
2007-05-09 14:03 jacmet at uclibc.org
2007-05-09 13:38 jacmet at uclibc.org
2007-05-08 15:57 jacmet at uclibc.org
2007-01-22 18:15 andersen 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