<html><head></head><body>Man muss den macnocker umschreiben, dass der tc nicht mehr verwendet. Das ist aber nicht so lustig. <br><br><div class="gmail_quote">On 15 March 2020 17:46:23 CET, Robert Langhammer <rlanghammer@web.de> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">Hallo,<br><br>was ist mit dem macnocker? Der hat eine Abhängigkeit auf tc. Kann man<br>die auch umbiegen?<br><br>Viele Grüße<br>Robert<br><br>Am 07.01.20 um 12:58 schrieb Adrian Schmutzler:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"> This new packages is meant to serve as meta-package to store<br> setup for simple-tc.<br><br> This achieves two objectives:<br> - Increase general maintainability by having relevant code in one<br> location.<br> - Provide the option to include/exclude simple-tc functionality<br> just by selecting/deselecting the fff-simple-tc package.<br><br> This will allow for easier testing of image size impact of this<br> functionality, too.<br><br> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de><hr> Changes in v2:<br> - just a resend with extended commit message<hr> src/packages/fff/fff-config/Makefile | 2 +-<br> .../files/etc/uci-defaults/98-configure-fff | 11 +-----<br> src/packages/fff/fff-simple-tc/Makefile | 38 +++++++++++++++++++<br> .../files/etc/uci-defaults/98-configure-tc | 12 ++++++<br> src/packages/fff/fff-web/Makefile | 2 +-<br> src/packages/fff/fff/Makefile | 2 +-<br> 6 files changed, 54 insertions(+), 13 deletions(-)<br> create mode 100644 src/packages/fff/fff-simple-tc/Makefile<br> create mode 100644 src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc<br><br> diff --git a/src/packages/fff/fff-config/Makefile b/src/packages/fff/fff-config/Makefile<br> index 1b7af481..821cdda5 100644<br> --- a/src/packages/fff/fff-config/Makefile<br> +++ b/src/packages/fff/fff-config/Makefile<br> @@ -1,7 +1,7 @@<br> include $(TOPDIR)/rules.mk<br><br> PKG_NAME:=fff-config<br> -PKG_RELEASE:=1<br> +PKG_RELEASE:=2<br><br> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)<br><br> diff --git a/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff b/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff<br> index aa6ac425..f71eadcd 100644<br> --- a/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff<br> +++ b/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff<br> @@ -13,16 +13,7 @@ FFF_hostname=$(uci -q get "fff.system.hostname")<br> test -n "${FFF_hostname}" && uci -q set "system.@system[0].hostname=${FFF_hostname}"<br> test -n "${FFF_hostname}" && echo "${FFF_hostname}" > /proc/sys/kernel/hostname<br><br> -traffic_enabled=$(uci -q get "fff.trafficcontrol.enabled")<br> -traffic_in=$(uci -q get "fff.trafficcontrol.limit_in")<br> -traffic_out=$(uci -q get "fff.trafficcontrol.limit_out")<br> -<br> -test -n "${traffic_enabled}" && uci -q set "simple-tc.example.enabled=${traffic_enabled}"<br> -uci -q set "simple-tc.example.ifname=wan"<br> -uci -q set "simple-tc.example.limit_ingress=${traffic_in}"<br> -uci -q set "simple-tc.example.limit_egress=${traffic_out}"<br> -<br> -uci -q commit<br> +uci commit system<br><br> poe_passthrough=$(uci -q get "fff.poe_passthrough.active")<br> if [ "$poe_passthrough" = "1" ] && [ -s /usr/lib/fff-support/activate_poe_passthrough.sh ] ; then<br> diff --git a/src/packages/fff/fff-simple-tc/Makefile b/src/packages/fff/fff-simple-tc/Makefile<br> new file mode 100644<br> index 00000000..fc565f14<br> --- /dev/null<br> +++ b/src/packages/fff/fff-simple-tc/Makefile<br> @@ -0,0 +1,38 @@<br> +include $(TOPDIR)/rules.mk<br> +<br> +PKG_NAME:=fff-simple-tc<br> +PKG_RELEASE:=1<br> +<br> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)<br> +<br> +include $(INCLUDE_DIR)/package.mk<br> +<br> +define Package/$(PKG_NAME)<br> + SECTION:=base<br> + CATEGORY:=Freifunk<br> + TITLE:=Freifunk-Franken simple-tc config<br> + URL:=http://www.freifunk-franken.de<br> + DEPENDS:=+simple-tc<br> +endef<br> +<br> +define Package/$(PKG_NAME)/description<br> + This meta-package configures simple-tc for FFF<br> +endef<br> +<br> +define Build/Prepare<br> + echo "all: " > $(PKG_BUILD_DIR)/Makefile<br> +endef<br> +<br> +define Build/Configure<br> + # nothing<br> +endef<br> +<br> +define Build/Compile<br> + # nothing<br> +endef<br> +<br> +define Package/$(PKG_NAME)/install<br> + $(CP) ./files/* $(1)/<br> +endef<br> +<br> +$(eval $(call BuildPackage,$(PKG_NAME)))<br> diff --git a/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc b/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc<br> new file mode 100644<br> index 00000000..b6389cac<br> --- /dev/null<br> +++ b/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc<br> @@ -0,0 +1,12 @@<br> +#!/bin/sh<br> +<br> +traffic_enabled=$(uci -q get "fff.trafficcontrol.enabled")<br> +traffic_in=$(uci -q get "fff.trafficcontrol.limit_in")<br> +traffic_out=$(uci -q get "fff.trafficcontrol.limit_out")<br> +<br> +test -n "${traffic_enabled}" && uci set "simple-tc.example.enabled=${traffic_enabled}"<br> +uci set "simple-tc.example.ifname=wan"<br> +uci set "simple-tc.example.limit_ingress=${traffic_in}"<br> +uci set "simple-tc.example.limit_egress=${traffic_out}"<br> +<br> +uci commit simple-tc<br> diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile<br> index 24bdb951..3f16fded 100644<br> --- a/src/packages/fff/fff-web/Makefile<br> +++ b/src/packages/fff/fff-web/Makefile<br> @@ -12,7 +12,7 @@ define Package/$(PKG_NAME)<br> CATEGORY:=Freifunk<br> TITLE:= Freifunk-Franken Webinterface<br> URL:=http://www.freifunk-franken.de<br> - DEPENDS:=+uhttpd +libustream-mbedtls +haserl +px5g +simple-tc \<br> + DEPENDS:=+uhttpd +libustream-mbedtls +haserl +px5g +fff-simple-tc \<br> +fff-boardname +fff-config +fff-network +fff-hoodutils \<br> +@BUSYBOX_CONFIG_WGET +@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT<br> endef<br> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile<br> index 4439ecfc..8af02361 100644<br> --- a/src/packages/fff/fff/Makefile<br> +++ b/src/packages/fff/fff/Makefile<br> @@ -24,7 +24,7 @@ define Package/fff-base<br> +fff-sysupgrade \<br> +fff-wireless \<br> +fff-timeserver \<br> - +simple-tc<br> + +fff-simple-tc<br> endef<br><br> define Package/fff-base/description<br></blockquote></pre></blockquote></div></body></html>