diff --git a/.gitignore b/.gitignore index 6549af83be..55072ca5bd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,10 @@ /overlay /package/feeds /package/openwrt-packages +scripts/config/mconf_check +scripts/config/zconf.hash.c +scripts/config/zconf.lex.c +scripts/config/zconf.tab.c /*.patch key-build* *.orig diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 6dade49bad..75222889c0 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -867,6 +867,16 @@ define KernelPackage/sched-ctinfo endef $(eval $(call KernelPackage,sched-ctinfo)) +define KernelPackage/sched-police + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Traffic shaper police support + DEPENDS:=+kmod-sched-core + KCONFIG:=CONFIG_NET_ACT_POLICE + FILES:=$(LINUX_DIR)/net/sched/act_police.ko + AUTOLOAD:=$(call AutoLoad,71, act_police) +endef +$(eval $(call KernelPackage,sched-police)) + define KernelPackage/sched-ipset SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic shaper ipset support diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index e4fd875019..d332e02bbd 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -90,6 +90,7 @@ dlink,dwr-922-e2) dlink,dwr-960) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x2e" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ;; dovado,tiny-ac) set_wifi_led "$boardname:orange:wifi" ;; diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 039959e424..d7c994c338 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -21,7 +21,7 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk ifneq ($(shell $(HOSTCC) --version | grep clang),) - HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 + HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t endif HOST_CFLAGS += $(FPIC)