[Buildroot] OLSR in buildroot - patch

[Buildroot] OLSR in buildroot - patch

[Rex Luscus]

this is a possible patch to discuss
-------------- next part --------------
A non-text attachment was scrubbed...
Name: br2-add-olsr.01.patch
Type: text/x-patch
Size: 3178 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20070918/0679919f/attachment.bin 

[Buildroot] OLSR in buildroot - patch

[Ulf Samuelsson]

tis 2007-09-18 klockan 20:39 -0300 skrev Rex Luscus:
> this is a possible patch to discuss

You need to have an OLSR entry for "package/Config.in" 
There is no way you can configure buildroot to build without this.

Have you tested to build this?
Have you tested this on any hardware?


> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
-- 
Best Regards,
Ulf Samuelsson          mail:   ulf at atmel.com
Atmel Nordic AB
Box 2033, 174 52 Sundbyberg
Kavalleriv?gen 24, 174 58 Sundbyberg
Sweden
Tel:    +46 8 441 54 22 GSM:    +46 706 224457

[Buildroot] OLSR in buildroot - patch

[Bernhard Fischer]

On Tue, Sep 18, 2007 at 08:39:39PM -0300, Rex Luscus wrote:
> this is a possible patch to discuss

>Index: package/olsr/files/S50olsr
>===================================================================
>--- package/olsr/files/S50olsr	(revisi??n: 0)
>+++ package/olsr/files/S50olsr	(revisi??n: 0)
>@@ -0,0 +1,22 @@
>+#!/bin/sh
>+#
>+# Starts OLSRD deamon
>+#
>+case "$1" in
>+  start)
>+  	echo -n "Starting OLSRd deamon: "
>+	start-stop-daemon --start --quiet --pidfile /var/run/olsrd.pid --exec /usr/sbin/olsrd

As said, long options are a nono. Please fix.

>+	echo "OK"
>+	;;
>+  stop)
>+  	echo -n "Stopping OLSRd deamon: "
>+	start-stop-daemon --stop --quiet --pidfile /var/run/olsrd.pid
>+	echo "OK"
>+	;;
>+  *)
>+	echo $"Usage: $0 {start|stop}"
>+	exit 1
>+esac
>+
>+exit $?
>+
>Index: package/olsr/olsr.mk
>===================================================================
>--- package/olsr/olsr.mk	(revisi??n: 0)
>+++ package/olsr/olsr.mk	(revisi??n: 0)
>@@ -0,0 +1,61 @@
>+#############################################################
>+#
>+# olsr
>+#
>+#############################################################
>+
>+OLSR_VERSION_MAJOR=0.5
>+OLSR_VERSION_MINOR=3
>+OLSR_VERSION:=$(OLSR_VERSION_MAJOR).$(OLSR_VERSION_MINOR)
>+OLSR_SOURCE:=olsrd-$(OLSR_VERSION).tar.bz2
>+OLSR_SITE:=http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)
>+OLSR_DIR:=$(BUILD_DIR)/olsrd-$(OLSR_VERSION)
>+OLSR_CAT:=$(BZCAT)
>+OLSR_BINARY:=olsrd
>+OLSR_TARGET_BINARY:=usr/bin/olsrd
>+#OLSR_PLUGINS=httpinfo tas dot_draw nameservice dyn_gw dyn_gw_plain pgraph bmf quagga secure
>+OLSR_PLUGINS=dot_draw dyn_gw secure
>+OLSR_TARGET_PLUGIN=usr/lib/
>+
>+$(DL_DIR)/$(OLSR_SOURCE):
>+	 $(WGET) -P $(DL_DIR) $(OLSR_SITE)/$(OLSR_SOURCE)
>+
>+olsr-source: $(DL_DIR)/$(OLSR_SOURCE)
>+
>+olsr-unpacked: $(OLSR_DIR)/.unpacked
>+$(OLSR_DIR)/.unpacked: $(DL_DIR)/$(OLSR_SOURCE)
>+	$(OLSR_CAT) $(DL_DIR)/$(OLSR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
>+	touch $@
>+
>+$(OLSR_DIR)/.configured: $(OLSR_DIR)/.unpacked
>+	touch $@
>+
>+$(OLSR_DIR)/$(OLSR_BINARY): $(OLSR_DIR)/.configured
>+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(OLSR_DIR) olsrd $(OLSR_PLUGINS)
>+
>+$(TARGET_DIR)/$(OLSR_TARGET_BINARY): $(OLSR_DIR)/$(OLSR_BINARY)
>+	rm -f $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
>+	cp -dpf $(OLSR_DIR)/$(OLSR_BINARY) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
>+	cp -R $(OLSR_DIR)/lib/*/olsrd_*.so.* $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)
>+	mkdir -p $(TARGET_DIR)/etc/init.d
>+	cp package/olsr/files/S50olsr $(TARGET_DIR)/etc/init.d/
>+	chmod a+x $(TARGET_DIR)/etc/init.d/S50olsr

S50olsr will be executable in the repository, so this is not needed.

>+	cp $(OLSR_DIR)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf

Only do this if $(TARGET_DIR)/etc/olsrd.conf doesn't exist. Otherwise
you cannot have a premade conf.

>+
>+olsr: uclibc $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
>+
>+olsr-clean:
>+	rm -f $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
>+	-$(MAKE) -C $(OLSR_DIR) clean

This has to rm the S50olsr and the libs too.

>+
>+olsr-dirclean:
>+	rm -rf $(OLSR_DIR)
>+
>+#############################################################
>+#
>+# Toplevel Makefile options
>+#
>+#############################################################
>+ifeq ($(strip $(BR2_PACKAGE_OLSR)),y)
>+TARGETS+=olsrd $(OLSR_PLUGINS)
>+endif
>Index: package/olsr/Config.in
>===================================================================
>--- package/olsr/Config.in	(revisi??n: 0)
>+++ package/olsr/Config.in	(revisi??n: 0)
>@@ -0,0 +1,10 @@
>+config BR2_PACKAGE_OLSR
>+	bool "OLSR mesh networking Deamon"

you probably mean daemon.

>+	default n
>+	help
>+	  olsr
>+	  
>+	  A mesh networking protocol

A bit more description would be nice.

>+
>+	  http://www.olsr.org/
>+

[Buildroot] OLSR in buildroot - patch

[Bernhard Fischer]

On Wed, Sep 19, 2007 at 10:33:40AM -0300, Sushi Sensei wrote:
>The Dropbear package use the same format!!!

Sheesh. I'm not deaf, can hear you just fine.

Can very well be, but that doesn't make the dropbear script correct nor
is it an excuse to propagate this wrong format..