Re: [OpenWrt-Devel] [PATCH] add pkgconfig information for popt library
I meant to mention that, as well as being A Good Thing in general, this would make is possible for me to bring shairport-sync (https://github.com/mikebrady/shairport-sync) over to OpenWrt without having to patch its configuration file. Modify makefile to record pkgconfig information for the popt library. Mike ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] add pkgconfig information for popt library
Modify makefile to record pkgconfig information for the popt library.
Signed-off-by: Mike Brady mikebr...@eircom.net
---
package/libs/popt/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/libs/popt/Makefile b/package/libs/popt/Makefile
index bd2e6e2..b31b311 100644
--- a/package/libs/popt/Makefile
+++ b/package/libs/popt/Makefile
@@ -45,6 +45,8 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/popt.pc
$(1)/usr/lib/pkgconfig/
endef
define Package/libpopt/install
--
1.9.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Happy New Year
I hope you won't mind me wishing everybody a happy and productive 2014. Thanks for all your collective work on OpenWrt -- it is really a very impressive achievement from my perspective as a user and occasional contributor. Best wishes Mike Brady ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Transcend WiFi SD Cards running Linux?
Hi. It seems that Transcend WiFi cards are running some version of Linux. See: http://hackaday.com/2013/08/12/hacking-transcend-wifi-sd-cards/ Is anybody here familiar with any of that? Regards Mike ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Question about Target Profiles
I'm trying to figure out how to modify the set of packages included in the NSLU2 Target Profile on the current build, r37919, and I'm having no joy. Maybe I'm misunderstanding it, hence my email. Here is the profile file for the NSLU2: --- # # Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # define Profile/NSLU2 NAME:=Linksys NSLU2 PACKAGES:=-wpad-mini -kmod-ath5k kmod-scsi-core \ kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-storage \ kmod-fs-ext2 kmod-fs-ext3 endef define Profile/NSLU2/Description Package set optimized for the Linksys NSLU2 endef $(eval $(call Profile,NSLU2)) --- I interpret this to mean that it's removing wpad-mini and kmod-ath5k and adding kmod-scsi-core and the other kernel packages to the standard build. However, that doesn't seem to happen. If I do ./scripts/diffconfig.sh, I get this: mike@ubuntu:~/openwrt/reference$ ./scripts/diffconfig.sh CONFIG_TARGET_ixp4xx=y CONFIG_TARGET_ixp4xx_generic=y CONFIG_TARGET_ixp4xx_generic_NSLU2=y CONFIG_PACKAGE_MAC80211_DEBUGFS=y CONFIG_PACKAGE_MAC80211_MESH=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_kmod-ath=y CONFIG_PACKAGE_kmod-ath5k=y CONFIG_PACKAGE_kmod-cfg80211=y CONFIG_PACKAGE_kmod-crypto-aes=y CONFIG_PACKAGE_kmod-crypto-arc4=y CONFIG_PACKAGE_kmod-crypto-core=y CONFIG_PACKAGE_kmod-crypto-hash=y CONFIG_PACKAGE_kmod-crypto-manager=y CONFIG_PACKAGE_kmod-crypto-pcompress=y CONFIG_PACKAGE_kmod-mac80211=y # CONFIG_PACKAGE_kmod-nls-base is not set # CONFIG_PACKAGE_kmod-scsi-core is not set # CONFIG_PACKAGE_kmod-usb-core is not set # CONFIG_PACKAGE_kmod-usb-ohci is not set # CONFIG_PACKAGE_kmod-usb-storage is not set # CONFIG_PACKAGE_kmod-usb2 is not set CONFIG_PACKAGE_wpad-mini=y Oddly, as well as not setting kmod-usb-core to y as I would expect, additionally it is setting wpad-mini and kmod-ath5k to y despite being asked, if I understand correctly, to not include them. Can anybody tell me what's going on -- am I misunderstanding the use and significance of Target Profile file, or is there a real problem? Regards Mike ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Patch to procd/logread.c -- See Ticket #14079
This patch fixes a problem with the logread utility built into procd.
It adds a function to look up the correct priority and facility codes for
output.
Tested on r37834.
It fixes Ticket #14079.
Signed-off-by: Mike Bradymikebr...@eircom.net
--- a/logread.c
+++ b/logread.c
@@ -60,6 +60,8 @@ static const char *log_file, *log_ip, *l
static int log_type = LOG_STDOUT;
static int log_size, log_udp;
+const char* getcodetext(int value, CODE *codetable);
+
static void log_handle_reconnect(struct uloop_timeout *timeout)
{
sender.fd = usock((log_udp) ? (USOCK_UDP) : (USOCK_TCP), log_ip,
log_port);
@@ -149,7 +151,7 @@ static int log_notify(struct ubus_contex
}
} else {
snprintf(buf, sizeof(buf), %s %s.%s%s %s\n,
- c, facilitynames[LOG_FAC(p)].c_name,
prioritynames[LOG_PRI(p)].c_name,
+ c, getcodetext(LOG_FAC(p)3,facilitynames),
getcodetext(LOG_PRI(p),prioritynames),
(blobmsg_get_u32(tb[LOG_SOURCE])) ? () : ( kernel:),
method);
write(sender.fd, buf, strlen(buf));
@@ -217,6 +219,7 @@ enum {
__READ_MAX
};
+
static const struct blobmsg_policy read_policy[] = {
[READ_LINE] = { .name = lines, .type = BLOBMSG_TYPE_ARRAY },
};
@@ -252,7 +255,7 @@ static void read_cb(struct ubus_request
c[strlen(c) - 1] = '\0';
printf(%s %s.%s%s %s\n,
- c, facilitynames[LOG_FAC(p)].c_name,
prioritynames[LOG_PRI(p)].c_name,
+ c, getcodetext(LOG_FAC(p)3,facilitynames),
getcodetext(LOG_PRI(p),prioritynames),
(blobmsg_get_u32(tb[LOG_SOURCE])) ? () : ( kernel:),
blobmsg_get_string(tb[LOG_MSG]));
}
@@ -339,3 +342,13 @@ int main(int argc, char **argv)
return 0;
}
+
+const char* getcodetext(int value, CODE *codetable) {
+ CODE *i;
+ if (value = 0)
+ for (i = codetable; i-c_val != -1; i++)
+ if (i-c_val == value)
+ return (i-c_name);
+ return (unknown);
+};
+
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Patch to procd/logread.c -- See Ticket #14079 [Second try: properly formatted patch]
This patch fixes a problem with the logread utility built into procd.
It adds a function to look up the correct priority and facility text strings
for output.
Tested on r37834.
It fixes Ticket #14079.
Signed-off-by: Mike Bradymikebr...@eircom.net
Index: package/system/procd/patches/010-fix-facility-and-priority-output.patch
===
--- package/system/procd/patches/010-fix-facility-and-priority-output.patch
(revision 0)
+++ package/system/procd/patches/010-fix-facility-and-priority-output.patch
(revision 0)
@@ -0,0 +1,51 @@
+--- a/logread.c
b/logread.c
+@@ -60,6 +60,8 @@ static const char *log_file, *log_ip, *l
+ static int log_type = LOG_STDOUT;
+ static int log_size, log_udp;
+
++const char* getcodetext(int value, CODE *codetable);
++
+ static void log_handle_reconnect(struct uloop_timeout *timeout)
+ {
+ sender.fd = usock((log_udp) ? (USOCK_UDP) : (USOCK_TCP), log_ip,
log_port);
+@@ -149,7 +151,7 @@ static int log_notify(struct ubus_contex
+ }
+ } else {
+ snprintf(buf, sizeof(buf), %s %s.%s%s %s\n,
+- c, facilitynames[LOG_FAC(p)].c_name,
prioritynames[LOG_PRI(p)].c_name,
++ c, getcodetext(LOG_FAC(p)3,facilitynames),
getcodetext(LOG_PRI(p),prioritynames),
+ (blobmsg_get_u32(tb[LOG_SOURCE])) ? () : ( kernel:),
+ method);
+ write(sender.fd, buf, strlen(buf));
+@@ -217,6 +219,7 @@ enum {
+ __READ_MAX
+ };
+
++
+ static const struct blobmsg_policy read_policy[] = {
+ [READ_LINE] = { .name = lines, .type = BLOBMSG_TYPE_ARRAY },
+ };
+@@ -252,7 +255,7 @@ static void read_cb(struct ubus_request
+ c[strlen(c) - 1] = '\0';
+
+ printf(%s %s.%s%s %s\n,
+- c, facilitynames[LOG_FAC(p)].c_name,
prioritynames[LOG_PRI(p)].c_name,
++ c, getcodetext(LOG_FAC(p)3,facilitynames),
getcodetext(LOG_PRI(p),prioritynames),
+ (blobmsg_get_u32(tb[LOG_SOURCE])) ? () : ( kernel:),
+ blobmsg_get_string(tb[LOG_MSG]));
+ }
+@@ -339,3 +342,13 @@ int main(int argc, char **argv)
+
+ return 0;
+ }
++
++const char* getcodetext(int value, CODE *codetable) {
++ CODE *i;
++ if (value = 0)
++ for (i = codetable; i-c_val != -1; i++)
++ if (i-c_val == value)
++ return (i-c_name);
++ return (unknown);
++};
++
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Expose NSLU2 power and reset buttons to gpio-keys
This match modifies the setup file for the Linksys NSLU2 (slug) to
allow the power button on the front and the reset button on the back,
behind a pinhole, to be seen by gpio-keys.
The present situation is that neither button can be used effectively
and this patch is designed to fix that. At present, both buttons are
hard-coded as follows: The power button sends a ctrlaltdel signal
which can be intercepted via /etc/inittab
(see http://wiki.openwrt.org/toh/linksys/nslu2/nslu2.hardware.button).
Unfortunately, the button isn't debounced, so the signal is sent many times,
and in addition (I think) it runs as an interrupt handler. It interferes
with other processes, e.g. pppd. The reset button powers the machine
off directly.
This patch fixes the situation by making the buttons accessible
in the normal way via gpio-keys so that they can be used in the normal way.
Signed-off-by Mike Brady mikebr...@eircom.net
Index: target/linux/ixp4xx/patches-3.10/920-nslu2-add-gpio-keys.patch
===
--- target/linux/ixp4xx/patches-3.10/920-nslu2-add-gpio-keys.patch
(revision 0)
+++ target/linux/ixp4xx/patches-3.10/920-nslu2-add-gpio-keys.patch
(revision 0)
@@ -0,0 +1,116 @@
+--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
b/arch/arm/mach-ixp4xx/nslu2-setup.c
+@@ -9,6 +9,8 @@
+ * Copyright (C) 2003-2004 MontaVista Software, Inc.
+ * based on nslu2-power.c:
+ *Copyright (C) 2005 Tower Technologies
++ * modified to allow the use of gpio-keys to sense the power and reset
buttons,
++ *July 5, 2013 by Mike Brady mikebr...@eircom.net.
+ *
+ * Author: Mark Rakes mrakes at mac.com
+ * Author: Rod Whitby r...@whitby.id.au
+@@ -26,6 +28,8 @@
+ #include linux/i2c.h
+ #include linux/i2c-gpio.h
+ #include linux/io.h
++#include linux/gpio_keys.h
++#include linux/input.h
+ #include asm/mach-types.h
+ #include asm/mach/arch.h
+ #include asm/mach/flash.h
+@@ -186,11 +190,46 @@ static struct platform_device nslu2_eth[
+ }
+ };
+
++/*
++ * Buttons attached to GPIO. Used to permit gpio-keys to see them
++ * The Power Button is towards the bottom on the front.
++ * The Reset Button is behind a pinhole at the back.
++ */
++static struct gpio_keys_button nslu2_buttons[] = {
++ {
++ .code = BTN_0,
++ .gpio = NSLU2_PB_GPIO,
++ .desc = nslu2-power-button,
++ .type = EV_KEY,
++ }, {
++ .code = BTN_1,
++ .gpio = NSLU2_RB_GPIO,
++ .desc = nslu2-reset-button,
++ .type = EV_KEY,
++ .active_low = 1,
++ },
++};
++
++static struct gpio_keys_platform_data nslu2_button_data = {
++ .buttons= nslu2_buttons,
++ .nbuttons = ARRAY_SIZE(nslu2_buttons),
++};
++
++static struct platform_device nslu2_button_device = {
++ .name = gpio-keys,
++ .id = -1,
++ .num_resources = 0,
++ .dev= {
++ .platform_data = nslu2_button_data,
++ },
++};
++
+ static struct platform_device *nslu2_devices[] __initdata = {
+ nslu2_i2c_gpio,
+ nslu2_flash,
+ nslu2_beeper,
+ nslu2_leds,
++ nslu2_button_device,
+ nslu2_eth[0],
+ };
+
+@@ -205,25 +244,6 @@ static void nslu2_power_off(void)
+ gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
+ }
+
+-static irqreturn_t nslu2_power_handler(int irq, void *dev_id)
+-{
+- /* Signal init to do the ctrlaltdel action, this will bypass init if
+- * it hasn't started and do a kernel_restart.
+- */
+- ctrl_alt_del();
+-
+- return IRQ_HANDLED;
+-}
+-
+-static irqreturn_t nslu2_reset_handler(int irq, void *dev_id)
+-{
+- /* This is the paper-clip reset, it shuts the machine down directly.
+- */
+- machine_power_off();
+-
+- return IRQ_HANDLED;
+-}
+-
+ static void __init nslu2_timer_init(void)
+ {
+ /* The xtal on this machine is non-standard. */
+@@ -258,22 +278,6 @@ static void __init nslu2_init(void)
+
+ pm_power_off = nslu2_power_off;
+
+- if (request_irq(gpio_to_irq(NSLU2_RB_GPIO), nslu2_reset_handler,
+- IRQF_DISABLED | IRQF_TRIGGER_LOW,
+- NSLU2 reset button, NULL) 0) {
+-
+- printk(KERN_DEBUG Reset Button IRQ %d not available\n,
+- gpio_to_irq(NSLU2_RB_GPIO));
+- }
+-
+- if (request_irq(gpio_to_irq(NSLU2_PB_GPIO), nslu2_power_handler,
+- IRQF_DISABLED | IRQF_TRIGGER_HIGH,
+- NSLU2 power button, NULL) 0) {
+-
+- printk(KERN_DEBUG Power Button IRQ %d not available\n,
+- gpio_to_irq(NSLU2_PB_GPIO));
+- }
+-
+ /*
+* Map in a portion of the flash and read the MAC address.
+* Since it is stored in BE in the flash itself, we need to
___
openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Expose NSLU2 power and reset buttons to gpio-keys
Fair enough -- might take a little time though; holidays beckon!
Regards
Mike
On 5 Jul 2013, at 14:32, Jonas Gorski j...@openwrt.org wrote:
On Fri, Jul 5, 2013 at 11:45 AM, Mike Brady mikebr...@eircom.net wrote:
This match modifies the setup file for the Linksys NSLU2 (slug) to
allow the power button on the front and the reset button on the back,
behind a pinhole, to be seen by gpio-keys.
The present situation is that neither button can be used effectively
and this patch is designed to fix that. At present, both buttons are
hard-coded as follows: The power button sends a ctrlaltdel signal
which can be intercepted via /etc/inittab
(see http://wiki.openwrt.org/toh/linksys/nslu2/nslu2.hardware.button).
Unfortunately, the button isn't debounced, so the signal is sent many times,
and in addition (I think) it runs as an interrupt handler. It interferes
with other processes, e.g. pppd. The reset button powers the machine
off directly.
This patch fixes the situation by making the buttons accessible
in the normal way via gpio-keys so that they can be used in the normal way.
Signed-off-by Mike Brady mikebr...@eircom.net
I like the approach. It would be nice if you could also add scripts
for those buttons to keep the reset/shutdown behaviour of the buttons
by default (I just want to avoid tickets that these buttons suddenly
don't work anymore ;).
Some additional comments below ...
Index: target/linux/ixp4xx/patches-3.10/920-nslu2-add-gpio-keys.patch
===
--- target/linux/ixp4xx/patches-3.10/920-nslu2-add-gpio-keys.patch
(revision 0)
+++ target/linux/ixp4xx/patches-3.10/920-nslu2-add-gpio-keys.patch
(revision 0)
@@ -0,0 +1,116 @@
+--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
b/arch/arm/mach-ixp4xx/nslu2-setup.c
+@@ -9,6 +9,8 @@
+ * Copyright (C) 2003-2004 MontaVista Software, Inc.
+ * based on nslu2-power.c:
+ *Copyright (C) 2005 Tower Technologies
++ * modified to allow the use of gpio-keys to sense the power and reset
buttons,
++ *July 5, 2013 by Mike Brady mikebr...@eircom.net.
+ *
+ * Author: Mark Rakes mrakes at mac.com
+ * Author: Rod Whitby r...@whitby.id.au
+@@ -26,6 +28,8 @@
+ #include linux/i2c.h
+ #include linux/i2c-gpio.h
+ #include linux/io.h
++#include linux/gpio_keys.h
++#include linux/input.h
+ #include asm/mach-types.h
+ #include asm/mach/arch.h
+ #include asm/mach/flash.h
+@@ -186,11 +190,46 @@ static struct platform_device nslu2_eth[
+ }
+ };
+
++/*
++ * Buttons attached to GPIO. Used to permit gpio-keys to see them
++ * The Power Button is towards the bottom on the front.
++ * The Reset Button is behind a pinhole at the back.
++ */
++static struct gpio_keys_button nslu2_buttons[] = {
++ {
++ .code = BTN_0,
It's a power button, so KEY_POWER would be more appropriate.
++ .gpio = NSLU2_PB_GPIO,
++ .desc = nslu2-power-button,
++ .type = EV_KEY,
++ }, {
++ .code = BTN_1,
And here KEY_RESTART.
++ .gpio = NSLU2_RB_GPIO,
++ .desc = nslu2-reset-button,
++ .type = EV_KEY,
++ .active_low = 1,
++ },
++};
++
Regards,
Jonas
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] libiconv-full: add clause to Makefile to actually install iconv
At present, if you select the iconv utility it will be built but not installed. This patch adds the clauses necessary to the Makefile to actually install iconv. Signed-off-by: Mike Brady mikebr...@eircom.net Index: libs/libiconv-full/Makefile === --- libs/libiconv-full/Makefile (revision 33311) +++ libs/libiconv-full/Makefile (working copy) @@ -81,6 +81,11 @@ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/ endef +define Package/iconv/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/iconv $(1)/usr/bin/ +endef + $(eval $(call BuildPackage,libcharset)) $(eval $(call BuildPackage,libiconv-full)) $(eval $(call BuildPackage,iconv)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] avahi: Makefile fix to honor configuration changes
This patch is to fix a long-standing problem with avahi builds:
if you change the configuration, sometimes the relevant packages are not
correctly rebuilt; see, for example, ticket #0.
Background: avahi can be built in two modes: with or without D-BUS support.
If you switch builds from one mode to the other and then back again, the
packages will not
always be rebuilt as required. For example, if you choose to build avahi (1)
without D-BUS support,
then (2) with D-BUS support and then (3) without D-BUS support, the packages
will not
be rebuilt the third time, and you'll be left with the packages
from the second build -- packages that require D-BUS support.
The patch works by deleting the .build file belonging to the mode not
currently chosen, so
that if that mode is chosen again in the future, its packages will always be
rebuilt.
A few small corrections to the explanatory text are included.
Signed-off-by mikebr...@eircom.net
Index: libs/avahi/Makefile
===
--- libs/avahi/Makefile (revision 33271)
+++ libs/avahi/Makefile (working copy)
@@ -8,15 +8,17 @@
include $(TOPDIR)/rules.mk
ifeq ($(BUILD_VARIANT),dbus)
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION)
+ PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION)
+ PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION)
else
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION)
+ PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION)
+ PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION)
endif
PKG_NAME:=avahi
PKG_VERSION:=0.6.31
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -68,8 +70,8 @@
The libavahi package contains the mDNS/DNS-SD shared libraries,
used by other programs. Specifically, it provides
libavahi-core and libavahi-common libraries.
- By default, it is compiled without D-Bus support,
- i.e. the --disable-dbus compilation flag is set.
+ By default, it is built without D-Bus support,
+ i.e. the --disable-dbus configuration flag is set.
To enable D-Bus support, select the package
libavahi-dbus-support.
endef
@@ -142,10 +144,10 @@
$(call Package/libavahi/description)
.
The libavahi-dbus-support package enables
- D-Bus support in libavahi, needed to support
+ D-Bus support in avahi, needed to support
the libavahi-client library and avahi-utils.
- Selecting this package modifies the contents of the
- libavahi package by setting the --enable-dbus compilation flag;
+ Selecting this package modifies the build configuration
+ so that avahi packages are built with support for D-BUS enabled;
it does not generate a separate binary of its own.
It also automatically adds the D-Bus package to the build.
libavahi-dbus-support is selected automatically if you select
@@ -249,16 +251,20 @@
endef
define Package/libavahi-dbus-support/install
- $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/etc/dbus-1/system.d
+ $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d
endef
define Package/libavahi/install
+ # The next line removes the .build file from the other build.
+ # The effect is that, if the other build is re-selected in the future,
+ # the build system will be forced to replace all the code in the
+ # installer packages, removing anything from the current build.
+ # Other means this: if the current build is dbus, the other is
nodebus,
+ # and if the current build is nodbus, the other is dbus.
+ $(RM) -f $(PKG_ALT_DIR)/.built
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.*
$(1)/usr/lib/
-ifeq ($(BUILD_VARIANT),dbus)
- $(INSTALL_DIR) $(1)/etc/dbus-1/system.d
- $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d
-endif
endef
define Package/libavahi-client/install
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] avahi: remove inappropriate dependency on dbus in Changeset 32330
This patch fixes an issue reported by Damiano Albani. Changeset 32330, while fixing one bug, unfortunately introduces another one -- it makes avahi-daemon always dependent on the dbus package, causing dbus to be loaded even when it's not needed. This patch makes avahi-daemon dependent on dbus only is avahi dbus support has been selected. Signed-off-by Mike Brady mikebr...@eircom.net Index: libs/avahi/Makefile === --- libs/avahi/Makefile (revision 33223) +++ libs/avahi/Makefile (working copy) @@ -16,7 +16,7 @@ PKG_NAME:=avahi PKG_VERSION:=0.6.31 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -94,7 +94,11 @@ define Package/avahi-daemon $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names + ifeq ($(BUILD_VARIANT),dbus) DEPENDS:=+libavahi +libexpat +librt +libdbus + else + DEPENDS:=+libavahi +libexpat +librt + endif TITLE+= (daemon) endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] avahi fix for Ticket #11039 -- rlimit-nproc set too low
This patches the /etc/avahi/avahi-daemon.conf file, setting the rlimit-nproc parameter to 3. Thepresent value for rlimit-nproc of 1 is too low and can cause the avahi-daemon to refuse to start, with a message: chroot.c: fork() failed: Resource temporarily unavailable This patch changes the setting of rlimit-nproc to 3, the same setting as is in the default avahi-daemon.conf file. The issue was reported in Ticket #11039. Signed-off-by Mike Brady mikebr...@eircom.net Index: libs/avahi/files/avahi-daemon.conf === --- libs/avahi/files/avahi-daemon.conf (revision 33212) +++ libs/avahi/files/avahi-daemon.conf (working copy) @@ -25,4 +25,4 @@ rlimit-fsize=0 rlimit-nofile=30 rlimit-stack=4194304 -rlimit-nproc=1 +rlimit-nproc=3 Index: libs/avahi/Makefile === --- libs/avahi/Makefile (revision 33212) +++ libs/avahi/Makefile (working copy) @@ -16,7 +16,7 @@ PKG_NAME:=avahi PKG_VERSION:=0.6.31 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Running avahi-daemon without D-Bus
Hi Damiano. Even if you don't want avahi to support or need D-BUS, you still need the dbus package to be present in the build environment so that avahi's compilation dependencies can be satisfied. However, as I think you've discovered, libdbus won't be included in the runtime package. Regards Mike ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] avahi version bump to 0.6.31, Makefile improvements
This patch updates avahi to latest version -- 0.6.31. From the avahi release notes: This is a bugfix release and mostly makes things work with current autoconf again. It allows us to remove the OpenWrt-specific automake patch. This patch also ensures that when you change from omitting D-Bus support to including it, or vice-versa, the correct packages are actually generated. Until now, you had to do a make clean when you made such changes. Signed-off-by Mike Brady mikebr...@eircom.net Index: libs/avahi/patches/020-automake-compat.patch === --- libs/avahi/patches/020-automake-compat.patch(revision 31439) +++ libs/avahi/patches/020-automake-compat.patch(working copy) @@ -1,26 +0,0 @@ a/service-type-database/Makefile.am -+++ b/service-type-database/Makefile.am -@@ -18,13 +18,12 @@ - EXTRA_DIST=build-db.in service-types - - pkgdata_DATA=service-types --pkglib_DATA= - - if HAVE_PYTHON - if HAVE_GDBM - - noinst_SCRIPTS=build-db --pkglib_DATA+=service-types.db -+pkgdata_DATA+=service-types.db - - build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@@ -41,7 +40,7 @@ endif - if HAVE_DBM - - noinst_SCRIPTS=build-db --pkglib_DATA+=service-types.db.pag service-types.db.dir -+pkgdata_DATA+=service-types.db.pag service-types.db.dir - - build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ Index: libs/avahi/Config.in === --- libs/avahi/Config.in(revision 0) +++ libs/avahi/Config.in(revision 0) @@ -0,0 +1,14 @@ +# avahi dbus config +config AVAHI_INCLUDE_DBUS_SUPPORT + bool include D-Bus support + depends PACKAGE_libavahi + select PACKAGE_dbus + default n + help + D-Bus support is needed for the libavahi-client library and + for the command line utilities avahi-browse, avahi-publish, + avahi-resolve and friends, collectively called the 'avahi-utils' package. + If selected, the dbus package will be included in the build, + libavahi will be compiled with D-Bus support and + avahi-daemon will be built requiring D-Bus. + Leave un-selected for minimum build size. Index: libs/avahi/Makefile === --- libs/avahi/Makefile (revision 31439) +++ libs/avahi/Makefile (working copy) @@ -7,18 +7,20 @@ include $(TOPDIR)/rules.mk -ifeq ($(BUILD_VARIANT),dbus) -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION) +# Avahi comes in two flavours -- with and without D-Bus support built in. + +ifdef CONFIG_AVAHI_INCLUDE_DBUS_SUPPORT + PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION) + PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION) else -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION) + PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION) + PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION) endif - PKG_NAME:=avahi -PKG_VERSION:=0.6.30 -PKG_RELEASE:=4 +PKG_VERSION:=0.6.31 +PKG_RELEASE:=1 - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 @@ -31,10 +33,12 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 - - include $(INCLUDE_DIR)/package.mk +define Build/Configure + $(call Build/Configure/Default,) +endef + define Package/avahi/Default SECTION:=net CATEGORY:=Network @@ -54,6 +58,10 @@ and is very convenient. endef +define Package/libavahi/config + source $(SOURCE)/Config.in +endef + define Package/libavahi $(call Package/avahi/Default) SECTION:=libs @@ -70,8 +78,9 @@ libavahi-core and libavahi-common libraries. By default, it is compiled without D-Bus support, i.e. the --disable-dbus compilation flag is set. - To enable D-Bus support, select the package - libavahi-dbus-support. + D-Bus support will be selected automatically by libavahi-client + and avahi-utils. To enable D-Bus support manually, + select the include D-Bus support option. endef define Package/avahi-autoipd @@ -125,34 +134,11 @@ in a DHCP-like fashion. Especially useful on IPv6. endef -define Package/libavahi-dbus-support - $(call Package/avahi/Default) - SECTION:=libs - CATEGORY:=Libraries - VARIANT:=dbus - DEPENDS:=+dbus +libavahi - TITLE+= (D-Bus support) -endef - -define Package/libavahi-dbus-support/description -$(call Package/libavahi/description) - . - The libavahi-dbus-support package enables - D-Bus support in libavahi, needed to support - the libavahi-client library and avahi-utils. - Selecting this package modifies the contents of the - libavahi package by setting the --enable-dbus compilation flag; - it does not generate a separate binary of its own. - It also automatically adds the D-Bus package to the build
[OpenWrt-Devel] [PATCH] avahi version bump to 0.6.31, Makefile improvements, take 2!
This patch updates avahi to latest version -- 0.6.31. From the release notes: This is a bugfix release and mostly makes things work with current autoconf again. It allows us to remove the OpenWrt-specific automake patch. This patch also ensures that when you change from omitting D-Bus support to including it, or vice-versa, the correct packages are actually generated. Until now, you had to do a make clean when you made a change like that. [V2 -- fixed MD5SUM calculation oops] Signed-off-by Mike Brady mikebr...@eircom.net Index: libs/avahi/patches/020-automake-compat.patch === --- libs/avahi/patches/020-automake-compat.patch(revision 31439) +++ libs/avahi/patches/020-automake-compat.patch(working copy) @@ -1,26 +0,0 @@ a/service-type-database/Makefile.am -+++ b/service-type-database/Makefile.am -@@ -18,13 +18,12 @@ - EXTRA_DIST=build-db.in service-types - - pkgdata_DATA=service-types --pkglib_DATA= - - if HAVE_PYTHON - if HAVE_GDBM - - noinst_SCRIPTS=build-db --pkglib_DATA+=service-types.db -+pkgdata_DATA+=service-types.db - - build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@@ -41,7 +40,7 @@ endif - if HAVE_DBM - - noinst_SCRIPTS=build-db --pkglib_DATA+=service-types.db.pag service-types.db.dir -+pkgdata_DATA+=service-types.db.pag service-types.db.dir - - build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ Index: libs/avahi/Makefile === --- libs/avahi/Makefile (revision 31439) +++ libs/avahi/Makefile (working copy) @@ -7,21 +7,23 @@ include $(TOPDIR)/rules.mk -ifeq ($(BUILD_VARIANT),dbus) -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION) +# Avahi comes in two flavours -- with and without D-Bus support built in. + +ifdef CONFIG_AVAHI_INCLUDE_DBUS_SUPPORT + PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION) + PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION) else -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION) + PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION) + PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION) endif - PKG_NAME:=avahi -PKG_VERSION:=0.6.30 -PKG_RELEASE:=4 +PKG_VERSION:=0.6.31 +PKG_RELEASE:=1 - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ -PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 +PKG_MD5SUM:=2f22745b8f7368ad5a0a3fddac343f2d PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus @@ -31,10 +33,12 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 - - include $(INCLUDE_DIR)/package.mk +define Build/Configure + $(call Build/Configure/Default,) +endef + define Package/avahi/Default SECTION:=net CATEGORY:=Network @@ -54,6 +58,10 @@ and is very convenient. endef +define Package/libavahi/config + source $(SOURCE)/Config.in +endef + define Package/libavahi $(call Package/avahi/Default) SECTION:=libs @@ -70,8 +78,9 @@ libavahi-core and libavahi-common libraries. By default, it is compiled without D-Bus support, i.e. the --disable-dbus compilation flag is set. - To enable D-Bus support, select the package - libavahi-dbus-support. + D-Bus support will be selected automatically by libavahi-client + and avahi-utils. To enable D-Bus support manually, + select the include D-Bus support option. endef define Package/avahi-autoipd @@ -125,34 +134,11 @@ in a DHCP-like fashion. Especially useful on IPv6. endef -define Package/libavahi-dbus-support - $(call Package/avahi/Default) - SECTION:=libs - CATEGORY:=Libraries - VARIANT:=dbus - DEPENDS:=+dbus +libavahi - TITLE+= (D-Bus support) -endef - -define Package/libavahi-dbus-support/description -$(call Package/libavahi/description) - . - The libavahi-dbus-support package enables - D-Bus support in libavahi, needed to support - the libavahi-client library and avahi-utils. - Selecting this package modifies the contents of the - libavahi package by setting the --enable-dbus compilation flag; - it does not generate a separate binary of its own. - It also automatically adds the D-Bus package to the build. - libavahi-dbus-support is selected automatically if you select - libavahi-client or avahi-utils. -endef - define Package/libavahi-client $(call Package/avahi/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libavahi-dbus-support +avahi-daemon + DEPENDS:=+dbus +libavahi +@AVAHI_INCLUDE_DBUS_SUPPORT TITLE+= (libavahi-client library) endef @@ -161,7 +147,7 @@ . This packages adds the libavahi-client library. It also automatically adds the required - libavahi-dbus-support and the avahi-daemon packages. + libavahi, avahi-daemon and dbus packages. For more information please see the avahi documentation. endef @@ -223,7 +209,7 @@ --disable
[OpenWrt-Devel] [PATCH] avahi version bump to 0.6.31
This patch updates avahi to latest version -- 0.6.31. It also adds a note to the description. Signed-off-by Mike Brady mikebr...@eircom.net Index: Makefile === --- Makefile(revision 31212) +++ Makefile(working copy) @@ -15,13 +15,13 @@ PKG_NAME:=avahi -PKG_VERSION:=0.6.30 -PKG_RELEASE:=4 +PKG_VERSION:=0.6.31 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ -PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 +PKG_MD5SUM:=2f22745b8f7368ad5a0a3fddac343f2d PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus @@ -52,6 +52,9 @@ This kind of technology is already found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very convenient. + . + Note: you should always do a make clean after changing + any avahi build settings. endef define Package/libavahi ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [OpenWrt] #11110: avahi with dbus not possible
Thanks, I'll check. M On 15 Mar 2012, at 18:43, OpenWrt openwrt-devel@lists.openwrt.org wrote: #0: avahi with dbus not possible ---+ Reporter: Oskari Rauta oskari.rauta@… | Owner: developers Type: defect | Status: new Priority: normal | Milestone: Attitude Adjustment (trunk) Component: packages | Version: Trunk Keywords: | ---+ Comment(by Oskari Rauta oskari.rauta@…): I got around this by making my own build of avahi where I removed all variant definitions about dbus and manually disabled it - so maybe there's a problem in the Makefile? -- Ticket URL: https://dev.openwrt.org/ticket/0#comment:3 OpenWrt http://openwrt.org Opensource Wireless Router Technology ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix avahi build problems
This patch updates the avahi Makefile to correct a number of errors. In particular it handles the choice of D-BUS- or non-D-BUS-enabled packages more consistently. Packages that don't require D-BUS support are compiled with D-BUS support disabled by default, keeping the build as small as possible. Support for D-BUS can be selected if desired. Selecting packages that require D-BUS support -- avahi-utils or libavahi-client -- will automatically cause all packages to be built with D-BUS support and will add the D-BUS package to the build. Note that after this update, the D-BUS package will be needed as part of the compilation environment, so it will be downloaded and compiled, but it will not be added to the build unless the user has enabled D-BUS support or has selected avahi-utils or the avahi-client library, both of which need it. Tested on trunk r29283. Signed-off-by Mike Brady mikebr...@eircom.net Index: Makefile === --- Makefile (revision 29283) +++ Makefile (working copy) @@ -7,40 +7,50 @@ include $(TOPDIR)/rules.mk +ifeq ($(BUILD_VARIANT),dbus) +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION) +else +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION) +endif + + PKG_NAME:=avahi PKG_VERSION:=0.6.30 -PKG_RELEASE:=2 +PKG_RELEASE:=3 + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus -PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread - PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 + + include $(INCLUDE_DIR)/package.mk define Package/avahi/Default SECTION:=net CATEGORY:=Network - TITLE:=mDNS/DNS-SD + TITLE:=An mDNS/DNS-SD implementation URL:=http://www.avahi.org/ endef define Package/avahi/Default/description - An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library). - Avahi is a system which facilitates service discovery on a local network -- - this means that you can plug your laptop or computer into a network and - instantly be able to view other people who you can chat with, find printers - to print to or find files being shared. This kind of technology is already - found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') + Avahi is an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) + implementation (library). It facilitates + service discovery on a local network -- this means that + you can plug your laptop or computer into a network and + instantly be able to view other people who you can chat with, + find printers to print to or find files being shared. + This kind of technology is already found in MacOS X + (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very convenient. endef @@ -50,51 +60,27 @@ CATEGORY:=Libraries DEPENDS:=+libdaemon +libpthread +libgdbm TITLE+= (library) - VARIANT:=nodbus endef -define Package/libavahi-dbus - $(call Package/avahi/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libdaemon +libpthread +libgdbm +dbus - TITLE+= (library) (dbus) - VARIANT:=dbus -endef - define Package/libavahi/description $(call Package/avahi/Default/description) . - This package contains the mDNS/DNS-SD shared libraries, used by other programs. - Specifically, it provides libavahi-core and libavahi-common libraries. - This version is compiled without D-Bus support, i.e. the --disable-dbus - compilation flag is set. + The libavahi package contains the mDNS/DNS-SD shared libraries, + used by other programs. Specifically, it provides + libavahi-core and libavahi-common libraries. + By default, it is compiled without D-Bus support, + i.e. the --disable-dbus compilation flag is set. + To enable D-Bus support, select the package + libavahi-dbus-support. endef -define Package/libavahi-dbus/description -$(call Package/avahi/Default/description) - . - This package contains the mDNS/DNS-SD shared libraries, used by other programs. - Specifically, it provides libavahi-core and libavahi-common libraries. - This version is compiled with D-Bus support -endef - define Package/avahi-autoipd $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names DEPENDS:=+libdaemon - TITLE:=IPv4LL address conf daemon - VARIANT:=nodbus + TITLE:=IPv4LL network address configuration daemon endef -define Package/avahi-autoipd-dbus - $(call Package/avahi/Default) - SUBMENU:=IP Addresses and Names - DEPENDS:=+libdaemon - TITLE:=IPv4LL address conf daemon (dbus) - VARIANT:=dbus -endef - define Package/avahi-autoipd/description $(call Package/avahi/Default/description) . @@ -103,114 +89,80 @@ from the link-local 169.254.0.0/16 range
[OpenWrt-Devel] uci-12012009.7.tar.gz
Just building backfire now, and it can't find uci-12012009.7.tar.gz. --2011-11-16 20:37:23-- http://mirror2.openwrt.org/sources/uci-12012009.7.tar.gz Resolving mirror2.openwrt.org... 46.4.11.11 Connecting to mirror2.openwrt.org|46.4.11.11|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2011-11-16 20:37:23 ERROR 404: Not Found. Download failed. --2011-11-16 20:37:23-- http://downloads.openwrt.org/sources/uci-12012009.7.tar.gz Resolving downloads.openwrt.org... 78.24.191.177 Connecting to downloads.openwrt.org|78.24.191.177|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2011-11-16 20:37:23 ERROR 404: Not Found. Shome mhistake? Kind regards Mike ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix dbus to compile in brcm-2.4 -- See Ticket #10274 and Changeset 27521
This patch fixes a bug in the dbus package which prevents it from compiling on brcm-2.4 (Ticket #10274). In turn, it also prevents the avahi package from compiling on brcm-2.4. (Changeset 27521 is a workaround). The cause of the problem was that the existing patches, which were correct, were being applied to the file configure, which was then being overwritten from configure.ac, obliterating the effects of the patches. The fix was to apply the patches to configure.ac instead so that it generates a correctly patched configure file. Two patch files are deleted and two replacement patch files are added. Tested on the backfire branch revision 29195, building brcm-2.4 and ixp4xx. Signed-off-by: Mike Bradymikebr...@eircom.net Index: patches/01-dbus-nopie-fix.patch === --- patches/01-dbus-nopie-fix.patch (revision 29185) +++ patches/01-dbus-nopie-fix.patch (working copy) @@ -1,22 +0,0 @@ a/configure -+++ b/configure -@@ -20927,19 +20927,6 @@ if test x$GCC = xyes; then - ;; - esac - -- case $CFLAGS in -- *[\ \ ]-fPIE[\ \ ]*) ;; -- *) if cc_supports_flag -fPIE; then --PIE_CFLAGS=-fPIE --if ld_supports_flag -z,relro; then -- PIE_LDFLAGS=-pie -Wl,-z,relro --else -- PIE_LDFLAGS=-pie --fi -- fi -- ;; -- esac -- - ### Disabled warnings, and compiler flag overrides - - # Let's just ignore unused for now Index: patches/003-dbus-nopie-fix.patch === --- patches/003-dbus-nopie-fix.patch (revision 0) +++ patches/003-dbus-nopie-fix.patch (revision 0) @@ -0,0 +1,22 @@ +--- a/configure.in b/configure.in +@@ -257,19 +257,6 @@ if test x$GCC = xyes; then + ;; + esac + +- case $CFLAGS in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if cc_supports_flag -fPIE; then +-PIE_CFLAGS=-fPIE +-if ld_supports_flag -z,relro; then +- PIE_LDFLAGS=-pie -Wl,-z,relro +-else +- PIE_LDFLAGS=-pie +-fi +- fi +- ;; +- esac +- + ### Disabled warnings, and compiler flag overrides + + # Let's just ignore unused for now Index: patches/002-no_wno_pointer_sign.patch === --- patches/002-no_wno_pointer_sign.patch (revision 29185) +++ patches/002-no_wno_pointer_sign.patch (working copy) @@ -1,12 +0,0 @@ -diff -urN dbus-1.2.4.6permissive/configure dbus-1.2.4.6permissive.new/configure dbus-1.2.4.6permissive/configure 2009-05-06 19:35:38.0 +0200 -+++ dbus-1.2.4.6permissive.new/configure 2010-03-26 17:40:13.0 +0100 -@@ -20958,7 +20958,7 @@ - esac - case $CFLAGS in - *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;; -- *) CFLAGS=$CFLAGS -Wno-pointer-sign ;; -+ *) CFLAGS=$CFLAGS ;; - esac - - # http://bugs.freedesktop.org/show_bug.cgi?id=19195 Index: patches/004-no_wno_pointer_sign.patch === --- patches/004-no_wno_pointer_sign.patch (revision 0) +++ patches/004-no_wno_pointer_sign.patch (revision 0) @@ -0,0 +1,11 @@ +--- a/configure.in b/configure.in +@@ -275,7 +275,7 @@ if test x$GCC = xyes; then + esac + case $CFLAGS in + *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;; +- *) CFLAGS=$CFLAGS -Wno-pointer-sign ;; ++ *) CFLAGS=$CFLAGS ;; + esac + + # http://bugs.freedesktop.org/show_bug.cgi?id=19195 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Help -- Noob Question -- Driving Me Crazy
Can someone tell be or direct me to an example of how to put a linux version conditional into an OpenWrt package Makefile please? What I want to do is say if this is and version of Linux 2.4 then do stufft. I've tried something like ifeq ($(CONFIG_LINUX_2_4),1) do stuff endif but no joy. Regards Mike ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Avahi package problems
Hi Jon. Thanks for the pointers. Yeah, I was a tiny bit surprised to hear nothing. I didn't know how to contact the committers, TBH. Are you a maintainer yourself? Mike On 8 Nov 2011, at 17:43, Jonathan McCrohan wrote: Hi Mike, I'm a bit surprised you haven't got any replies yet; Either nobody seems to care, or else nobody else seems to use avahi. You might be better off emailing cshore [1] directly as he committed r27479. Failing that, you can email thepeople [2] and offer to be the avahi maintainer. Then just fix up the package as you like, and commit your own changes. ;-) Jon [1] Daniel Dickinson dan...@cshore.neomailbox.net [2] Travis Kemen thepeo...@openwrt.org On 6 November 2011 15:55, Mike Brady mikebr...@eircom.net wrote: Hi everybody. This is a long note, and it's about the avahi package. It's about changes made in Changeset 27479 (June 7, 2011). Sorry not to have commented earlier, but I was busy on a separate project. To come directly to the point, and with respect, I think that Changeset 27479 is flawed and needs to be undone. I think it is based on a number of misunderstandings -- see (II) below -- and actually introduces problems which I try to explain below in (I). There actually was a problem with the avahi package prior to Changeset 27479 but I think it's due to the nature of the build process and in any case there is a simple standard workaround. If there's a full fix for it, I'd love to know it. I give my understanding of it below -- see (III). Maybe it is me that misunderstands the situation. However, if you agree with me, I'd be happy to change the avahi Makefile back to what it was before Changeset 27479 (but including a change introduced in Changeset 27521, to disable DBUS support on brcm-2.4, unrelated to the issues discussed here). FYI I'm compiling 10.03.1-RC6 for a Linksys NSLU2. Best wishes Mike Brady (I) Problems with Changeset 27479 1. Changeset 27479 introduces two versions of the package avahi-autoipd; one with DBUS support, and one without. The thing is, avahi-autoipd does not depend on DBUS, so having a DBUS- and non-DBUS version of it makes no sense. What's more, selecting: Network IP Addresses and Names avahi-autoipd-dbus * (a) does not generate avahi-autoipd, and (b) causes DBUS to be generated and included in the build, even though, as mentioned, avahi-autoipd doesn't need DBUS at all. Also, oddly, the build log shows the avahi package being compiled and installed three separate times, instead of just once. 2. It is possible to select the DBUS- and the non-DBUS versions of some avahi packages at the same time. Of course, this makes no sense, but at least it's pretty obvious when you do it. However, similar problems can occur in a way that's hidden from you. For example, if you select the non-DBUS version of the avahi-daemon package, then the non-DBUS of libavahi will be selected. If you also select avahi-utils, this needs the DBUS version of libavahi. Thus you will be implicitly asking for two different versions of libavahi to be included -- the non-DBUS version and the DBUS version. It's not clear which one will be included in the final build. As mentioned above, the avahi package will be compiled and installed a few times -- five times in this case -- instead of just once. (II) The Possible Misunderstanding in Changeset 27479 It appears that the new Makefile was introduced in Changeset 27479 on the basis of a misunderstanding. In the note accompanying Changeset 27479 it says: The package was producing a package avahi which required dbus if libavahi-dbus-support was selected (even as module), and without dbus if that package was not select. This has been fixed... Actually, no fix is needed -- this is exactly what is meant to happen: The package libavahi-dbus-support was there to be automatically included if you chose avahi-utils, since avahi-utils requires the DBUS version of libavahi. The selection or omission of libavahi-dbus-support then automatically caused the appropriate version (DBUS- or non-DBUS) of avahi-daemon and avahi-dnsconfig to be compiled, if you had selected them, to correspond with the selected version of libavahi. In summary, starting with a clean system, you got non-DBUS versions of the relevant avahi packages by default, but if you chose something than needed DBUS support (i.e. avahi-utils), or if you selected libavahi-dbus-support manually, you got DBUS versions of all relevant avahi packages. The Changeset 27479 note then goes on to explain that with the new Makefile: ... dbus versions of the binary packages and non-dbus versions of the ones that can be without dbus, so that the smaller platformas can still have avahi without dbus, and those who want the dbus avahi can have it as well. However, this was already the case: as noted above, if avahi-utils was not selected, you were
Re: [OpenWrt-Devel] Avahi package problems
Hi. Here is the list:
avahi-autoipd -- doesn't depend on DBUS at all, it's the only DBUS don't care.
libavahi, avahi-daemon, avahi-dnsconfd -- can be DBUS-enabled or not.
avahi-utils, libavahi-client -- these require DBUS.
If avahi-utils or libavahi-client is selected, then the DBUS-enabled version of
libavahi, avahi-daemon, avahi-dnsconfd must be selected as well.
The avahi makefile prior to Changeset 27479 looked after all the above.
I'd be happy to fix all this up incorporating the effect of Changeset 27521
over the next few days, and submit it as a patch -- just let me know.
Regards
Mike
On 8 Nov 2011, at 21:09, Nico wrote:
Hi,
On Tue, Nov 8, 2011 at 6:46 PM, Mike Brady mikebr...@eircom.net wrote:
Hi Jon. Thanks for the pointers. Yeah, I was a tiny bit surprised to hear
nothing. I didn't know how to contact the committers, TBH. Are you a
maintainer yourself?
I will try to fix it. From your experience, can you remind me which
binaries are needing DBUS enabled and which don't care ?
Thanks for your detailed explanation and your help,
--
-{Nico}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Avahi package problems
Hi everybody. This is a long note, and it's about the avahi package. It's about changes made in Changeset 27479 (June 7, 2011). Sorry not to have commented earlier, but I was busy on a separate project. To come directly to the point, and with respect, I think that Changeset 27479 is flawed and needs to be undone. I think it is based on a number of misunderstandings -- see (II) below -- and actually introduces problems which I try to explain below in (I). There actually was a problem with the avahi package prior to Changeset 27479 but I think it's due to the nature of the build process and in any case there is a simple standard workaround. If there's a full fix for it, I'd love to know it. I give my understanding of it below -- see (III). Maybe it is me that misunderstands the situation. However, if you agree with me, I'd be happy to change the avahi Makefile back to what it was before Changeset 27479 (but including a change introduced in Changeset 27521, to disable DBUS support on brcm-2.4, unrelated to the issues discussed here). FYI I'm compiling 10.03.1-RC6 for a Linksys NSLU2. Best wishes Mike Brady (I) Problems with Changeset 27479 1. Changeset 27479 introduces two versions of the package avahi-autoipd; one with DBUS support, and one without. The thing is, avahi-autoipd does not depend on DBUS, so having a DBUS- and non-DBUS version of it makes no sense. What's more, selecting: Network IP Addresses and Names avahi-autoipd-dbus * (a) does not generate avahi-autoipd, and (b) causes DBUS to be generated and included in the build, even though, as mentioned, avahi-autoipd doesn't need DBUS at all. Also, oddly, the build log shows the avahi package being compiled and installed three separate times, instead of just once. 2. It is possible to select the DBUS- and the non-DBUS versions of some avahi packages at the same time. Of course, this makes no sense, but at least it's pretty obvious when you do it. However, similar problems can occur in a way that's hidden from you. For example, if you select the non-DBUS version of the avahi-daemon package, then the non-DBUS of libavahi will be selected. If you also select avahi-utils, this needs the DBUS version of libavahi. Thus you will be implicitly asking for two different versions of libavahi to be included -- the non-DBUS version and the DBUS version. It's not clear which one will be included in the final build. As mentioned above, the avahi package will be compiled and installed a few times -- five times in this case -- instead of just once. (II) The Possible Misunderstanding in Changeset 27479 It appears that the new Makefile was introduced in Changeset 27479 on the basis of a misunderstanding. In the note accompanying Changeset 27479 it says: The package was producing a package avahi which required dbus if libavahi-dbus-support was selected (even as module), and without dbus if that package was not select. This has been fixed... Actually, no fix is needed -- this is exactly what is meant to happen: The package libavahi-dbus-support was there to be automatically included if you chose avahi-utils, since avahi-utils requires the DBUS version of libavahi. The selection or omission of libavahi-dbus-support then automatically caused the appropriate version (DBUS- or non-DBUS) of avahi-daemon and avahi-dnsconfig to be compiled, if you had selected them, to correspond with the selected version of libavahi. In summary, starting with a clean system, you got non-DBUS versions of the relevant avahi packages by default, but if you chose something than needed DBUS support (i.e. avahi-utils), or if you selected libavahi-dbus-support manually, you got DBUS versions of all relevant avahi packages. The Changeset 27479 note then goes on to explain that with the new Makefile: ... dbus versions of the binary packages and non-dbus versions of the ones that can be without dbus, so that the smaller platformas can still have avahi without dbus, and those who want the dbus avahi can have it as well. However, this was already the case: as noted above, if avahi-utils was not selected, you were free to choose the DBUS- or non-DBUS version of the other avahi packages by manually selecting or omitting the libavahi-dbus-support. (III) The problem with the avahi package prior to Changeset 27479. There actually is a problem with the avahi package prior to Changeset 27479. Here is a scenario: 1. Choose a set of avahi packages that include DBUS support, and then do a complete build, you'll get the correct versions of the avahi packages and libavahi. 2. Change your choice of avahi packages to omit DBUS support, including only packages that don't need DBUS support, de-selecting avahi-dbus-support if necessary. If you rebuild the system, you may still get the DBUS versions of some of the avahi packages and/or libavahi (this may be the issue that Changeset 27479 was intended to fix). As best I can understand it, the issue
[OpenWrt-Devel] [PATCH] Update avahi to version 0.6.30 (ref Ticket 7424, , ipv6)
This updates the avahi package to the latest version, 0.6.30. From the avahi release notes: This is a bugfix release. Make IPv6 work again i18n updates Minor other updates It may be relevant to ticket 7424. (A few typos in the OpenWrt Makefile are also fixed.) Signed-off-by: Mike Brady mikebr...@eircom.net Index: Makefile === --- Makefile (revision 26496) +++ Makefile (working copy) @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=avahi -PKG_VERSION:=0.6.29 -PKG_RELEASE:=2 +PKG_VERSION:=0.6.30 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ -PKG_MD5SUM:=bb9d326770689610d1dbaceab5a787fc +PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus @@ -56,7 +56,7 @@ This package contains the mDNS/DNS-SD shared libraries, used by other programs. Specifically, it provides libavahi-core and libavahi-common libraries. By default, it is compiled without D-Bus support, i.e. the --disable-dbus compilation flag is set. - To enable D-Bus support, add the package libavahi-dbus-support. + To enable D-Bus support, select the package libavahi-dbus-support. endef define Package/avahi-autoipd @@ -105,7 +105,7 @@ define Package/avahi-dnsconfd/description $(call Package/avahi/Default/description) . - This package contains an Unicast DNS server from mDNS/DNS-SD configuration + This package contains a Unicast DNS server from mDNS/DNS-SD configuration daemon, which may be used to configure conventional DNS servers using mDNS in a DHCP-like fashion. Especially useful on IPv6. endef @@ -127,7 +127,7 @@ and the libavahi-client library. It requires the D-Bus package to be included in the build. Selecting this modifies the contents of the libavahi package by setting - the --enable-dbuscompilation flag; it does not generate a separate package of its own. + the --enable-dbus compilation flag; it does not generate a separate package of its own. endef define Package/libavahi-client ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Update avahi to included D-Bus support, libavahi-client library and avahi-utils tools (ref Ticket 8929)
This updates the avahi package as follows: 1. The libavahi-client library can be selected. 2. The following avahi utilities can be selected: avahi-browse, aka: avahi-browse-domains avahi-publish, aka: avahi-publish-address, avahi-publish-service avahi-resolve, aka: avahi-resolve-address, avahi-resolve-host-name avahi-set-host-name. Notes: (a) This patch applies to avahi 0.6.29 -- I sent in the previous version for 0.6.28 just after 0.6.29 came out, duh. :( (b) The libavahi-client library and the avahi utilities require avahi to be compiled with D-Bus support, and D-Bus must be included in the build. If they are not selected, avahi is compiled without D-Bus support, as it is at present. (c) The init.d start priority of avahi-daemon is changed from 50 to 61 so that it loads after D-Bus. The patch in Ticket #8929 has two problems, IMHO: 1. It makes the D-Bus package a compulsory requirement for avahi, even though it's only really needed if you select the libavahi-client library. (This patch makes D-Bus compulsory only if you select the libavahi-client library or the avahi utilities which depend on them.) 2. The avahi-daemon will fail to start because the D-Bus daemon is set to start up _after_ avahi-daemon starts looking for it. (This patch adjusts the init.d start priority of the avahi-daemon to later than that of D-Bus.) Signed-off-by: Mike Brady mikebr...@eircom.net Index: files/avahi-daemon.init === --- files/avahi-daemon.init (revision 26305) +++ files/avahi-daemon.init (working copy) @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=50 +START=61 BIN=avahi-daemon DEFAULT=/etc/default/$BIN Index: Makefile === --- Makefile (revision 26305) +++ Makefile (working copy) @@ -15,7 +15,7 @@ PKG_SOURCE_URL:=http://avahi.org/download/ PKG_MD5SUM:=bb9d326770689610d1dbaceab5a787fc -PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh @@ -54,6 +54,9 @@ $(call Package/avahi/Default/description) . This package contains the mDNS/DNS-SD shared libraries, used by other programs. + Specifically, it provides libavahi-core and libavahi-common libraries. + By default, it is compiled without D-Bus support, i.e. the --disable-dbus compilation flag is set. + To enable D-Bus support, add the package libavahi-dbus-support. endef define Package/avahi-autoipd @@ -96,7 +99,7 @@ $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names DEPENDS:=+libavahi - TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon + TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon endef define Package/avahi-dnsconfd/description @@ -107,6 +110,56 @@ in a DHCP-like fashion. Especially useful on IPv6. endef +define Package/libavahi-dbus-support + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + VARIANT:=dbus + DEPENDS:=+dbus +libavahi + TITLE+= (D-Bus support for advanced features) +endef + +define Package/libavahi-dbus-support/description +$(call Package/libavahi/description) + . + This package enables D-Bus support in libavahi. This is needed for libavahi to + provide advanced features -- support for avahi-browse, avahi-publish + and the libavahi-client library. + It requires the D-Bus package to be included in the build. + Selecting this modifies the contents of the libavahi package by setting + the --enable-dbuscompilation flag; it does not generate a separate package of its own. +endef + +define Package/libavahi-client + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libavahi-dbus-support + TITLE+= (libavahi-client library) +endef + +define Package/libavahi-client/description +$(call Package/avahi/Default/description) + . + This packages adds the libavahi-client library. + For more information please see the avahi documentation. +endef + +define Package/avahi-utils + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libavahi-client + TITLE+= (utilities) +endef + +define Package/avahi-utils/description +$(call Package/avahi/Default/description) + . + This packages installs the following avahi utility programs: + avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name. + For more information please see the avahi documentation. +endef + TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE CONFIGURE_ARGS+= \ @@ -118,7 +171,6 @@ --disable-qt4 \ --disable-gtk \ --disable-gtk3 \ - --disable-dbus \ --with-xml=expat \ --disable-dbm \ --enable-gdbm \ @@ -150,23 +202,49 @@ --disable-stack-protector endif +ifeq ($(BUILD_VARIANT),dbus) +CONFIGURE_ARGS += \ + --enable-dbus +else +CONFIGURE_ARGS += \ + --disable-dbus +endif + CONFIGURE_VARS+= \ CFLAGS=CFLAGS
[OpenWrt-Devel] [PATCH] Update avahi to included D-Bus support, avahi-client interfaces and avahi-utils tools
This updates the avahi package as follows: 1. The avahi client API libraries libavahi-client.* can be selected. 2. The avahi utilities can be selected: avahi-browse, aka: avahi-browse-domains avahi-publish, aka: avahi-publish-address, avahi-publish-service avahi-resolve, aka: avahi-resolve-address, avahi-resolve-host-name avahi-set-host-name. Notes: (a) The avahi client libraries and the avahi utilities require that avahi be compiled with D-Bus support, and D-Bus must be included in the build. If they are not selected, avahi is compiled without D-Bus support, as it is at present. (b) The init.d start priority of avahi-daemon is changed from 50 to 61 so that it loads after D-Bus. Signed-off-by: Mike Brady mikebr...@eircom.net --- Index: files/avahi-daemon.init === --- files/avahi-daemon.init (revision 25894) +++ files/avahi-daemon.init (working copy) @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=50 +START=61 BIN=avahi-daemon DEFAULT=/etc/default/$BIN Index: Makefile === --- Makefile(revision 25894) +++ Makefile(working copy) @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,13 @@ PKG_NAME:=avahi PKG_VERSION:=0.6.28 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ PKG_MD5SUM:=d0143a5aa3265019072e53ab497818d0 -PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus PKG_FIXUP:=libtool PKG_REMOVE_FILES:=autogen.sh @@ -52,8 +52,10 @@ define Package/libavahi/description $(call Package/avahi/Default/description) - . This package contains the mDNS/DNS-SD shared libraries, used by other programs. + Specifically, it provides libavahi-core and libavahi-common libraries. + By default, it is compiled without D-Bus support, i.e. the --disable-dbus compilation flag is set. + To enable D-Bus support, add the package libavahi-dbus-support. endef define Package/avahi-autoipd @@ -93,7 +95,7 @@ define Package/avahi-dnsconfd $(call Package/avahi/Default) DEPENDS:=+libavahi - TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon + TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon endef define Package/avahi-dnsconfd/description @@ -104,6 +106,57 @@ in a DHCP-like fashion. Especially useful on IPv6. endef +define Package/libavahi-dbus-support + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + VARIANT:=dbus + DEPENDS:=+dbus +libavahi + TITLE:=Adds D-Bus support for advanced features +endef + +define Package/libavahi-dbus-support/description +$(call Package/libavahi/description) + This package enables D-Bus support in libavahi. This is needed for libavahi to + provide advanced features -- support for avahi-browse, avahi-publish + and libavahi-client -- the object-oriented APIs needed to provide the avahi client interface. + It requires the D-Bus package to be included in the build. + Selecting this modifies the contents of the libavahi package by setting the --enable-dbus compilation flag; + it does not generate a separate package of its own. +endef + +define Package/libavahi-client + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libavahi-dbus-support + TITLE:=The libavahi-client library +endef + +define Package/libavahi-client/description +$(call Package/avahi/Default/description) + This packages adds the libavahi-client libraries. + For more information please see the avahi documentation. + Note: this package selects the libavahi-dbus-support package and requires the D-Bus package. +endef + +define Package/avahi-utils + $(call Package/avahi/Default) + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libavahi-dbus-support + TITLE:=The avahi utility programs +endef + +define Package/avahi-utils/description +$(call Package/avahi/Default/description) + This packages installs the following avahi utility programs: + avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name. + For more information please see the avahi documentation. + Note: this package selects the libavahi-dbus-support package and requires the D-Bus package. +endef + + TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE CONFIGURE_ARGS+= \ @@ -115,7 +168,6 @@ --disable-qt4 \ --disable-gtk \ --disable-gtk3 \ - --disable-dbus \ --with-xml=expat \ --disable-dbm \ --enable-gdbm \ @@ -147,23 +199,54 @@ --disable-stack-protector endif +ifeq ($(BUILD_VARIANT),dbus) +CONFIGURE_ARGS += \ + --enable-dbus +else +CONFIGURE_ARGS += \ + --disable-dbus +endif + CONFIGURE_VARS
[OpenWrt-Devel] [PATCH] New package: nss-mdns.
This package contains the nss-mdns library written by Lennart Poettering -- see: http://0pointer.de/lennart/projects/nss-mdns/ It enables OpenWRT devices to resolve domain names generated by ZEROCONF mDNS systems such as Avahi and Bonjour -- (these domain names typically end in .local.) From the documentation: nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc) providing host name resolution via Multicast DNS (akaZeroconf, aka Apple Rendezvous, aka Apple Bonjour), effectively allowing name resolution by common Unix/Linux programs in the ad-hoc mDNS domain .local. nss-mdns needs the GNU C Library to be chosen as the C library when OpenWRT is being built (the default is uClibc). The package installs the library files and a sample nsswitch.conf file called nsswitch-README.conf in /etc Signed-off-by: Mike Brady mikebr...@eircom.net --- Index: nss-mdns/files/nsswitch-README.conf === --- nss-mdns/files/nsswitch-README.conf(revision 0) +++ nss-mdns/files/nsswitch-README.conf(revision 0) @@ -0,0 +1,20 @@ +# /etc/nsswitch-README.conf +# +# If you have the `glibc-doc-reference' and `info' packages installed, try: +# `info libc Name Service Switch' for information about the file +# /etc/nsswitch.conf. + +# To have multicast dns (a.k.a. Zeroconf, Bonjour, Rendezvous) +# included in host name resolution, you need to place an entry +# in the file /etc/nsswitch.conf. This file contains a suitable entry. +# It specifies that multicast DNS (mdns*) should be consulted when +# trying to do IPv4 host name resolution. + +# If you don't already have a file /etc/nsswitch.conf, then simply +# rename this file to nsswitch.conf. + +# If /etc/nsswitch.conf already exists, copy the line that begins hosts: +# into it. + +hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 + Index: nss-mdns/Makefile === --- nss-mdns/Makefile(revision 0) +++ nss-mdns/Makefile(revision 0) @@ -0,0 +1,66 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nss-mdns +PKG_VERSION:=0.10 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/nss-mdns/ +PKG_MD5SUM:=03938f17646efbb50aa70ba5f99f51d7 + +PKG_FIXUP:=libtool +PKG_REMOVE_FILES:=autogen.sh + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/nss-mdns + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Incorporate ZEROCONF in host name resolution + URL:=http://0pointer.de/lennart/projects/nss-mdns/ + MAINTAINER:=Mike Brady mikebr...@eircom.net +endef + +define Package/nss-mdns/description + nss-mdns is a plugin for the GNU Name Service Switch (NSS) functionality + of the GNU C Library (glibc) providing host name resolution via + Multicast DNS (aka Zeroconf, aka Apple Rendezvous, aka Apple Bonjour), + effectively allowing name resolution by common Unix/Linux programs + in the ad-hoc mDNS domain .local. + + Relies on avahi to provide the mDNS service. + Needs OpenWRT to be built using the glibc library. + Installs the libnss_mdns libraries and suggested settings in + /etc/nsswitch-README.conf. + To activate the service, you need to edit /etc/nsswitch.conf -- see + /etc/nsswitch-README.conf for details and suggested settings. +endef + +# Don't ask for documentation to be built. +CONFIGURE_ARGS += \ +--disable-lynx + +define Build/Configure +(cd $(PKG_BUILD_DIR); autoreconf -f) +$(call Build/Configure/Default, ) +endef + +define Package/nss-mdns/install +$(INSTALL_DIR) $(1)/lib +$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnss_mdns*.so.* $(1)/lib/ +$(INSTALL_DIR) $(1)/etc +$(INSTALL_DATA) ./files/nsswitch-README.conf $(1)/etc/ + +endef + +$(eval $(call BuildPackage,nss-mdns)) smime.p7s Description: S/MIME cryptographic signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [RFC] Always include hostname in DHCP request
Great! I often wondered about that!
Mike
On 29 Oct 2010, at 23:13, Michael Heimpold wrote:
Currently, the hostname is sent in a DHCP request only if configured
explicitely.
Changing this behaviour so that the hostname is sent per default has the
advantage
that e.g. a Fritz!Box (acting as DHCP server) shows the device running OpenWRT
with it's hostname in the network overview.
To prevent sending a hostname at all (and to be backwards compatible) the
configuration option can be set to none.
Signed-off-by: Michael Heimpold m...@heimpold.de
Index: package/base-files/files/lib/network/config.sh
===
--- package/base-files/files/lib/network/config.sh(Revision 23604)
+++ package/base-files/files/lib/network/config.sh(Arbeitskopie)
@@ -355,6 +355,8 @@
[ -z $ipaddr ] || \
$DEBUG ifconfig $iface $ipaddr
${netmask:+netmask $netmask}
+ [ -n $hostname ] || hostname=$(uci -q get
syst...@system[0].hostname)
+ [ $hostname = none ] hostname=
# don't stay running in background if dhcp is not the
main proto on the interface (e.g. when using pptp)
local dhcpopts
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
smime.p7s
Description: S/MIME cryptographic signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] w_scan package
This patch defines a new package for w_scan: w_scan is a small command line utility used to perform frequency scans for DVB and ATSC transmissions. See: http://wirbel.htpc-forum.de/w_scan/index_en.html The package includes w_scan but not the w_scan_start.sh referred to in the documentation. Signed-off-by: Mike Brady mikebr...@eircom.net --- I have included the patch as an attachment -- I hope that's OK. From the packages directory the patch adds one directory which contains one Makefile: + utils/w_scan/ + utils/W_scan/Makefile Index: utils/w_scan/Makefile === --- utils/w_scan/Makefile (revision 0) +++ utils/w_scan/Makefile (revision 0) @@ -0,0 +1,46 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=w-scan +PKG_VERSION:=20101001 +PKG_RELEASE:=1 + +PKG_SOURCE:=w_scan-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://wirbel.htpc-forum.de/w_scan +PKG_BUILD_DIR:=$(BUILD_DIR)/w_scan-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/w_scan + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=...@linux_2_6 + DEFAULT:=n + TITLE:=w_scan performs frequency scans for DVB and ATSC. + URL:=http://wirbel.htpc-forum.de/w_scan/index2.html + MAINTAINER:=Mike Brady mikebr...@eircom.net +endef + +define Package/w_scan/description + w_scan is a small command line utility used to perform frequency scans for DVB and ATSC transmissions. It is capable of creating channels.conf files (in different output formats !) as well as initial tuning data for scan. It's based on the utility scan from linuxtv-dvb-apps, but meanwhile it was heavily changed and has different features: + 1. no need for initial transponders, and such no need for a config file + 2. w_scan finds automatically the best matching dvb card + 3. complete different command line options + 4. a different default output format as well as bunch of output formats. +This package does not include the script file w_scan_start.sh. +endef + +define Package/w_scan/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) \ + $(PKG_BUILD_DIR)/w_scan \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,w_scan)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
