[PATCH 2/3] adds some basic packages
Tim Niemeyer
tim.niemeyer at mastersword.de
Mi Jul 15 21:03:41 CEST 2015
Hi Tobias
Unten einige Kommentare, das Freifunk-Package scheint noch Dinge anderer
potentieller Pakete zu enthalten, ansonsten sieht das ziemlich gut aus.
Am Mittwoch, den 15.07.2015, 19:33 +0200 schrieb tk+ff at meskal.net:
> not yet included:
> * uci-defaults script to initialize openwrt during first boot
> * a lot of other stuff
> * everything else we talked about
> * ...
> ---
> README.md | 6 +
> package.config | 1 +
> packages/.keepdir | 0
> packages/fastdstart/Makefile | 34 ++++
> packages/fastdstart/files/usr/sbin/fastdstart | 96 ++++++++++
Ich nehme an, das ist eine Kopie aus ffffnext?
> packages/freifunk-franken/Makefile | 60 ++++++
> .../freifunk-franken/files/etc/config/freifunk | 13 ++
> .../files/etc/hotplug.d/iface/30-fastd | 5 +
> .../freifunk-franken/uci-defaults/99_installcron | 6 +
Kommentare siehe unten.
> packages/nodewatcher/Makefile | 37 ++++
> packages/nodewatcher/files/etc/config/configurator | 24 +++
> packages/nodewatcher/files/etc/config/nodewatcher | 6 +
> packages/nodewatcher/files/usr/sbin/configurator | 172 +++++++++++++++++
> packages/nodewatcher/files/usr/sbin/nodewatcher | 210 +++++++++++++++++++++
Das scheint mir auch ne Kopie aus ffffnext zu sein?
> 14 files changed, 670 insertions(+)
> delete mode 100644 packages/.keepdir
> create mode 100644 packages/fastdstart/Makefile
> create mode 100755 packages/fastdstart/files/usr/sbin/fastdstart
> create mode 100644 packages/freifunk-franken/Makefile
> create mode 100644 packages/freifunk-franken/files/etc/config/freifunk
> create mode 100644 packages/freifunk-franken/files/etc/hotplug.d/iface/30-fastd
> create mode 100644 packages/freifunk-franken/uci-defaults/99_installcron
> create mode 100644 packages/nodewatcher/Makefile
> create mode 100644 packages/nodewatcher/files/etc/config/configurator
> create mode 100644 packages/nodewatcher/files/etc/config/nodewatcher
> create mode 100644 packages/nodewatcher/files/usr/sbin/configurator
> create mode 100755 packages/nodewatcher/files/usr/sbin/nodewatcher
>
> diff --git a/README.md b/README.md
> index b92ef5f..aa4e57d 100644
> --- a/README.md
> +++ b/README.md
> @@ -60,6 +60,12 @@ make menuconfig
> </pre>
>
> Now select the "Target System" and "Target Profile" for your AP model.
> +Make sure, that you include one of the freifunk franken packages:
> +
> +freifunk-franken-basic
> +or
> +freifunk-franken-debug
> +
>
> Finally start the build process
> <pre>
> diff --git a/package.config b/package.config
> index e69de29..b03faa5 100644
> --- a/package.config
> +++ b/package.config
> @@ -0,0 +1 @@
> +CONFIG_PACKAGE_freifunk-franken-basic=y
> diff --git a/packages/.keepdir b/packages/.keepdir
> deleted file mode 100644
> index e69de29..0000000
[.. fastdstart package ..]
> diff --git a/packages/freifunk-franken/Makefile b/packages/freifunk-franken/Makefile
> new file mode 100644
> index 0000000..cad486a
> --- /dev/null
> +++ b/packages/freifunk-franken/Makefile
> @@ -0,0 +1,60 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=freifunk-franken
> +PKG_VERSION:=1.0.0
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/freifunk
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/freifunk-franken-basic
> + SECTION:=base
> + CATEGORY:=Config
> + DEFAULT:=n
> + TITLE:= Freifunk-Franken Basic
> + URL:=http://freifunk-franken.de
> + DEPENDS:=+kmod-batman-adv \
> + +batctl \
> + +alfred \
> + +fastd \
> + +fastdstart \
> + +ip \
> + +odhcpd \
> + +dnsmasq-dhcpv6 \
> + +ebtables \
> + +kmod-ebtables-ipv4 \
> + +kmod-ebtables-ipv6 \
> + +haveged \
> + + at ATH_USER_REGD \
> + +nodewatcher
> +endef
> +
> +define Build/Prepare
> + echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Package/freifunk-franken-basic/install
> + $(CP) ./files/* $(1)/
> + mkdir -p $(1)/lib/cron
> + echo "#reboot every 1 days at 04:05" >> $(1)/lib/cron/$(PKG_NAME)
> + echo "1 4 */5 * * /sbin/reboot" >> $(1)/lib/cron/$(PKG_NAME)
> +endef
> +
> +define Package/freifunk-franken/conffiles
> + /etc/config/freifunk
> +endef
> +
> +define Package/freifunk-franken-debug
> + SECTION:=base
> + CATEGORY:=Config
> + DEFAULT:=n
> + TITLE:=Freifunk-Franken with debug tools
> + DEPENDS:=+freifunk-franken-basic \
> + + at KMOD_BATMAN_ADV_DEBUG_LOG \
> + +iperf \
> + +tcpdump-mini
> +endef
> +
> +$(eval $(call BuildPackage,freifunk-franken-basic))
> +$(eval $(call BuildPackage,freifunk-franken-debug))
> diff --git a/packages/freifunk-franken/files/etc/config/freifunk b/packages/freifunk-franken/files/etc/config/freifunk
> new file mode 100644
> index 0000000..c1da43b
> --- /dev/null
> +++ b/packages/freifunk-franken/files/etc/config/freifunk
> @@ -0,0 +1,13 @@
> +
> +config settings
> + option 'name' ''
> + option 'geo' ''
> + option 'version' '' #will be set on first boot
> + option 'map_publish' '1'
> + option 'access_from' 'lan'
> + option 'service_link' ''
> + option 'service_label' ''
> + option 'service_display_max' 0
> + option 'default_ap_ssid' 'franken.freifunk.net'
> + option 'default_ah_ssid' ''
> + option 'default_ah_bssid' '02:CA:FF:EE:BA:BE'
Die Sachen haben noch keine Funktion. Technisch gehören sie also
offenbar gar nicht in dieses Paket sondern in das Paket, wo später auch
dieses "Setup Skript" drin ist.
> diff --git a/packages/freifunk-franken/files/etc/hotplug.d/iface/30-fastd b/packages/freifunk-franken/files/etc/hotplug.d/iface/30-fastd
> new file mode 100644
> index 0000000..b1ea7bd
> --- /dev/null
> +++ b/packages/freifunk-franken/files/etc/hotplug.d/iface/30-fastd
> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +
> +[ "$ACTION" = "ifup" -a "$DEVICE" = "br-wan" ] || exit 0
Gibt es das br-wan überhaupt?
> +
> +/usr/sbin/fastdstart
> diff --git a/packages/freifunk-franken/uci-defaults/99_installcron b/packages/freifunk-franken/uci-defaults/99_installcron
> new file mode 100644
> index 0000000..33c7e46
> --- /dev/null
> +++ b/packages/freifunk-franken/uci-defaults/99_installcron
> @@ -0,0 +1,6 @@
> +#!/bin/bash
> +
> +cat /lib/cron/* /etc/crontabs/root
> +
> +#execute on every restart before initscripts
> +exit 1
[.. nodewatcher ..]
Tim
> --
> 2.4.5
>
Mehr Informationen über die Mailingliste franken-dev