[2/4] Add fff-tunneldigger

Submitted by Robert Langhammer on June 26, 2016, 9:23 p.m.

Details

Message ID 1466976194-2546-3-git-send-email-rlanghammer@web.de
State Accepted, archived
Commit e17812e4b8f53c6c6f443573584745190bf64d03
Headers show

Commit Message

Robert Langhammer June 26, 2016, 9:23 p.m.
Signed-off-by: Robert Langhammer <rlanghammer@web.de>
---
 src/packages/fff/fff-tunneldigger/Makefile         | 39 ++++++++++++++++++++++
 .../files/etc/tunneldigger/tunneldigger.hook       | 10 ++++++
 .../files/etc/uci-defaults/55_fff-tunneldigger     |  2 ++
 3 files changed, 51 insertions(+)
 create mode 100644 src/packages/fff/fff-tunneldigger/Makefile
 create mode 100755 src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
 create mode 100644 src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-tunneldigger/Makefile b/src/packages/fff/fff-tunneldigger/Makefile
new file mode 100644
index 0000000..e158df4
--- /dev/null
+++ b/src/packages/fff/fff-tunneldigger/Makefile
@@ -0,0 +1,39 @@ 
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fff-tunneldigger
+PKG_VERSION:=1
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-tunneldigger
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fff-tunneldigger
+    SECTION:=base
+    CATEGORY:=Freifunk
+    TITLE:= Freifunk-Franken tunneldigger
+    URL:=http://www.freifunk-franken.de
+    DEPENDS:=+tunneldigger
+endef
+
+define Package/fff-tunneldigger/description
+    This is tunneldigger for the Freifunk Franken Firmware
+endef
+
+define Build/Prepare
+       echo "all: " > $(PKG_BUILD_DIR)/Makefile
+endef
+
+define Build/Configure
+       # nothing
+endef
+
+define Build/Compile
+       # nothing
+endef
+
+define Package/fff-tunneldigger/install
+        $(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,fff-tunneldigger))
diff --git a/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
new file mode 100755
index 0000000..c4fea62
--- /dev/null
+++ b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
@@ -0,0 +1,10 @@ 
+#!/bin/sh
+
+HOOK=$1
+INTERFACE=$2
+
+if [ "$HOOK" = session.up ]; then
+       ip l s dev $INTERFACE up
+       batctl if add $INTERFACE
+       echo "enabled" > /sys/devices/virtual/net/$INTERFACE/batman_adv/no_rebroadcast
+fi
diff --git a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
new file mode 100644
index 0000000..f97d187
--- /dev/null
+++ b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
@@ -0,0 +1,2 @@ 
+/etc/init.d tunneldigger disable
+>/etc/config/tunneldigger

Comments

Jan Kraus June 27, 2016, 4:40 p.m.
Hi,
Am Sonntag, den 26.06.2016, 23:23 +0200 schrieb Robert Langhammer:
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  src/packages/fff/fff-tunneldigger/Makefile         | 39 ++++++++++++++++++++++
>  .../files/etc/tunneldigger/tunneldigger.hook       | 10 ++++++
>  .../files/etc/uci-defaults/55_fff-tunneldigger     |  2 ++
>  3 files changed, 51 insertions(+)
>  create mode 100644 src/packages/fff/fff-tunneldigger/Makefile
>  create mode 100755 src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
>  create mode 100644 src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> 
> diff --git a/src/packages/fff/fff-tunneldigger/Makefile b/src/packages/fff/fff-tunneldigger/Makefile
> new file mode 100644
> index 0000000..e158df4
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/Makefile
> @@ -0,0 +1,39 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-tunneldigger
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-tunneldigger
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-tunneldigger
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:= Freifunk-Franken tunneldigger
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+tunneldigger
> +endef
> +
> +define Package/fff-tunneldigger/description
> +    This is tunneldigger for the Freifunk Franken Firmware
Die Beschreibung sollte etwas eindeutiger sein.
z.B. sowas wie "This package configures tunneldigger for the Freifunk
Franken Firmware"
> +endef
> +
> +define Build/Prepare
> +       echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +       # nothing
> +endef
> +
> +define Build/Compile
> +       # nothing
> +endef
> +
> +define Package/fff-tunneldigger/install
> +        $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,fff-tunneldigger))
> diff --git a/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
> new file mode 100755
> index 0000000..c4fea62
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
> @@ -0,0 +1,10 @@
> +#!/bin/sh
> +
> +HOOK=$1
> +INTERFACE=$2
> +
> +if [ "$HOOK" = session.up ]; then
> +       ip l s dev $INTERFACE up
> +       batctl if add $INTERFACE
> +       echo "enabled" > /sys/devices/virtual/net/$INTERFACE/batman_adv/no_rebroadcast
> +fi
> diff --git a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> new file mode 100644
> index 0000000..f97d187
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> @@ -0,0 +1,2 @@
> +/etc/init.d tunneldigger disable
> +>/etc/config/tunneldigger
Sollte man das nicht eigentlich per UCI löschen? Ich finde es irgendwie
etwas ungut, wenn wir in "uci-defaults" einfach Dateien überschreiben.

Grüße Jan
> -- 
> 2.8.0.rc3
>
Robert Langhammer July 27, 2016, 10:54 p.m.
Hi,

s. u.


Am 26.06.2016 um 23:23 schrieb Robert Langhammer:
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  src/packages/fff/fff-tunneldigger/Makefile         | 39 ++++++++++++++++++++++
>  .../files/etc/tunneldigger/tunneldigger.hook       | 10 ++++++
>  .../files/etc/uci-defaults/55_fff-tunneldigger     |  2 ++
>  3 files changed, 51 insertions(+)
>  create mode 100644 src/packages/fff/fff-tunneldigger/Makefile
>  create mode 100755 src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
>  create mode 100644 src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
>
> diff --git a/src/packages/fff/fff-tunneldigger/Makefile b/src/packages/fff/fff-tunneldigger/Makefile
> new file mode 100644
> index 0000000..e158df4
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/Makefile
> @@ -0,0 +1,39 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-tunneldigger
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-tunneldigger
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-tunneldigger
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:= Freifunk-Franken tunneldigger
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+tunneldigger
> +endef
> +
> +define Package/fff-tunneldigger/description
> +    This is tunneldigger for the Freifunk Franken Firmware
> +endef
> +
> +define Build/Prepare
> +       echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +       # nothing
> +endef
> +
> +define Build/Compile
> +       # nothing
> +endef
> +
> +define Package/fff-tunneldigger/install
> +        $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,fff-tunneldigger))
> diff --git a/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
> new file mode 100755
> index 0000000..c4fea62
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook
> @@ -0,0 +1,10 @@
> +#!/bin/sh
> +
> +HOOK=$1
> +INTERFACE=$2
> +
> +if [ "$HOOK" = session.up ]; then
> +       ip l s dev $INTERFACE up
> +       batctl if add $INTERFACE
> +       echo "enabled" > /sys/devices/virtual/net/$INTERFACE/batman_adv/no_rebroadcast
> +fi
> diff --git a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> new file mode 100644
> index 0000000..f97d187
> --- /dev/null
> +++ b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> @@ -0,0 +1,2 @@
> +/etc/init.d tunneldigger disable
hier fehlt ein / im Pfad. Soll ich dafür einen Patch schicken oder könnt
ihr das auch so korrigieren?

Viele Grüße
Robert
> +>/etc/config/tunneldigger
Tim Niemeyer July 28, 2016, 3:45 p.m.
Hi

Am Donnerstag, den 28.07.2016, 00:54 +0200 schrieb Robert:
[..]
> > diff --git a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> > new file mode 100644
> > index 0000000..f97d187
> > --- /dev/null
> > +++ b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger
> > @@ -0,0 +1,2 @@
> > +/etc/init.d tunneldigger disable
> hier fehlt ein / im Pfad.
Oha.. :O

> Soll ich dafür einen Patch schicken oder könnt
> ihr das auch so korrigieren?
Wir könnten schon, aber dann würde es vielleicht einen Shitstorm geben.
Schick bitte lieber ein Patch.

Tim