avahi-autoipd: fix issue with repeated builds
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 28 Jan 2009 15:12:05 +0000 (15:12 -0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 28 Jan 2009 15:12:05 +0000 (15:12 -0000)
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.

package/avahi/avahi.mk

index f44ef1f3d627b7c0f1623bf68bb0182049c1e8c8..a013509d1794a5125273481c888251dc985ab38f 100644 (file)
@@ -158,6 +158,7 @@ $(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
        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) $@