From 14769925cf591c8178755be5d49f5d82401ea12b Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 19 Oct 2025 00:00:00 +0200 Subject: [PATCH] feeds: remove qosify package Remove the custom qosify package as the new upstream version from OpenWrt 24.10 is now being used. Signed-off-by: John Crispin --- feeds/ucentral/qosify/Makefile | 76 -------- .../qosify/files/qosify-defaults.conf | 17 -- feeds/ucentral/qosify/files/qosify-status | 70 ------- feeds/ucentral/qosify/files/qosify.conf | 6 - feeds/ucentral/qosify/files/qosify.hotplug | 2 - feeds/ucentral/qosify/files/qosify.init | 171 ------------------ 6 files changed, 342 deletions(-) delete mode 100644 feeds/ucentral/qosify/Makefile delete mode 100644 feeds/ucentral/qosify/files/qosify-defaults.conf delete mode 100644 feeds/ucentral/qosify/files/qosify-status delete mode 100644 feeds/ucentral/qosify/files/qosify.conf delete mode 100644 feeds/ucentral/qosify/files/qosify.hotplug delete mode 100644 feeds/ucentral/qosify/files/qosify.init diff --git a/feeds/ucentral/qosify/Makefile b/feeds/ucentral/qosify/Makefile deleted file mode 100644 index b2ed7b693..000000000 --- a/feeds/ucentral/qosify/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2021 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=qosify -PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git -PKG_MIRROR_HASH:=648e648655097d7063b3a2119b054cf9ee4a120a194cdf5fb5df8e03c9207c83 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2023-07-20 -PKG_SOURCE_VERSION:=850cc271083d0ad4c3b2eefddb61f376390ddf62 -PKG_RELEASE:=$(AUTORELEASE) - -PKG_LICENSE:=GPL-2.0 -PKG_MAINTAINER:=Felix Fietkau - -PKG_BUILD_DEPENDS:=bpf-headers -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk -include $(INCLUDE_DIR)/bpf.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/qosify - SECTION:=utils - CATEGORY:=Base system - TITLE:=A simple QoS solution based eBPF + CAKE - DEPENDS:=+libbpf +libubox +libubus +libnl-tiny +kmod-sched-cake +kmod-sched-bpf +kmod-ifb +tc $(BPF_DEPENDS) -endef - -TARGET_CFLAGS += \ - -Wno-error=deprecated-declarations \ - -I$(STAGING_DIR)/usr/include/libnl-tiny \ - -I$(STAGING_DIR)/usr/include - -CMAKE_OPTIONS += \ - -DLIBNL_LIBS=-lnl-tiny - -define Build/Compile - $(call CompileBPF,$(PKG_BUILD_DIR)/qosify-bpf.c) - $(Build/Compile/Default) -endef - -define Package/qosify/conffiles -/etc/config/qosify -/etc/qosify/00-defaults.conf -endef - -define Package/qosify/install - $(INSTALL_DIR) \ - $(1)/lib/bpf \ - $(1)/usr/sbin \ - $(1)/etc/init.d \ - $(1)/etc/config \ - $(1)/etc/qosify \ - $(1)/etc/hotplug.d/net \ - $(1)/etc/hotplug.d/iface - $(INSTALL_DATA) $(PKG_BUILD_DIR)/qosify-bpf.o $(1)/lib/bpf - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/qosify \ - ./files/qosify-status \ - $(1)/usr/sbin/ - $(INSTALL_BIN) ./files/qosify.init $(1)/etc/init.d/qosify - $(INSTALL_DATA) ./files/qosify-defaults.conf $(1)/etc/qosify/00-defaults.conf - $(INSTALL_DATA) ./files/qosify.conf $(1)/etc/config/qosify - $(INSTALL_DATA) ./files/qosify.hotplug $(1)/etc/hotplug.d/net/10-qosify - $(INSTALL_DATA) ./files/qosify.hotplug $(1)/etc/hotplug.d/iface/10-qosify -endef - -$(eval $(call BuildPackage,qosify)) diff --git a/feeds/ucentral/qosify/files/qosify-defaults.conf b/feeds/ucentral/qosify/files/qosify-defaults.conf deleted file mode 100644 index ff8a0bef5..000000000 --- a/feeds/ucentral/qosify/files/qosify-defaults.conf +++ /dev/null @@ -1,17 +0,0 @@ -# DNS -tcp:53 voice -tcp:5353 voice -udp:53 voice -udp:5353 voice - -# NTP -udp:123 voice - -# SSH -tcp:22 +video - -# HTTP/QUIC -tcp:80 +besteffort -tcp:443 +besteffort -udp:80 +besteffort -udp:443 +besteffort diff --git a/feeds/ucentral/qosify/files/qosify-status b/feeds/ucentral/qosify/files/qosify-status deleted file mode 100644 index dc5823226..000000000 --- a/feeds/ucentral/qosify/files/qosify-status +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -. /usr/share/libubox/jshn.sh - -dev_status() { - tc -s qdisc sh dev "$1" root - echo -} - -common_status() { - json_get_vars ifname ingress egress - - [ -n "$ifname" ] || return - - [ "$egress" -gt 0 ] && { - echo "egress status:" - dev_status "$ifname" - } - [ "$ingress" -gt 0 ] && { - echo "ingress status:" - dev_status "$(printf %.16s "ifb-$ifname")" - } -} - -is_active() { - json_get_vars active - - [ "${active:-0}" -gt 0 ] -} - -device_status() { - local name="$2" - - json_select "$name" - - if is_active; then - status="active" - else - status="not found" - fi - - echo "===== device $name: $status =====" - - is_active && common_status - - json_select .. -} - -interface_status() { - local name="$2" - - json_select "$name" - - if is_active; then - status="active" - elif ubus -S -t 0 wait_for "network.interface.$name"; then - status="down" - else - status="not found" - fi - - echo "===== interface $name: $status =====" - - is_active && common_status - - json_select .. -} - -json_load "$(ubus call qosify status)" -json_for_each_item device_status devices -json_for_each_item interface_status interfaces diff --git a/feeds/ucentral/qosify/files/qosify.conf b/feeds/ucentral/qosify/files/qosify.conf deleted file mode 100644 index e115672a7..000000000 --- a/feeds/ucentral/qosify/files/qosify.conf +++ /dev/null @@ -1,6 +0,0 @@ -config defaults - list defaults /etc/qosify/*.conf - option dscp_prio AF41 - option dscp_icmp +CS0 - option dscp_default_udp CS0 - option prio_max_avg_pkt_len 500 diff --git a/feeds/ucentral/qosify/files/qosify.hotplug b/feeds/ucentral/qosify/files/qosify.hotplug deleted file mode 100644 index 950812c03..000000000 --- a/feeds/ucentral/qosify/files/qosify.hotplug +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -ubus call qosify check_devices diff --git a/feeds/ucentral/qosify/files/qosify.init b/feeds/ucentral/qosify/files/qosify.init deleted file mode 100644 index f676d92a5..000000000 --- a/feeds/ucentral/qosify/files/qosify.init +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (c) 2021 OpenWrt.org - -START=19 - -USE_PROCD=1 -PROG=/usr/sbin/qosify - -add_option() { - local type="$1" - local name="$2" - - config_get val "$cfg" "$name" - - [ -n "$val" ] && json_add_$type "$name" "$val" -} - -add_flow_config() { - local cfg="$1" - - add_option string dscp_prio - add_option string dscp_bulk - add_option int bulk_trigger_timeout - add_option int bulk_trigger_pps - add_option int prio_max_avg_pkt_len -} - -add_defaults() { - cfg="$1" - - json_add_boolean reset 1 - - config_get files "$cfg" defaults - json_add_array files - for i in $files; do - json_add_string "" "$i" - done - json_close_array - - add_flow_config "$cfg" - add_option int timeout - add_option string dscp_icmp - add_option string dscp_default_udp - add_option string dscp_default_tcp -} - -add_interface() { - local cfg="$1" - - config_get_bool disabled "$cfg" disabled 0 - [ "$disabled" -gt 0 ] && return - - config_get name "$cfg" name - json_add_object "$name" - - config_get bw "$cfg" bandwidth - - config_get bw_up "$cfg" bandwidth_up - bw_up="${bw_up:-$bw}" - [ -n "$bw_up" ] && json_add_string bandwidth_up "$bw_up" - - config_get bw_down "$cfg" bandwidth_down - bw_down="${bw_down:-$bw}" - [ -n "$bw_down" ] && json_add_string bandwidth_down "$bw_down" - - add_option string bandwidth - add_option boolean ingress - add_option boolean egress - add_option string mode - add_option boolean nat - add_option boolean host_isolate - add_option boolean autorate_ingress - add_option string ingress_options - add_option string egress_options - - config_get user_options "$cfg" options - - config_get otype "$cfg" overhead_type - options= - case "$otype" in - none);; - manual) - config_get overhead "$cfg" overhead - [ -n "$overhead" ] && append options "overhead $overhead" - - config_get encap "$cfg" overhead_encap - [ -n "$encap" ] && append options "$encap" - ;; - conservative|\ - pppoa-vcmux|\ - pppoa-llc|\ - pppoe-vcmux|\ - pppoe-llcsnap|\ - bridged-vcmux|\ - bridged-llcsnap|\ - ipoa-vcmux|\ - ipoa-llcsnap|\ - pppoe-ptm|\ - bridged-ptm|\ - docsis|\ - ethernet) - append options "$otype" - ;; - esac - - config_get mpu "$cfg" overhead_mpu - [ -n "$mpu" ] && append options "mpu $mpu" - - config_get ovlan "$cfg" overhead_vlan - [ "${ovlan:-0}" -ge 2 ] && append options "ether-vlan" - [ "${ovlan:-0}" -ge 1 ] && append options "ether-vlan" - - [ -n "$user_options" ] && append options "$user_options" - [ -n "$options" ] && json_add_string options "$options" - - json_close_object -} - -add_class() { - local cfg="$1" - - config_get value "$cfg" value - config_get ingress "$cfg" ingress - config_get egress "$cfg" egress - - json_add_object "$cfg" - json_add_string ingress "${ingress:-$value}" - json_add_string egress "${egress:-$value}" - add_flow_config "$cfg" - json_close_object -} - - -reload_service() { - json_init - - config_load qosify - - config_foreach add_defaults defaults - - json_add_object interfaces - config_foreach add_interface interface - json_close_object - - json_add_object classes - config_foreach add_class class - config_foreach add_class alias - json_close_object - - json_add_object devices - config_foreach add_interface device - json_close_object - - ubus call qosify config "$(json_dump)" -} - -service_triggers() { - procd_add_reload_trigger qosify -} - -start_service() { - procd_open_instance - procd_set_param command "$PROG" - procd_set_param respawn - procd_close_instance -} - -service_started() { - ubus -t 10 wait_for qosify - [ $? = 0 ] && reload_service -}