Skip to contentSkip to conversation

OLSR in buildroot - patch

Buildroot Rex Luscus 3 participants 4 messages Sep 18, 2007 – Sep 19, 2007 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

tis 2007-09-18 klockan 20:39 -0300 skrev Rex Luscus:

Quoted 1 line

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?

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at uclibc.org
http://busybox.net/mailman/listinfo/buildroot

Signature · 7 lines
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
#2 lore raw
In reply to Rex Luscus
Quoted 7 lines · Rex Luscus

this is a possible patch to discuss

Index: package/olsr/files/S50olsr
===================================================================

olsr/files/S50olsr line 8

Quoted 8 lines
olsr/files/S50olsr +8 -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.

Quoted 51 lines
olsr/files/S50olsr +14 -0
+	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
===================================================================

olsr/olsr.mk +32 -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/olsr.mk line 42

Quoted 10 lines
olsr/olsr.mk +10 -0
+$(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.

olsr/olsr.mk line 43

Quoted 1 line
olsr/olsr.mk +1 -0
+	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/olsr.mk line 49

Quoted 6 lines
olsr/olsr.mk +6 -0
+
+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.

Quoted 17 lines
olsr/olsr.mk +12 -0
+
+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
===================================================================

olsr/Config.in line 2

Quoted 2 lines
olsr/Config.in +2 -0
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_OLSR
+	bool "OLSR mesh networking Deamon"

you probably mean daemon.

olsr/Config.in line 7

Quoted 5 lines
olsr/Config.in +5 -0
+	default n
+	help
+	  olsr
+	  
+	  A mesh networking protocol

A bit more description would be nice.

Quoted 3 lines
olsr/Config.in +3 -0
+
+	  http://www.olsr.org/
+

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 1 line · Sushi Sensei

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..