Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2023-07-19 17:11:53 +05:30 committed by GitHub
commit 95632c5d1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package/base-files/files/etc/init.d/boot
View file

@ -39,6 +39,7 @@ boot() {
grep -q pstore /proc/filesystems && /bin/mount -o noatime -t pstore pstore /sys/fs/pstore grep -q pstore /proc/filesystems && /bin/mount -o noatime -t pstore pstore /sys/fs/pstore
[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
touch /tmp/.config_pending
/sbin/kmodloader /sbin/kmodloader
[ ! -f /etc/config/wireless ] && { [ ! -f /etc/config/wireless ] && {
@ -47,6 +48,8 @@ boot() {
} }
/bin/config_generate /bin/config_generate
rm -f /tmp/.config_pending
/sbin/wifi config
uci_apply_defaults uci_apply_defaults
sync sync

1
package/base-files/files/sbin/wifi
View file

@ -175,6 +175,7 @@ wifi_detect_notice() {
} }
wifi_config() { wifi_config() {
[ -e /tmp/.config_pending ] && return
[ ! -f /etc/config/wireless ] && touch /etc/config/wireless [ ! -f /etc/config/wireless ] && touch /etc/config/wireless
for driver in $DRIVERS; do ( for driver in $DRIVERS; do (

6
package/libs/libbpf/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libbpf PKG_NAME:=libbpf
PKG_VERSION:=1.2.0 PKG_VERSION:=1.2.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:=https://github.com/libbpf/libbpf PKG_SOURCE_URL:=https://github.com/libbpf/libbpf
PKG_MIRROR_HASH:=d20f5a226e5729c87c367f3fba61c44d5e13176ef12637d0e0b30629fa3ab0d6
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=fbd60dbff51c870f5e80a17c4f2fd639eb80af90 PKG_SOURCE_VERSION:=1728e3e4bef0e138ea95ffe62163eb9a6ac6fa32
PKG_MIRROR_HASH:=80a80dfba71576e017b596fb28068e2a92de629e426f063e4b37314c8d576336
PKG_ABI_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION))) PKG_ABI_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION)))
PKG_MAINTAINER:=Tony Ambardar <itugrok@yahoo.com> PKG_MAINTAINER:=Tony Ambardar <itugrok@yahoo.com>

6
package/libs/libnftnl/Makefile
View file

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libnftnl PKG_NAME:=libnftnl
PKG_CPE_ID:=cpe:/a:netfilter:libnftnl PKG_CPE_ID:=cpe:/a:netfilter:libnftnl
PKG_VERSION:=1.2.5 PKG_VERSION:=1.2.6
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
PKG_HASH:=966de0a8120c8a53db859889749368bfb2cba0c4f0b4c1a30d264eccc45f1226 PKG_HASH:=ceeaea2cd92147da19f13a35a7f1a4bc2767ff897e838e4b479cf54b59c777f4
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later

4
package/network/utils/nftables/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nftables PKG_NAME:=nftables
PKG_VERSION:=1.0.7 PKG_VERSION:=1.0.8
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
PKG_HASH:=c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 PKG_HASH:=9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

4
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View file

@ -497,7 +497,9 @@ ubnt,bullet-m-xw|\
ubnt,nanostation-loco-m-xw|\ ubnt,nanostation-loco-m-xw|\
ubnt,nanostation-m-xw|\ ubnt,nanostation-m-xw|\
ubnt,powerbeam-m2-xw|\ ubnt,powerbeam-m2-xw|\
ubnt,powerbeam-m5-xw) ubnt,powerbeam-m5-xw|\
ubnt,powerbridge-m|\
ubnt,rocket-m)
ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_rssimon "wlan0" "200000" "1"
ucidef_set_led_rssi "rssilow" "RSSILOW" "red:link1" "wlan0" "1" "100" ucidef_set_led_rssi "rssilow" "RSSILOW" "red:link1" "wlan0" "1" "100"
ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "orange:link2" "wlan0" "26" "100" ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "orange:link2" "wlan0" "26" "100"

4
target/linux/ath79/generic/base-files/etc/board.d/02_network
View file

@ -111,7 +111,9 @@ ath79_setup_interfaces()
ubnt,powerbeam-5ac-gen2|\ ubnt,powerbeam-5ac-gen2|\
ubnt,powerbeam-m2-xw|\ ubnt,powerbeam-m2-xw|\
ubnt,powerbeam-m5-xw|\ ubnt,powerbeam-m5-xw|\
ubnt,powerbridge-m|\
ubnt,rocket-5ac-lite|\ ubnt,rocket-5ac-lite|\
ubnt,rocket-m|\
ubnt,unifiac-lite|\ ubnt,unifiac-lite|\
ubnt,unifiac-lr|\ ubnt,unifiac-lr|\
ubnt,unifiac-mesh|\ ubnt,unifiac-mesh|\
@ -804,6 +806,8 @@ ath79_setup_macs()
wan_mac=$(mtd_get_mac_text mac 0x18) wan_mac=$(mtd_get_mac_text mac 0x18)
label_mac=$wan_mac label_mac=$wan_mac
;; ;;
ubnt,powerbridge-m|\
ubnt,rocket-m|\
ubnt,unifi) ubnt,unifi)
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
;; ;;

4
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -113,6 +113,10 @@ case "$FIRMWARE" in
tplink,tl-wr842n-v1) tplink,tl-wr842n-v1)
caldata_extract "art" 0x1000 0x3e0 caldata_extract "art" 0x1000 0x3e0
;; ;;
ubnt,powerbridge-m|\
ubnt,rocket-m)
caldata_extract "art" 0x1000 0x1000
;;
wd,mynet-n600|\ wd,mynet-n600|\
wd,mynet-n750) wd,mynet-n750)
caldata_extract "art" 0x5000 0x440 caldata_extract "art" 0x5000 0x440

18
target/linux/ath79/image/generic-ubnt.mk
View file

@ -158,6 +158,15 @@ define Device/ubnt_powerbeam-m5-xw
endef endef
TARGET_DEVICES += ubnt_powerbeam-m5-xw TARGET_DEVICES += ubnt_powerbeam-m5-xw
define Device/ubnt_powerbridge-m
$(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := PowerBridge M
DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m
endef
TARGET_DEVICES += ubnt_powerbridge-m
define Device/ubnt_rocket-5ac-lite define Device/ubnt_rocket-5ac-lite
$(Device/ubnt-xc) $(Device/ubnt-xc)
SOC := qca9558 SOC := qca9558
@ -167,6 +176,15 @@ define Device/ubnt_rocket-5ac-lite
endef endef
TARGET_DEVICES += ubnt_rocket-5ac-lite TARGET_DEVICES += ubnt_rocket-5ac-lite
define Device/ubnt_rocket-m
$(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Rocket M
DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += rocket-m
endef
TARGET_DEVICES += ubnt_rocket-m
define Device/ubnt_routerstation_common define Device/ubnt_routerstation_common
DEVICE_PACKAGES := -kmod-ath9k -wpad-basic-mbedtls -uboot-envtools kmod-usb-ohci \ DEVICE_PACKAGES := -kmod-ath9k -wpad-basic-mbedtls -uboot-envtools kmod-usb-ohci \
kmod-usb2 fconfig kmod-usb2 fconfig

18
target/linux/ath79/image/tiny-ubnt.mk
View file

@ -70,21 +70,3 @@ define Device/ubnt_nanostation-loco-m
DEFAULT := n DEFAULT := n
endef endef
TARGET_DEVICES += ubnt_nanostation-loco-m TARGET_DEVICES += ubnt_nanostation-loco-m
define Device/ubnt_powerbridge-m
$(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := PowerBridge M
DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m
endef
TARGET_DEVICES += ubnt_powerbridge-m
define Device/ubnt_rocket-m
$(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Rocket M
DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += rocket-m
endef
TARGET_DEVICES += ubnt_rocket-m

4
target/linux/ath79/tiny/base-files/etc/board.d/01_leds
View file

@ -116,9 +116,7 @@ ubnt,bullet-m-ar7241|\
ubnt,nanobridge-m|\ ubnt,nanobridge-m|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m|\
ubnt,nanostation-m|\ ubnt,nanostation-m|\
ubnt,picostation-m|\ ubnt,picostation-m)
ubnt,powerbridge-m|\
ubnt,rocket-m)
ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_rssimon "wlan0" "200000" "1"
ucidef_set_led_rssi "rssilow" "RSSILOW" "red:link1" "wlan0" "1" "100" ucidef_set_led_rssi "rssilow" "RSSILOW" "red:link1" "wlan0" "1" "100"
ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "orange:link2" "wlan0" "26" "100" ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "orange:link2" "wlan0" "26" "100"

8
target/linux/ath79/tiny/base-files/etc/board.d/02_network
View file

@ -54,9 +54,7 @@ ath79_setup_interfaces()
ubnt,bullet-m-ar7241|\ ubnt,bullet-m-ar7241|\
ubnt,nanobridge-m|\ ubnt,nanobridge-m|\
ubnt,picostation-m|\ ubnt,picostation-m|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m)
ubnt,powerbridge-m|\
ubnt,rocket-m)
ucidef_set_interface_lan "eth0" ucidef_set_interface_lan "eth0"
;; ;;
engenius,enh202-v1) engenius,enh202-v1)
@ -135,9 +133,7 @@ ath79_setup_macs()
ubnt,nanobridge-m|\ ubnt,nanobridge-m|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m|\
ubnt,nanostation-m|\ ubnt,nanostation-m|\
ubnt,picostation-m|\ ubnt,picostation-m)
ubnt,powerbridge-m|\
ubnt,rocket-m)
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
;; ;;
tplink,tl-wr941-v2|\ tplink,tl-wr941-v2|\

4
target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -43,9 +43,7 @@ case "$FIRMWARE" in
ubnt,nanobridge-m|\ ubnt,nanobridge-m|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m|\
ubnt,nanostation-m|\ ubnt,nanostation-m|\
ubnt,picostation-m|\ ubnt,picostation-m)
ubnt,powerbridge-m|\
ubnt,rocket-m)
caldata_extract "art" 0x1000 0x1000 caldata_extract "art" 0x1000 0x1000
;; ;;
pqi,air-pen) pqi,air-pen)

2
target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts
View file

@ -10,7 +10,7 @@
label = "eth0"; label = "eth0";
phy-handle = <&ethphy0>; phy-handle = <&ethphy0>;
nvmem-cells = <&macaddr_factory_22>; nvmem-cells = <&macaddr_factory_22 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };