fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-04-18 01:38:03 +08:00
commit 84e6b128eb
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/config/netifd/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
PKG_SOURCE_DATE:=2023-02-25 PKG_SOURCE_DATE:=2023-04-17
PKG_SOURCE_VERSION:=463a1207f0766417866e2c28316e58a96f84370b PKG_SOURCE_VERSION:=7de5440a520f9c6687358c7ef88ac4aad0ff98a5
PKG_MIRROR_HASH:=1d407847282637f6e069b482368f2f8fc0126e66f3b37e4258e1fc1d19dd1ce5 PKG_MIRROR_HASH:=aaf6aef1c991c67b6ef43b4c7f102ba94319bf522f620e93293d031b8333bd8f
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

4
package/network/utils/tcpdump/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tcpdump PKG_NAME:=tcpdump
PKG_VERSION:=4.99.3 PKG_VERSION:=4.99.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.tcpdump.org/release/ PKG_SOURCE_URL:=https://www.tcpdump.org/release/
PKG_HASH:=ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 PKG_HASH:=0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

12
target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
View File

@ -33,23 +33,23 @@
}; };
rssilow { rssilow {
label = "red:signal1"; label = "red:rssilow";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>; gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
}; };
rssimediumlow { rssimediumlow {
label = "red:signal2"; label = "red:rssimediumlow";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>; gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
}; };
rssimediumhigh { rssimediumhigh {
label = "green:signal3"; label = "green:rssimediumhigh";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>; gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
}; };
led_rssihigh: rssihigh { led_rssihigh: rssihigh {
label = "green:signal4"; label = "green:rssihigh";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
}; };
wlan { wlan {

11
target/linux/ramips/dts/mt7628an_xiaomi_mi-ra75.dts
View File

@ -32,6 +32,10 @@
label = "amber:signal"; label = "amber:signal";
gpios = <&gpio 37 GPIO_ACTIVE_LOW>; gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
}; };
led_signal_red: signal_red {
label = "red:signal";
gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};
}; };
keys { keys {
@ -51,6 +55,13 @@
}; };
&state_default {
gpio {
groups = "gpio", "refclk", "wdt", "wled_an", "uart1";
function = "gpio";
};
};
&partitions { &partitions {
partition@60000 { partition@60000 {
label = "overlay"; label = "overlay";

6
tools/libdeflate/Makefile
View File

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libdeflate PKG_NAME:=libdeflate
PKG_VERSION:=1.17 PKG_VERSION:=1.18
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate.git PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MIRROR_HASH:=ee5790cf3140aa6a2e0f0c400d4b32539f13cb270e9357135c51927ba3784dc7 PKG_MIRROR_HASH:=015cbd33b1382b812f7c035640709186bc5d3d6a0ab177bffa7948f26f64edf9
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk