mirror of
https://github.com/hanwckf/immortalwrt-mt798x.git
synced 2025-01-08 10:23:47 +08:00
Merge Official Source
This commit is contained in:
CN_SZTL
commit
58534e772f
@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git
|
||||
PKG_SOURCE_DATE:=2020-01-10
|
||||
PKG_SOURCE_VERSION:=aeff7a3e61ffa3159a8a95384d33e47a006211f4
|
||||
PKG_MIRROR_HASH:=5bf06a804824db36ae393fc174aeec7b12633176e05a765c0931b39df5bd34df
|
||||
PKG_MIRROR_HASH:=3f634fdc05d30988abb4cae2f7fcb4bd55ff10b0b354ac16b8577e85a4b74f6f
|
||||
PKG_MAINTAINER:=Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NAME:=openvpn
|
||||
|
||||
PKG_VERSION:=2.4.9
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE_URL:=\
|
||||
https://build.openvpn.net/downloads/releases/ \
|
||||
@ -112,6 +112,7 @@ define Package/openvpn-$(BUILD_VARIANT)/install
|
||||
$(1)/etc/init.d \
|
||||
$(1)/etc/config \
|
||||
$(1)/etc/openvpn \
|
||||
$(1)/lib/functions \
|
||||
$(1)/lib/upgrade/keep.d \
|
||||
$(1)/usr/libexec \
|
||||
$(1)/etc/hotplug.d/openvpn
|
||||
@ -128,6 +129,10 @@ define Package/openvpn-$(BUILD_VARIANT)/install
|
||||
files/usr/libexec/openvpn-hotplug \
|
||||
$(1)/usr/libexec/openvpn-hotplug
|
||||
|
||||
$(INSTALL_DATA) \
|
||||
files/lib/functions/openvpn.sh \
|
||||
$(1)/lib/functions/openvpn.sh
|
||||
|
||||
$(INSTALL_DATA) \
|
||||
files/etc/hotplug.d/openvpn/01-user \
|
||||
$(1)/etc/hotplug.d/openvpn/01-user
|
||||
|
||||
@ -1,17 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
get_option() {
|
||||
local variable="$1"
|
||||
local option="$2"
|
||||
|
||||
local value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+(([^ \t\\]|\\.)+)[ \t]*$/\1/p' "$config" | tail -n1 | sed -re 's/\\(.)/\1/g')"
|
||||
[ -n "$value" ] || value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+'"'([^']+)'"'[ \t]*$/\1/p' "$config" | tail -n1)"
|
||||
[ -n "$value" ] || value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+"(([^"\\]|\\.)+)"[ \t]*$/\1/p' "$config" | tail -n1 | sed -re 's/\\(.)/\1/g')"
|
||||
[ -n "$value" ] || return 1
|
||||
|
||||
export -n "$variable=$value"
|
||||
return 0
|
||||
}
|
||||
. /lib/functions/openvpn.sh
|
||||
|
||||
[ -e "/etc/openvpn.user" ] && {
|
||||
env -i ACTION="$ACTION" INSTANCE="$INSTANCE" \
|
||||
@ -23,7 +12,7 @@ get_option() {
|
||||
# Wrap user defined scripts on up/down events
|
||||
case "$ACTION" in
|
||||
up|down)
|
||||
if get_option command "$ACTION"; then
|
||||
if get_openvpn_option "$config" command "$ACTION"; then
|
||||
exec /bin/sh -c "$command $ACTION $INSTANCE $*"
|
||||
fi
|
||||
;;
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
#!/bin/sh
|
||||
|
||||
get_openvpn_option() {
|
||||
local config="$1"
|
||||
local variable="$2"
|
||||
local option="$3"
|
||||
|
||||
local value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+(([^ \t\\]|\\.)+)[ \t]*$/\1/p' "$config" | tail -n1 | sed -re 's/\\(.)/\1/g')"
|
||||
[ -n "$value" ] || value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+'"'([^']+)'"'[ \t]*$/\1/p' "$config" | tail -n1)"
|
||||
[ -n "$value" ] || value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+"(([^"\\]|\\.)+)"[ \t]*$/\1/p' "$config" | tail -n1 | sed -re 's/\\(.)/\1/g')"
|
||||
[ -n "$value" ] || return 1
|
||||
|
||||
export -n "$variable=$value"
|
||||
return 0
|
||||
}
|
||||
|
||||
@ -69,6 +69,40 @@ section_enabled() {
|
||||
[ $enable -gt 0 ] || [ $enabled -gt 0 ]
|
||||
}
|
||||
|
||||
openvpn_get_dev() {
|
||||
local dev dev_type
|
||||
local name="$1"
|
||||
local conf="$2"
|
||||
|
||||
# Do override only for configurations with config_file
|
||||
config_get config_file "$name" config
|
||||
[ -n "$config_file" ] || return
|
||||
|
||||
# Check there is someething to override
|
||||
config_get dev "$name" dev
|
||||
config_get dev_type "$name" dev_type
|
||||
[ -n "$dev" ] || return
|
||||
|
||||
# If there is a no dev_type, try to guess it
|
||||
if [ -z "$dev_type" ]; then
|
||||
. /lib/functions/openvpn.sh
|
||||
|
||||
local odev odev_type
|
||||
get_openvpn_option "$conf" odev dev
|
||||
get_openvpn_option "$conf" odev_type dev-type
|
||||
[ -n "$odev_type" ] || odev_type="$odev"
|
||||
|
||||
case "$odev_type" in
|
||||
tun*) dev_type="tun" ;;
|
||||
tap*) dev_type="tap" ;;
|
||||
*) return;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Return overrides
|
||||
echo "--dev-type $dev_type --dev $dev"
|
||||
}
|
||||
|
||||
openvpn_add_instance() {
|
||||
local name="$1"
|
||||
local dir="$2"
|
||||
@ -83,7 +117,8 @@ openvpn_add_instance() {
|
||||
--config "$conf" \
|
||||
--up "/usr/libexec/openvpn-hotplug up $name" \
|
||||
--down "/usr/libexec/openvpn-hotplug down $name" \
|
||||
--script-security "${security:-2}"
|
||||
--script-security "${security:-2}" \
|
||||
$(openvpn_get_dev "$name" "$conf")
|
||||
procd_set_param file "$dir/$conf"
|
||||
procd_set_param term_timeout 15
|
||||
procd_set_param respawn
|
||||
|
||||
@ -12,9 +12,9 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_DATE:=2020-06-08
|
||||
PKG_SOURCE_VERSION:=d13290b427487bb05581e11875af3bfe74d6da2d
|
||||
PKG_MIRROR_HASH:=6cd38b41b341212359ddc723fc54ea16a2a7009519db015fb51cd2afb7324369
|
||||
PKG_SOURCE_DATE:=2020-07-20
|
||||
PKG_SOURCE_VERSION:=eadfa26a5cf31e27f551c37c1362983e9db37c4d
|
||||
PKG_MIRROR_HASH:=a7ea35b9078543050399cda08da49199f49e2535cb8dd957e0dc5a7ff86c32a4
|
||||
|
||||
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
|
||||
PKG_LICENSE:=LGPL-2.1
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
board_config_update
|
||||
|
||||
case "$(board_name)" in
|
||||
"arc-sdp"*)
|
||||
"snps,axs101")
|
||||
ucidef_set_interface_lan "eth0" "dhcp"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2015 OpenWrt.org
|
||||
#
|
||||
|
||||
# defaults
|
||||
ARC_BOARD_NAME="generic"
|
||||
ARC_BOARD_MODEL="Generic ARC board"
|
||||
|
||||
arc_board_detect() {
|
||||
local board
|
||||
local model
|
||||
local compatible
|
||||
|
||||
[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
|
||||
|
||||
model="$( cat /proc/device-tree/model )"
|
||||
compatible="$( cat /proc/device-tree/compatible )"
|
||||
|
||||
case "$compatible" in
|
||||
"snps,axs101""snps,arc-sdp")
|
||||
board="arc-sdp";
|
||||
;;
|
||||
"snps,nsim")
|
||||
board="arc-nsim";
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "$board" != "" ]; then
|
||||
ARC_BOARD_NAME="$board"
|
||||
fi
|
||||
|
||||
if [ "$model" != "" ]; then
|
||||
ARC_BOARD_MODEL="$model"
|
||||
fi
|
||||
|
||||
echo "$ARC_BOARD_NAME" > /tmp/sysinfo/board_name
|
||||
echo "$ARC_BOARD_MODEL" > /tmp/sysinfo/model
|
||||
echo "Detected $ARC_BOARD_NAME // $ARC_BOARD_MODEL"
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
do_arc() {
|
||||
. /lib/arc.sh
|
||||
|
||||
arc_board_detect
|
||||
}
|
||||
|
||||
boot_hook_add preinit_main do_arc
|
||||
@ -8,7 +8,8 @@
|
||||
board_config_update
|
||||
|
||||
case "$(board_name)" in
|
||||
"arc-sdp"*|"arc-hsdk"*)
|
||||
snps,axs103|\
|
||||
snps,hsdk)
|
||||
ucidef_set_interface_lan "eth0" "dhcp"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2016 OpenWrt.org
|
||||
#
|
||||
|
||||
# defaults
|
||||
ARC_BOARD_NAME="generic"
|
||||
ARC_BOARD_MODEL="Generic ARC board"
|
||||
|
||||
arc_board_detect() {
|
||||
local board
|
||||
local model
|
||||
local compatible
|
||||
|
||||
[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
|
||||
|
||||
model="$( cat /proc/device-tree/model )"
|
||||
compatible="$( cat /proc/device-tree/compatible )"
|
||||
|
||||
case "$compatible" in
|
||||
"snps,axs103""snps,arc-sdp")
|
||||
board="arc-sdp";
|
||||
;;
|
||||
"snps,hsdk")
|
||||
board="arc-hsdk";
|
||||
;;
|
||||
"snps,nsim_hs")
|
||||
board="arc-nsim";
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "$board" != "" ]; then
|
||||
ARC_BOARD_NAME="$board"
|
||||
fi
|
||||
|
||||
if [ "$model" != "" ]; then
|
||||
ARC_BOARD_MODEL="$model"
|
||||
fi
|
||||
|
||||
echo "$ARC_BOARD_NAME" > /tmp/sysinfo/board_name
|
||||
echo "$ARC_BOARD_MODEL" > /tmp/sysinfo/model
|
||||
echo "Detected $ARC_BOARD_NAME // $ARC_BOARD_MODEL"
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
do_arc() {
|
||||
. /lib/arc.sh
|
||||
|
||||
arc_board_detect
|
||||
}
|
||||
|
||||
boot_hook_add preinit_main do_arc
|
||||
@ -9,8 +9,21 @@
|
||||
model = "GL.iNet GL-AR750S (NOR/NAND)";
|
||||
};
|
||||
|
||||
&nor_kernel {
|
||||
label = "kernel";
|
||||
&nor_partitions {
|
||||
partition@60000 {
|
||||
label = "kernel";
|
||||
reg = <0x060000 0x400000>;
|
||||
|
||||
/*
|
||||
* U-Boot bootcmd is "bootm 0x9f060000".
|
||||
* So this might be possible to resize in the future.
|
||||
*/
|
||||
};
|
||||
|
||||
partition@460000 {
|
||||
label = "nor_reserved";
|
||||
reg = <0x460000 0xba0000>;
|
||||
};
|
||||
};
|
||||
|
||||
&nand_ubi {
|
||||
|
||||
@ -9,10 +9,10 @@
|
||||
model = "GL.iNet GL-AR750S (NOR)";
|
||||
};
|
||||
|
||||
/delete-node/ &nor_kernel;
|
||||
/delete-node/ &nor_reserved;
|
||||
|
||||
&nor_firmware {
|
||||
compatible = "denx,uimage";
|
||||
label = "firmware";
|
||||
&nor_partitions {
|
||||
partition@60000 {
|
||||
compatible = "denx,uimage";
|
||||
label = "firmware";
|
||||
reg = <0x060000 0xfa0000>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -99,20 +99,7 @@
|
||||
read-only;
|
||||
};
|
||||
|
||||
nor_firmware: partition@60000 {
|
||||
label = "nor_firmware";
|
||||
reg = <0x060000 0xfa0000>;
|
||||
};
|
||||
|
||||
nor_kernel: partition_alt@60000 {
|
||||
label = "nor_kernel";
|
||||
reg = <0x060000 0x400000>;
|
||||
};
|
||||
|
||||
nor_reserved: parition_alt@460000 {
|
||||
label = "nor_reserved";
|
||||
reg = <0x460000 0xba0000>;
|
||||
};
|
||||
/* Firmware / Kernel flash type specific */
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -117,24 +117,15 @@ define Device/glinet_gl-ar750s-common
|
||||
DEVICE_MODEL := GL-AR750S
|
||||
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \
|
||||
kmod-usb-storage block-mount
|
||||
KERNEL_SIZE := 2048k
|
||||
IMAGE_SIZE := 16000k
|
||||
PAGESIZE := 2048
|
||||
VID_HDR_OFFSET := 2048
|
||||
endef
|
||||
|
||||
# NB: The kernel size is intentionally restricted at this time; see commit message
|
||||
define Device/glinet_gl-ar750s-nor-nand
|
||||
$(Device/glinet_gl-ar750s-common)
|
||||
DEVICE_VARIANT := NOR/NAND
|
||||
BLOCKSIZE := 128k
|
||||
GL_UBOOT_UBI_OFFSET := 2048k
|
||||
IMAGES += factory.img
|
||||
IMAGE/factory.img := append-kernel | pad-to $$$$(GL_UBOOT_UBI_OFFSET) | \
|
||||
append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET)
|
||||
KERNEL_SIZE := 4096k
|
||||
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
|
||||
SUPPORTED_DEVICES += glinet,gl-ar750s-nor
|
||||
DEFAULT := n
|
||||
endef
|
||||
TARGET_DEVICES += glinet_gl-ar750s-nor-nand
|
||||
|
||||
@ -143,7 +134,6 @@ define Device/glinet_gl-ar750s-nor
|
||||
DEVICE_VARIANT := NOR
|
||||
BLOCKSIZE := 64k
|
||||
SUPPORTED_DEVICES += gl-ar750s glinet,gl-ar750s glinet,gl-ar750s-nor-nand
|
||||
DEFAULT := n
|
||||
endef
|
||||
TARGET_DEVICES += glinet_gl-ar750s-nor
|
||||
|
||||
|
||||
@ -348,6 +348,16 @@
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
keys {
|
||||
compatible = "gpio-keys";
|
||||
|
||||
reset {
|
||||
label = "reset";
|
||||
gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_RESTART>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&gmac0 {
|
||||
|
||||
@ -82,7 +82,7 @@
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <10000000>;
|
||||
spi-max-frequency = <30000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
|
||||
@ -121,7 +121,7 @@
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <10000000>;
|
||||
spi-max-frequency = <30000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <10000000>;
|
||||
spi-max-frequency = <30000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
|
||||
@ -81,13 +81,7 @@
|
||||
partition@10000 {
|
||||
compatible = "tplink,firmware";
|
||||
label = "firmware";
|
||||
reg = <0x10000 0x3d0000>;
|
||||
};
|
||||
|
||||
partition@3e0000 {
|
||||
label = "config";
|
||||
reg = <0x3e0000 0x10000>;
|
||||
read-only;
|
||||
reg = <0x10000 0x3e0000>;
|
||||
};
|
||||
|
||||
factory: partition@3f0000 {
|
||||
|
||||
@ -498,7 +498,7 @@ TARGET_DEVICES += tplink_tl-wr841n-v13
|
||||
|
||||
define Device/tplink_tl-wr841n-v14
|
||||
$(Device/tplink-v2)
|
||||
IMAGE_SIZE := 3904k
|
||||
IMAGE_SIZE := 3968k
|
||||
DEVICE_MODEL := TL-WR841N
|
||||
DEVICE_VARIANT := v14
|
||||
TPLINK_FLASHLAYOUT := 4Mmtk
|
||||
|
||||
@ -9,6 +9,8 @@ CPU_TYPE:=24kc
|
||||
|
||||
DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic swconfig
|
||||
|
||||
KERNEL_PATCHVER:=5.4
|
||||
|
||||
define Target/Description
|
||||
Build firmware images for Ralink MT7620 based boards.
|
||||
endef
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2006-2012 OpenWrt.org
|
||||
# Copyright (C) 2006-2020 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
@ -7,6 +7,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME := firmware-utils
|
||||
PKG_RELEASE := 1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
@ -7,6 +7,8 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME := flock
|
||||
PKG_VERSION := 2.18
|
||||
PKG_RELEASE := 1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=missing-macros
|
||||
PKG_VERSION:=10
|
||||
PKG_RELEASE:=10
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=padjffs2
|
||||
PKG_VERSION:=1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2007-2012 OpenWrt.org
|
||||
# Copyright (C) 2007-2020 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
@ -7,6 +7,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=patch-image
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
||||
@ -7,6 +7,8 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=sstrip
|
||||
PKG_VERSION:=2.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user