From ad523ce465f595010b5488e0fdcf1ffa0679d619 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 25 Jan 2020 23:06:07 +0900 Subject: [PATCH 01/16] base-files: add functions to set or clear bit in MAC address Some devices (e.g. Arduino Yun) need bitwise operations during MAC address setup. This commit adds generalized versions of macaddr_setbit_la(), which are helpful when manipulating a single bit in a MAC address. Signed-off-by: Sungbo Eo --- .../base-files/files/lib/functions/system.sh | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh index 7321c022f2..db73bf3788 100755 --- a/package/base-files/files/lib/functions/system.sh +++ b/package/base-files/files/lib/functions/system.sh @@ -145,10 +145,26 @@ macaddr_add() { echo $oui:$nic } -macaddr_setbit_la() { +macaddr_setbit() { local mac=$1 + local bit=${2:-0} - printf "%02x:%s" $((0x${mac%%:*} | 0x02)) ${mac#*:} + [ $bit -gt 0 -a $bit -le 48 ] || return + + printf "%012x" $(( 0x${mac//:/} | 2**(48-bit) )) | sed -e 's/\(.\{2\}\)/\1:/g' -e 's/:$//' +} + +macaddr_unsetbit() { + local mac=$1 + local bit=${2:-0} + + [ $bit -gt 0 -a $bit -le 48 ] || return + + printf "%012x" $(( 0x${mac//:/} & ~(2**(48-bit)) )) | sed -e 's/\(.\{2\}\)/\1:/g' -e 's/:$//' +} + +macaddr_setbit_la() { + macaddr_setbit $1 7 } macaddr_2bin() { From 7c23f6fcde7cf511cb5adce8d6fe0b73dfb62eab Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 11 Jul 2020 13:48:40 +0200 Subject: [PATCH 02/16] base-files: add function for generating random MAC This adds a function for generating a valid random MAC address (unset MC bit / set locally administered bit). It is necessary for devices which do not have a MAC address programmed by the manufacturer. Signed-off-by: David Bauer --- package/base-files/files/lib/functions/system.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh index db73bf3788..ef1c59d7a4 100755 --- a/package/base-files/files/lib/functions/system.sh +++ b/package/base-files/files/lib/functions/system.sh @@ -167,6 +167,18 @@ macaddr_setbit_la() { macaddr_setbit $1 7 } +macaddr_unsetbit_mc() { + local mac=$1 + + printf "%02x:%s" $((0x${mac%%:*} & ~0x01)) ${mac#*:} +} + +macaddr_random() { + local randsrc=$(get_mac_binary /dev/urandom 0) + + echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${randsrc}")")" +} + macaddr_2bin() { local mac=$1 From d20975bfbc32e70a3cb8e0bf0cd100e3fb03be89 Mon Sep 17 00:00:00 2001 From: Jayantajit Gogoi Date: Mon, 12 Oct 2020 18:51:34 +0000 Subject: [PATCH 03/16] sunxi: add support for FriendlyARM NanoPi R1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specification: - CPU: Allwinner H3, Quad-core Cortex-A7 Up to 1.2GHz - DDR3 RAM: 512MB/1GB - Network: 10/100/1000M Ethernet x 1， 10/100M Ethernet x 1 - WiFi: 802.11b/g/n, with SMA antenna interface - USB Host: Type-A x2 - MicroSD Slot x 1 - MicroUSB: for OTG and power input - Debug Serial Port: 3Pin 2.54mm pitch pin-header - LED: nanopi:red:status nanopi:green:wan nanopi:green:lan - KEY: reset - Power Supply: DC 5V/2A Installation: - Write the image to SD Card with dd - Boot NanoPi from the SD Card Signed-off-by: Jayantajit Gogoi --- package/boot/uboot-sunxi/Makefile | 7 + ...1-sunxi-h3-add-support-for-nanopi-r1.patch | 198 ++++++++++++++++++ .../sunxi/base-files/etc/board.d/01_leds | 20 ++ .../sunxi/base-files/etc/board.d/02_network | 3 + target/linux/sunxi/image/cortex-a7.mk | 10 + ...2-sunxi-h3-add-support-for-nanopi-r1.patch | 171 +++++++++++++++ 6 files changed, 409 insertions(+) create mode 100644 package/boot/uboot-sunxi/patches/251-sunxi-h3-add-support-for-nanopi-r1.patch create mode 100755 target/linux/sunxi/base-files/etc/board.d/01_leds create mode 100644 target/linux/sunxi/patches-4.19/102-sunxi-h3-add-support-for-nanopi-r1.patch diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index eef4c56f53..116c91848f 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -150,6 +150,12 @@ define U-Boot/nanopi_neo BUILD_DEVICES:=friendlyarm_nanopi-neo endef +define U-Boot/nanopi_r1 + BUILD_SUBTARGET:=cortexa7 + NAME:=U-Boot for NanoPi R1 (H3) + BUILD_DEVICES:=friendlyarm_nanopi-r1 +endef + define U-Boot/orangepi_r1 BUILD_SUBTARGET:=cortexa7 NAME:=Orange Pi R1 (H2+) @@ -283,6 +289,7 @@ UBOOT_TARGETS := \ nanopi_neo_air \ nanopi_neo_plus2 \ nanopi_neo2 \ + nanopi_r1 \ orangepi_zero \ orangepi_r1 \ orangepi_one \ diff --git a/package/boot/uboot-sunxi/patches/251-sunxi-h3-add-support-for-nanopi-r1.patch b/package/boot/uboot-sunxi/patches/251-sunxi-h3-add-support-for-nanopi-r1.patch new file mode 100644 index 0000000000..308e7695e1 --- /dev/null +++ b/package/boot/uboot-sunxi/patches/251-sunxi-h3-add-support-for-nanopi-r1.patch @@ -0,0 +1,198 @@ +From 0e8043aff1aae95d1f7b7422b91b57d9569860d3 Mon Sep 17 00:00:00 2001 +From: Jayantajit Gogoi +Date: Mon, 12 Oct 2020 18:39:53 +0000 +Subject: [PATCH] sunxi: add support for FriendlyARM NanoPi R1 + +Signed-off-by: Jayantajit Gogoi +--- + arch/arm/dts/Makefile | 1 + + arch/arm/dts/sun8i-h3-nanopi-r1.dts | 146 ++++++++++++++++++++++++++++ + configs/nanopi_r1_defconfig | 22 +++++ + 3 files changed, 169 insertions(+) + create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts + create mode 100644 configs/nanopi_r1_defconfig + +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -383,6 +383,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ + sun8i-h3-nanopi-m1-plus.dtb \ + sun8i-h3-nanopi-neo.dtb \ + sun8i-h3-nanopi-neo-air.dtb \ ++ sun8i-h3-nanopi-r1.dtb \ + sun8i-h3-orangepi-2.dtb \ + sun8i-h3-orangepi-lite.dtb \ + sun8i-h3-orangepi-one.dtb \ +--- /dev/null ++++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts +@@ -0,0 +1,146 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (C) 2019 Igor Pecovnik ++ * Copyright (C) 2020 Jayantajit Gogoi ++ */ ++ ++/* NanoPi R1 is based on the NanoPi-H3 design from FriendlyARM */ ++#include "sun8i-h3-nanopi.dtsi" ++ ++/ { ++ model = "FriendlyARM NanoPi R1"; ++ compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ enable-active-high; ++ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ vdd_cpux: gpio-regulator { ++ compatible = "regulator-gpio"; ++ pinctrl-names = "default"; ++ regulator-name = "vdd-cpux"; ++ regulator-type = "voltage"; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-ramp-delay = <50>; ++ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; ++ gpios-states = <0x1>; ++ states = <1100000 0x0 ++ 1300000 0x1>; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ pinctrl-names = "default"; ++ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; ++ }; ++ ++ leds { ++ /delete-node/ pwr; ++ status { ++ label = "nanopi:red:status"; ++ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ wan { ++ label = "nanopi:green:wan"; ++ gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ lan { ++ label = "nanopi:green:lan"; ++ gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ r_gpio_keys { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sw_r_npi>; ++ ++ /delete-node/ k1; ++ reset { ++ label = "reset"; ++ linux,code = ; ++ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vdd_cpux>; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&ehci2 { ++ status = "okay"; ++}; ++ ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emac_rgmii_pins>; ++ phy-supply = <®_gmac_3v3>; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-mode = "rgmii"; ++ status = "okay"; ++}; ++ ++&external_mdio { ++ ext_rgmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <7>; ++ }; ++}; ++ ++&mmc1 { ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ sdio_wifi: sdio_wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ interrupt-parent = <&pio>; ++ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; ++ interrupt-names = "host-wake"; ++ }; ++}; ++ ++&mmc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc2_8bit_pins>; ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ bus-width = <8>; ++ non-removable; ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&ohci2 { ++ status = "okay"; ++}; ++ ++&r_pio { ++ sw_r_npi: key_pins { ++ pins = "PL3"; ++ function = "gpio_in"; ++ }; ++}; +--- /dev/null ++++ b/configs/nanopi_r1_defconfig +@@ -0,0 +1,22 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_SPL=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++CONFIG_MACPWR="PD6" ++# CONFIG_VIDEO_DE2 is not set ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_CONSOLE_MUX=y ++CONFIG_SYS_CLK_FREQ=480000000 ++# CONFIG_CMD_FLASH is not set ++# CONFIG_SPL_DOS_PARTITION is not set ++# CONFIG_SPL_EFI_PARTITION is not set ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1" ++CONFIG_SUN8I_EMAC=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_OHCI_HCD=y ++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/target/linux/sunxi/base-files/etc/board.d/01_leds b/target/linux/sunxi/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..514b8d1796 --- /dev/null +++ b/target/linux/sunxi/base-files/etc/board.d/01_leds @@ -0,0 +1,20 @@ +#!/bin/sh + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board=$(board_name) +boardname="${board##*,}" + +board_config_update + +case $board in +friendlyarm,nanopi-r1) + ucidef_set_led_netdev "wan" "WAN" "nanopi:green:wan" "eth0" + ucidef_set_led_netdev "lan" "LAN" "nanopi:green:lan" "eth1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index 5cf000cccf..08d31caadc 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -8,6 +8,9 @@ board_config_update case $(board_name) in +friendlyarm,nanopi-r1) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; lamobo,lamobo-r1) ucidef_add_switch "switch0" \ "4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0" diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index cc67f4dd62..f33728aa38 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -47,6 +47,16 @@ define Device/friendlyarm_nanopi-neo-air endef TARGET_DEVICES += friendlyarm_nanopi-neo-air +define Device/friendlyarm_nanopi-r1 + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi R1 + DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ + kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic \ + kmod-usb2 kmod-usb-net kmod-usb-net-rtl8152 + SOC := sun8i-h3 +endef +TARGET_DEVICES += friendlyarm_nanopi-r1 + define Device/lamobo_lamobo-r1 DEVICE_VENDOR := Lamobo DEVICE_MODEL := Lamobo R1 diff --git a/target/linux/sunxi/patches-4.19/102-sunxi-h3-add-support-for-nanopi-r1.patch b/target/linux/sunxi/patches-4.19/102-sunxi-h3-add-support-for-nanopi-r1.patch new file mode 100644 index 0000000000..c6fd371bfe --- /dev/null +++ b/target/linux/sunxi/patches-4.19/102-sunxi-h3-add-support-for-nanopi-r1.patch @@ -0,0 +1,171 @@ +From 5aee0b1272cd5b42933ef629d66b677669e2e8d2 Mon Sep 17 00:00:00 2001 +From: Jayantajit Gogoi +Date: Mon, 12 Oct 2020 05:24:51 +0000 +Subject: [PATCH] sunxi: add support for friendlyarm nanopi r1 + +Signed-off-by: Jayantajit Gogoi +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 146 ++++++++++++++++++ + 2 files changed, 147 insertions(+) + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -1039,6 +1039,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ + sun8i-h3-nanopi-m1-plus.dtb \ + sun8i-h3-nanopi-neo.dtb \ + sun8i-h3-nanopi-neo-air.dtb \ ++ sun8i-h3-nanopi-r1.dtb \ + sun8i-h3-orangepi-2.dtb \ + sun8i-h3-orangepi-lite.dtb \ + sun8i-h3-orangepi-one.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts +@@ -0,0 +1,146 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (C) 2019 Igor Pecovnik ++ * Copyright (C) 2020 Jayantajit Gogoi ++ */ ++ ++/* NanoPi R1 is based on the NanoPi-H3 design from FriendlyARM */ ++#include "sun8i-h3-nanopi.dtsi" ++ ++/ { ++ model = "FriendlyARM NanoPi R1"; ++ compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ enable-active-high; ++ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ vdd_cpux: gpio-regulator { ++ compatible = "regulator-gpio"; ++ pinctrl-names = "default"; ++ regulator-name = "vdd-cpux"; ++ regulator-type = "voltage"; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-ramp-delay = <50>; ++ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; ++ gpios-states = <0x1>; ++ states = <1100000 0x0 ++ 1300000 0x1>; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ pinctrl-names = "default"; ++ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; ++ }; ++ ++ leds { ++ /delete-node/ pwr; ++ status { ++ label = "nanopi:red:status"; ++ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ wan { ++ label = "nanopi:green:wan"; ++ gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ lan { ++ label = "nanopi:green:lan"; ++ gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ r_gpio_keys { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sw_r_npi>; ++ ++ /delete-node/ k1; ++ reset { ++ label = "reset"; ++ linux,code = ; ++ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vdd_cpux>; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&ehci2 { ++ status = "okay"; ++}; ++ ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emac_rgmii_pins>; ++ phy-supply = <®_gmac_3v3>; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-mode = "rgmii"; ++ status = "okay"; ++}; ++ ++&external_mdio { ++ ext_rgmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <7>; ++ }; ++}; ++ ++&mmc1 { ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ sdio_wifi: sdio_wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ interrupt-parent = <&pio>; ++ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; ++ interrupt-names = "host-wake"; ++ }; ++}; ++ ++&mmc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc2_8bit_pins>; ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ bus-width = <8>; ++ non-removable; ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&ohci2 { ++ status = "okay"; ++}; ++ ++&r_pio { ++ sw_r_npi: key_pins { ++ pins = "PL3"; ++ function = "gpio_in"; ++ }; ++}; From 144c82515c1cd27f2c7db581ffd145ba6b9658ab Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 29 Jan 2021 18:09:30 +0800 Subject: [PATCH 04/16] sunxi: add support for FriendlyARM NanoPi R1S H5 Specification: CPU: Allwinner H5, Quad-core Cortex-A53 DDR3 RAM: 512MB Network: 10/100/1000M Ethernet x 2 WiFi: RTL8189ETV, 802.11b/g/n 1T1R USB Host: Type-A x 1 MicroSD Slot x 1 MicroUSB: for power input Debug Serial Port: 3Pin pin-header LED: WAN, LAN, SYS KEY: Reset Power Supply: DC 5V/2A Signed-off-by: AmadeusGhost --- package/boot/uboot-sunxi/Makefile | 9 + ...nxi-h5-add-support-for-nanopi-r1s-h5.patch | 233 ++++++++++++++++++ .../sunxi/base-files/etc/board.d/01_leds | 3 +- .../sunxi/base-files/etc/board.d/02_network | 3 +- target/linux/sunxi/image/cortex-a53.mk | 13 + ...et-add-RTL8152-binding-documentation.patch | 53 ++++ ...-r8152-add-LED-configuration-from-OF.patch | 74 ++++++ ...nxi-h5-add-support-for-nanopi-r1s-h5.patch | 229 +++++++++++++++++ 8 files changed, 615 insertions(+), 2 deletions(-) create mode 100644 package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch create mode 100644 target/linux/sunxi/patches-4.19/021-dt-bindings-net-add-RTL8152-binding-documentation.patch create mode 100644 target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch create mode 100644 target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 116c91848f..f02f6b4c94 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -156,6 +156,14 @@ define U-Boot/nanopi_r1 BUILD_DEVICES:=friendlyarm_nanopi-r1 endef +define U-Boot/nanopi_r1s_h5 + BUILD_SUBTARGET:=cortexa53 + NAME:=U-Boot for NanoPi R1S (H5) + BUILD_DEVICES:=friendlyarm_nanopi-r1s-h5 + DEPENDS:=+PACKAGE_u-boot-nanopi_r1s_h5:arm-trusted-firmware-sunxi + UENV:=a64 +endef + define U-Boot/orangepi_r1 BUILD_SUBTARGET:=cortexa7 NAME:=Orange Pi R1 (H2+) @@ -290,6 +298,7 @@ UBOOT_TARGETS := \ nanopi_neo_plus2 \ nanopi_neo2 \ nanopi_r1 \ + nanopi_r1s_h5 \ orangepi_zero \ orangepi_r1 \ orangepi_one \ diff --git a/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch new file mode 100644 index 0000000000..59be3208a4 --- /dev/null +++ b/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch @@ -0,0 +1,233 @@ +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -400,6 +400,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \ + sun50i-h5-libretech-all-h3-cc.dtb \ + sun50i-h5-nanopi-neo2.dtb \ + sun50i-h5-nanopi-neo-plus2.dtb \ ++ sun50i-h5-nanopi-r1s-h5.dtb \ + sun50i-h5-orangepi-zero-plus.dtb \ + sun50i-h5-orangepi-pc2.dtb \ + sun50i-h5-orangepi-prime.dtb \ +--- /dev/null ++++ b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts +@@ -0,0 +1,204 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (C) 2021 AmadeusGhost ++ * ++ * Based on sun50i-h5-nanopi-neo2.dts, which is: ++ * Copyright (C) 2017 Icenowy Zheng ++ */ ++ ++/dts-v1/; ++#include "sun50i-h5.dtsi" ++ ++#include ++#include ++ ++/ { ++ model = "FriendlyARM NanoPi R1S H5"; ++ compatible = "friendlyarm,nanopi-r1s-h5", "allwinner,sun50i-h5"; ++ ++ aliases { ++ ethernet0 = &emac; ++ i2c0 = &i2c0; ++ serial0 = &uart0; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ sys { ++ label = "nanopi:red:sys"; ++ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ wan { ++ label = "nanopi:green:wan"; ++ gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ lan { ++ label = "nanopi:green:lan"; ++ gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ r-gpio-keys { ++ compatible = "gpio-keys"; ++ ++ reset { ++ label = "reset"; ++ linux,code = ; ++ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ enable-active-high; ++ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ reg_vcc3v3: vcc3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ }; ++ ++ reg_usb0_vbus: usb0-vbus { ++ compatible = "regulator-fixed"; ++ regulator-name = "usb0-vbus"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ enable-active-high; ++ gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ ++ status = "okay"; ++ }; ++ ++ vdd_cpux: gpio-regulator { ++ compatible = "regulator-gpio"; ++ regulator-name = "vdd-cpux"; ++ regulator-type = "voltage"; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-ramp-delay = <50>; /* 4ms */ ++ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; ++ gpios-states = <0x1>; ++ states = <1100000 0x0>, <1300000 0x1>; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ ++ post-power-on-delay-ms = <200>; ++ }; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vdd_cpux>; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&ehci2 { ++ status = "okay"; ++}; ++ ++&ehci3 { ++ status = "okay"; ++}; ++ ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emac_rgmii_pins>; ++ phy-supply = <®_gmac_3v3>; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-mode = "rgmii"; ++ status = "okay"; ++}; ++ ++&external_mdio { ++ ext_rgmii_phy: ethernet-phy@7 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <7>; ++ }; ++}; ++ ++&i2c0 { ++ status = "okay"; ++ ++ eeprom@51 { ++ compatible = "microchip,24c02"; ++ reg = <0x51>; ++ pagesize = <16>; ++ }; ++}; ++ ++&mmc0 { ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ ++ status = "okay"; ++}; ++ ++&mmc1 { ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ rtl8189etv: sdio_wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++&ohci0 { ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&ohci2 { ++ status = "okay"; ++}; ++ ++&ohci3 { ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pins_a>; ++ status = "okay"; ++}; ++ ++&usb_otg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&usbphy { ++ /* USB Type-A port's VBUS is always on */ ++ usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ ++ usb0_vbus-supply = <®_usb0_vbus>; ++ status = "okay"; ++}; +--- /dev/null ++++ b/configs/nanopi_r1s_h5_defconfig +@@ -0,0 +1,13 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_SPL=y ++CONFIG_MACH_SUN50I_H5=y ++CONFIG_DRAM_CLK=672 ++CONFIG_DRAM_ZQ=3881977 ++# CONFIG_DRAM_ODT_EN is not set ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y ++CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-r1s-h5" ++CONFIG_SUN8I_EMAC=y ++CONFIG_USB_EHCI_HCD=y diff --git a/target/linux/sunxi/base-files/etc/board.d/01_leds b/target/linux/sunxi/base-files/etc/board.d/01_leds index 514b8d1796..e3928b3b9b 100755 --- a/target/linux/sunxi/base-files/etc/board.d/01_leds +++ b/target/linux/sunxi/base-files/etc/board.d/01_leds @@ -9,7 +9,8 @@ boardname="${board##*,}" board_config_update case $board in -friendlyarm,nanopi-r1) +friendlyarm,nanopi-r1|\ +friendlyarm,nanopi-r1s-h5) ucidef_set_led_netdev "wan" "WAN" "nanopi:green:wan" "eth0" ucidef_set_led_netdev "lan" "LAN" "nanopi:green:lan" "eth1" ;; diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index 08d31caadc..c63011b799 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -8,7 +8,8 @@ board_config_update case $(board_name) in -friendlyarm,nanopi-r1) +friendlyarm,nanopi-r1|\ +friendlyarm,nanopi-r1s-h5) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; lamobo,lamobo-r1) diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index eeaaa887d7..2b2933aa63 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -28,6 +28,19 @@ define Device/friendlyarm_nanopi-neo2 endef TARGET_DEVICES += friendlyarm_nanopi-neo2 +define Device/friendlyarm_nanopi-r1s-h5 + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL:=Nanopi R1S H5 + DEVICE_PACKAGES:= kmod-eeprom-at24 kmod-leds-gpio kmod-rtl8189es \ + kmod-usb2 kmod-usb-net kmod-usb-net-rtl8152 wpad-basic + SUPPORTED_DEVICES:=nanopi-r1s-h5 + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-h5 + KERNEL_NAME := Image + KERNEL := kernel-bin +endef +TARGET_DEVICES += friendlyarm_nanopi-r1s-h5 + define Device/pine64_pine64-plus DEVICE_VENDOR := Pine64 DEVICE_MODEL := Pine64+ diff --git a/target/linux/sunxi/patches-4.19/021-dt-bindings-net-add-RTL8152-binding-documentation.patch b/target/linux/sunxi/patches-4.19/021-dt-bindings-net-add-RTL8152-binding-documentation.patch new file mode 100644 index 0000000000..2d99c49404 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/021-dt-bindings-net-add-RTL8152-binding-documentation.patch @@ -0,0 +1,53 @@ +From 3ee05f4aa64fc86af3be5bc176ba5808de9260a7 Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 26 Jul 2020 15:30:33 +0200 +Subject: [PATCH] dt-bindings: net: add RTL8152 binding documentation + +Add binding documentation for the Realtek RTL8152 / RTL8153 USB ethernet +adapters. + +Signed-off-by: David Bauer +--- + .../bindings/net/realtek,rtl8152.yaml | 36 +++++++++++++++++++ + 1 file changed, 36 insertions(+) + create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl8152.yaml + +--- /dev/null ++++ b/Documentation/devicetree/bindings/net/realtek,rtl8152.yaml +@@ -0,0 +1,36 @@ ++# SPDX-License-Identifier: GPL-2.0 ++%YAML 1.2 ++--- ++$id: http://devicetree.org/schemas/net/realtek,rtl8152.yaml# ++$schema: http://devicetree.org/meta-schemas/core.yaml# ++ ++title: Realtek RTL8152/RTL8153 series USB ethernet ++ ++maintainers: ++ - David Bauer ++ ++properties: ++ compatible: ++ oneOf: ++ - items: ++ - enum: ++ - realtek,rtl8152 ++ - realtek,rtl8153 ++ ++ reg: ++ description: The device number on the USB bus ++ ++ realtek,led-data: ++ description: Value to be written to the LED configuration register. ++ ++required: ++ - compatible ++ - reg ++ ++examples: ++ - | ++ usb-eth@2 { ++ compatible = "realtek,rtl8153"; ++ reg = <2>; ++ realtek,led-data = <0x87>; ++ }; diff --git a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch new file mode 100644 index 0000000000..c595508c97 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -0,0 +1,74 @@ +From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 26 Jul 2020 02:38:31 +0200 +Subject: [PATCH] net: usb: r8152: add LED configuration from OF + +This adds the ability to configure the LED configuration register using +OF. This way, the correct value for board specific LED configuration can +be determined. + +Signed-off-by: David Bauer +--- + drivers/net/usb/r8152.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- a/drivers/net/usb/r8152.c ++++ b/drivers/net/usb/r8152.c +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -4006,6 +4007,22 @@ static void rtl_tally_reset(struct r8152 + ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); + } + ++static int r8152_led_configuration(struct r8152 *tp) ++{ ++ u32 led_data; ++ int ret; ++ ++ ret = of_property_read_u32(tp->udev->dev.of_node, "realtek,led-data", ++ &led_data); ++ ++ if (ret) ++ return ret; ++ ++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, led_data); ++ ++ return 0; ++} ++ + static void r8152b_init(struct r8152 *tp) + { + u32 ocp_data; +@@ -4047,6 +4064,8 @@ static void r8152b_init(struct r8152 *tp + ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); + ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); + ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); ++ ++ r8152_led_configuration(tp); + } + + static void r8153_init(struct r8152 *tp) +@@ -4168,6 +4187,8 @@ static void r8153_init(struct r8152 *tp) + tp->coalesce = COALESCE_SLOW; + break; + } ++ ++ r8152_led_configuration(tp); + } + + static void r8153b_init(struct r8152 *tp) +@@ -4231,6 +4252,8 @@ static void r8153b_init(struct r8152 *tp + rtl_tally_reset(tp); + + tp->coalesce = 15000; /* 15 us */ ++ ++ r8152_led_configuration(tp); + } + + static int rtl8152_pre_reset(struct usb_interface *intf) diff --git a/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch new file mode 100644 index 0000000000..c89c040605 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch @@ -0,0 +1,229 @@ +--- a/arch/arm64/boot/dts/allwinner/Makefile ++++ b/arch/arm64/boot/dts/allwinner/Makefile +@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-or + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-libretech-all-h3-cc.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb ++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-r1s-h5.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb +--- /dev/null ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -0,0 +1,216 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (C) 2021 AmadeusGhost ++ * ++ * Based on sun50i-h5-nanopi-neo2.dts, which is: ++ * Copyright (C) 2017 Icenowy Zheng ++ */ ++ ++/dts-v1/; ++#include "sun50i-h5.dtsi" ++ ++#include ++#include ++ ++/ { ++ model = "FriendlyARM NanoPi R1S H5"; ++ compatible = "friendlyarm,nanopi-r1s-h5", "allwinner,sun50i-h5"; ++ ++ aliases { ++ ethernet0 = &emac; ++ i2c0 = &i2c0; ++ serial0 = &uart0; ++ ++ led-boot = &led_sys; ++ led-failsafe = &led_sys; ++ led-running = &led_sys; ++ led-upgrade = &led_sys; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led_sys: sys { ++ label = "nanopi:red:sys"; ++ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ wan { ++ label = "nanopi:green:wan"; ++ gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ lan { ++ label = "nanopi:green:lan"; ++ gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ r-gpio-keys { ++ compatible = "gpio-keys"; ++ ++ reset { ++ label = "reset"; ++ linux,code = ; ++ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ enable-active-high; ++ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ reg_vcc3v3: vcc3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ }; ++ ++ reg_usb0_vbus: usb0-vbus { ++ compatible = "regulator-fixed"; ++ regulator-name = "usb0-vbus"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ enable-active-high; ++ gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ ++ status = "okay"; ++ }; ++ ++ vdd_cpux: gpio-regulator { ++ compatible = "regulator-gpio"; ++ regulator-name = "vdd-cpux"; ++ regulator-type = "voltage"; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-ramp-delay = <50>; /* 4ms */ ++ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; ++ gpios-states = <0x1>; ++ states = <1100000 0x0>, <1300000 0x1>; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ ++ post-power-on-delay-ms = <200>; ++ }; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vdd_cpux>; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&ehci1 { ++ status = "okay"; ++ ++ usb-eth@1 { ++ compatible = "realtek,rtl8153"; ++ reg = <1>; ++ ++ realtek,led-data = <0x87>; ++ }; ++}; ++ ++&ehci2 { ++ status = "okay"; ++}; ++ ++&ehci3 { ++ status = "okay"; ++}; ++ ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emac_rgmii_pins>; ++ phy-supply = <®_gmac_3v3>; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-mode = "rgmii"; ++ status = "okay"; ++}; ++ ++&external_mdio { ++ ext_rgmii_phy: ethernet-phy@7 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <7>; ++ }; ++}; ++ ++&i2c0 { ++ status = "okay"; ++ ++ eeprom@51 { ++ compatible = "microchip,24c02"; ++ reg = <0x51>; ++ pagesize = <16>; ++ }; ++}; ++ ++&mmc0 { ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ ++ status = "okay"; ++}; ++ ++&mmc1 { ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ rtl8189etv: sdio_wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++&ohci0 { ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&ohci2 { ++ status = "okay"; ++}; ++ ++&ohci3 { ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pins_a>; ++ status = "okay"; ++}; ++ ++&usb_otg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&usbphy { ++ /* USB Type-A port's VBUS is always on */ ++ usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ ++ usb0_vbus-supply = <®_usb0_vbus>; ++ status = "okay"; ++}; From 3adf449fa9b0cad27dd2b2f6abee2d23ed0a51db Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:02:06 +0800 Subject: [PATCH 05/16] sunxi: use stable MAC-address for NanoPi R1S H5 Idea from a8a17fd22326f0d1aa7644556eea6010e0779afe Signed-off-by: AmadeusGhost --- .../sunxi/base-files/etc/board.d/02_network | 75 +++++++++++++------ 1 file changed, 54 insertions(+), 21 deletions(-) diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network index c63011b799..81c4d6a486 100755 --- a/target/linux/sunxi/base-files/etc/board.d/02_network +++ b/target/linux/sunxi/base-files/etc/board.d/02_network @@ -4,29 +4,62 @@ # . /lib/functions/uci-defaults.sh +. /lib/functions/system.sh + +sunxi_setup_interfaces() +{ + local board="$1" + + case "$board" in + friendlyarm,nanopi-r1|\ + friendlyarm,nanopi-r1s-h5) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; + lamobo,lamobo-r1) + ucidef_add_switch "switch0" \ + "4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0" + ;; + olimex,a20-olinuxino-micro) + ucidef_set_interface_lan "wlan0" + ;; + xunlong,orangepi-r1) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ;; + *) + ucidef_set_interface_lan "eth0" + ;; + esac +} + +nanopi_generate_mac() +{ + local sd_hash=$(sha256sum /sys/devices/platform/soc/1c0f000.mmc/mmc_host/mmc0/mmc0:*/cid) + local mac_base=$(macaddr_canonicalize "$(echo "${sd_hash}" | dd bs=1 count=12 2>/dev/null)") + echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")" +} + +sunxi_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + local label_mac="" + + case "$board" in + friendlyarm,nanopi-r1s-h5) + lan_mac=$(nanopi_generate_mac) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac + [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac +} board_config_update - -case $(board_name) in -friendlyarm,nanopi-r1|\ -friendlyarm,nanopi-r1s-h5) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; -lamobo,lamobo-r1) - ucidef_add_switch "switch0" \ - "4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0" - ;; -olimex,a20-olinuxino-micro) - ucidef_set_interface_lan "wlan0" - ;; -xunlong,orangepi-r1) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ;; -*) - ucidef_set_interface_lan "eth0" - ;; -esac - +board=$(board_name) +sunxi_setup_interfaces $board +sunxi_setup_macs $board board_config_flush exit 0 From a956b8d05e7869c3c30b4e66bcff9ea8210a7979 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:20:06 +0800 Subject: [PATCH 06/16] sunxi: add cpufreq support for Allwinner H5 --- ...v-Add-allwinner-sun50i-h5-compatible.patch | 21 +++++ ...ARM-dts-sun8i-h3-Add-clock-frequency.patch | 48 +++++++++++ ...64-dts-sun50i-h5-Add-clock-frequency.patch | 30 +++++++ ...-h5-Move-CPU-OPP-table-to-dtsi-share.patch | 82 +++++++++++++++++++ ...nxi-h3-h5-Add-more-CPU-OPP-for-H3-H5.patch | 54 ++++++++++++ ...un50i-h5-Enable-cpufreq-dt-on-H5-CPU.patch | 50 +++++++++++ 6 files changed, 285 insertions(+) create mode 100644 target/linux/sunxi/patches-4.19/023-cpufreq-dt-platdev-Add-allwinner-sun50i-h5-compatible.patch create mode 100644 target/linux/sunxi/patches-4.19/321-ARM-dts-sun8i-h3-Add-clock-frequency.patch create mode 100644 target/linux/sunxi/patches-4.19/322-arm64-dts-sun50i-h5-Add-clock-frequency.patch create mode 100644 target/linux/sunxi/patches-4.19/323-arm-dts-sunxi-h3-h5-Move-CPU-OPP-table-to-dtsi-share.patch create mode 100644 target/linux/sunxi/patches-4.19/324-arm-dts-sunxi-h3-h5-Add-more-CPU-OPP-for-H3-H5.patch create mode 100644 target/linux/sunxi/patches-4.19/325-arm64-dts-sun50i-h5-Enable-cpufreq-dt-on-H5-CPU.patch diff --git a/target/linux/sunxi/patches-4.19/023-cpufreq-dt-platdev-Add-allwinner-sun50i-h5-compatible.patch b/target/linux/sunxi/patches-4.19/023-cpufreq-dt-platdev-Add-allwinner-sun50i-h5-compatible.patch new file mode 100644 index 0000000000..7db08fc011 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/023-cpufreq-dt-platdev-Add-allwinner-sun50i-h5-compatible.patch @@ -0,0 +1,21 @@ +From 1d78fb6bf60b011bd60ebc9d6ef9499f91c29267 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Thu, 30 Mar 2017 12:58:43 +0200 +Subject: [PATCH 08/82] cpufreq: dt-platdev: Add allwinner,sun50i-h5 compatible + +--- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c +index fe14c57de6ca..afb511aa5050 100644 +--- a/drivers/cpufreq/cpufreq-dt-platdev.c ++++ b/drivers/cpufreq/cpufreq-dt-platdev.c +@@ -29,6 +29,7 @@ static const struct of_device_id whitelist[] __initconst = { + { .compatible = "allwinner,sun8i-a23", }, + { .compatible = "allwinner,sun8i-a83t", }, + { .compatible = "allwinner,sun8i-h3", }, ++ { .compatible = "allwinner,sun50i-h5", }, + + { .compatible = "apm,xgene-shadowcat", }, + diff --git a/target/linux/sunxi/patches-4.19/321-ARM-dts-sun8i-h3-Add-clock-frequency.patch b/target/linux/sunxi/patches-4.19/321-ARM-dts-sun8i-h3-Add-clock-frequency.patch new file mode 100644 index 0000000000..66727a193b --- /dev/null +++ b/target/linux/sunxi/patches-4.19/321-ARM-dts-sun8i-h3-Add-clock-frequency.patch @@ -0,0 +1,48 @@ +From 0d1194aaf2b2ebc571cf01d2353d252c12146d2e Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2016 16:08:26 +0200 +Subject: [PATCH 10/82] ARM: dts: sun8i-h3: Add clock-frequency + +To avoid error messages during boot. + +Signed-off-by: Ondrej Jirman +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index f0096074a467..cb19ff797606 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -78,6 +78,7 @@ + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; ++ clock-frequency = <1200000000>; + }; + + cpu1: cpu@1 { +@@ -88,6 +89,7 @@ + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; ++ clock-frequency = <1200000000>; + }; + + cpu2: cpu@2 { +@@ -98,6 +100,7 @@ + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; ++ clock-frequency = <1200000000>; + }; + + cpu3: cpu@3 { +@@ -108,6 +111,7 @@ + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; ++ clock-frequency = <1200000000>; + }; + }; + diff --git a/target/linux/sunxi/patches-4.19/322-arm64-dts-sun50i-h5-Add-clock-frequency.patch b/target/linux/sunxi/patches-4.19/322-arm64-dts-sun50i-h5-Add-clock-frequency.patch new file mode 100644 index 0000000000..d764400af5 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/322-arm64-dts-sun50i-h5-Add-clock-frequency.patch @@ -0,0 +1,30 @@ +From 6328da39df61f962190870089aaa171a7f8aab2c Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Thu, 30 Mar 2017 13:04:25 +0200 +Subject: [PATCH 11/82] arm64: dts: sun50i-h5: Add clock-frequency + +To avoid error messages during boot. + +Signed-off-by: Ondrej Jirman +--- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +index 62d646baac3c..4452ab873dec 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +@@ -76,6 +76,13 @@ + }; + }; + ++ reg_cpu_fallback: reg_cpu_fallback { ++ compatible = "regulator-fixed"; ++ regulator-name = "vdd-cpux-dummy"; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1100000>; ++ }; ++ + psci { + compatible = "arm,psci-0.2"; + method = "smc"; diff --git a/target/linux/sunxi/patches-4.19/323-arm-dts-sunxi-h3-h5-Move-CPU-OPP-table-to-dtsi-share.patch b/target/linux/sunxi/patches-4.19/323-arm-dts-sunxi-h3-h5-Move-CPU-OPP-table-to-dtsi-share.patch new file mode 100644 index 0000000000..a00018da29 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/323-arm-dts-sunxi-h3-h5-Move-CPU-OPP-table-to-dtsi-share.patch @@ -0,0 +1,82 @@ +From d4028daf51824eb792fb3c9cc77553ff1edc5d68 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 14 May 2018 00:56:50 +0200 +Subject: [PATCH 12/82] ARM: dts: sunxi-h3-h5: Move CPU OPP table to dtsi + shared by H3/H5 + +It is identical for H3 and H5, so it better live there. + +Signed-off-by: Ondrej Jirman +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 23 ----------------------- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 23 +++++++++++++++++++++++ + 2 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index cb19ff797606..261ca0356358 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -43,29 +43,6 @@ + #include "sunxi-h3-h5.dtsi" + + / { +- cpu0_opp_table: opp_table0 { +- compatible = "operating-points-v2"; +- opp-shared; +- +- opp-648000000 { +- opp-hz = /bits/ 64 <648000000>; +- opp-microvolt = <1040000 1040000 1300000>; +- clock-latency-ns = <244144>; /* 8 32k periods */ +- }; +- +- opp-816000000 { +- opp-hz = /bits/ 64 <816000000>; +- opp-microvolt = <1100000 1100000 1300000>; +- clock-latency-ns = <244144>; /* 8 32k periods */ +- }; +- +- opp-1008000000 { +- opp-hz = /bits/ 64 <1008000000>; +- opp-microvolt = <1200000 1200000 1300000>; +- clock-latency-ns = <244144>; /* 8 32k periods */ +- }; +- }; +- + cpus { + #address-cells = <1>; + #size-cells = <0>; +diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +index 13fe5e316136..539b69fecbe9 100644 +--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi ++++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +@@ -105,6 +105,29 @@ + }; + }; + ++ cpu0_opp_table: opp_table0 { ++ compatible = "operating-points-v2"; ++ opp-shared; ++ ++ opp@648000000 { ++ opp-hz = /bits/ 64 <648000000>; ++ opp-microvolt = <1040000 1040000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ ++ opp@816000000 { ++ opp-hz = /bits/ 64 <816000000>; ++ opp-microvolt = <1100000 1100000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ ++ opp@1008000000 { ++ opp-hz = /bits/ 64 <1008000000>; ++ opp-microvolt = <1200000 1200000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ }; ++ + de: display-engine { + compatible = "allwinner,sun8i-h3-display-engine"; + allwinner,pipelines = <&mixer0>; diff --git a/target/linux/sunxi/patches-4.19/324-arm-dts-sunxi-h3-h5-Add-more-CPU-OPP-for-H3-H5.patch b/target/linux/sunxi/patches-4.19/324-arm-dts-sunxi-h3-h5-Add-more-CPU-OPP-for-H3-H5.patch new file mode 100644 index 0000000000..4b37c934e0 --- /dev/null +++ b/target/linux/sunxi/patches-4.19/324-arm-dts-sunxi-h3-h5-Add-more-CPU-OPP-for-H3-H5.patch @@ -0,0 +1,54 @@ +From 9e05f3d014b05df39a55dfd6a08d4bd18a301307 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 14 May 2018 01:13:01 +0200 +Subject: [PATCH 13/82] ARM: dts: sunxi-h3-h5: Add more CPU OPP for H3/H5 + +These OPPs can be used with better cooling and/or thermal regulation. + +Signed-off-by: Ondrej Jirman +--- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 78 ++++++++++++++++++++++++++++++ + 1 file changed, 78 insertions(+) + +diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +index 539b69fecbe9..f47c22b622f9 100644 +--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi ++++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +@@ -109,6 +109,24 @@ + compatible = "operating-points-v2"; + opp-shared; + ++ opp@120000000 { ++ opp-hz = /bits/ 64 <120000000>; ++ opp-microvolt = <1040000 1040000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ ++ opp@240000000 { ++ opp-hz = /bits/ 64 <240000000>; ++ opp-microvolt = <1040000 1040000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ ++ opp@480000000 { ++ opp-hz = /bits/ 64 <480000000>; ++ opp-microvolt = <1040000 1040000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ + opp@648000000 { + opp-hz = /bits/ 64 <648000000>; + opp-microvolt = <1040000 1040000 1300000>; +@@ -121,6 +139,12 @@ + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + ++ opp@960000000 { ++ opp-hz = /bits/ 64 <960000000>; ++ opp-microvolt = <1200000 1200000 1300000>; ++ clock-latency-ns = <244144>; /* 8 32k periods */ ++ }; ++ + opp@1008000000 { + opp-hz = /bits/ 64 <1008000000>; + opp-microvolt = <1200000 1200000 1300000>; diff --git a/target/linux/sunxi/patches-4.19/325-arm64-dts-sun50i-h5-Enable-cpufreq-dt-on-H5-CPU.patch b/target/linux/sunxi/patches-4.19/325-arm64-dts-sun50i-h5-Enable-cpufreq-dt-on-H5-CPU.patch new file mode 100644 index 0000000000..d494753f6c --- /dev/null +++ b/target/linux/sunxi/patches-4.19/325-arm64-dts-sun50i-h5-Enable-cpufreq-dt-on-H5-CPU.patch @@ -0,0 +1,50 @@ +From 25be6ff78bebfd869a3be0017715f101bd75bb64 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 14 May 2018 01:19:06 +0200 +Subject: [PATCH 15/82] arm64: dts: sun50i-h5: Enable cpufreq-dt on H5 CPU + +Uses OPPs shared with H3. + +Signed-off-by: Ondrej Jirman +--- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +index 60fc84a1fb44..acd90f390e88 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +@@ -52,6 +52,9 @@ + device_type = "cpu"; + reg = <0>; + enable-method = "psci"; ++ clocks = <&ccu CLK_CPUX>; ++ clock-names = "cpu"; ++ operating-points-v2 = <&cpu0_opp_table>; + }; + + cpu@1 { +@@ -59,6 +62,7 @@ + device_type = "cpu"; + reg = <1>; + enable-method = "psci"; ++ operating-points-v2 = <&cpu0_opp_table>; + }; + + cpu@2 { +@@ -66,6 +70,7 @@ + device_type = "cpu"; + reg = <2>; + enable-method = "psci"; ++ operating-points-v2 = <&cpu0_opp_table>; + }; + + cpu@3 { +@@ -73,6 +78,7 @@ + device_type = "cpu"; + reg = <3>; + enable-method = "psci"; ++ operating-points-v2 = <&cpu0_opp_table>; + }; + }; + From 9b5659f066770527b1376d808380ec5f477ef579 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 4 Feb 2021 11:08:02 +0800 Subject: [PATCH 07/16] autocore-arm: add target sunxi support --- package/lean/autocore/Makefile | 4 ++-- package/lean/autocore/files/arm/sbin/cpuinfo | 15 +++++++++++++-- target/linux/sunxi/Makefile | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index ceac46dc62..1348a9fccf 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -12,14 +12,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=37 +PKG_RELEASE:=38 include $(INCLUDE_DIR)/package.mk define Package/autocore-arm TITLE:=Arm auto core loadbalance script. MAINTAINER:=CN_SZTL - DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_mvebu||TARGET_ipq40xx||TARGET_ipq806x) \ + DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_ipq40xx||TARGET_ipq806x||TARGET_mvebu||TARGET_sunxi) \ +TARGET_bcm27xx:bcm27xx-userland \ +TARGET_bcm53xx:nvram \ +(TARGET_ipq40xx||TARGET_ipq806x):lm-sensors diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo index fef62e3aaf..8e1d2d919a 100755 --- a/package/lean/autocore/files/arm/sbin/cpuinfo +++ b/package/lean/autocore/files/arm/sbin/cpuinfo @@ -20,7 +20,18 @@ else if grep -q "bcm27xx" "/etc/openwrt_release"; then cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" else - cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" + if [ -f /sys/class/thermal/thermal_zone0/temp ]; then + cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" + fi + fi + + if grep -q "sunxi" "/etc/openwrt_release"; then + if [ -f /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq ]; then + echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})" + else + echo -n "${cpu_arch} x ${cpu_cores}" + fi + else + echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${cpu_temp})" fi - echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${cpu_temp})" fi diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile index 2168b560fa..a77c8da3f4 100644 --- a/target/linux/sunxi/Makefile +++ b/target/linux/sunxi/Makefile @@ -27,7 +27,7 @@ KERNELNAME:=zImage dtbs include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += uboot-envtools +DEFAULT_PACKAGES += autocore-arm uboot-envtools DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs $(eval $(call BuildTarget)) From e06823880d47a0c0c4637e0c165a4900392246e0 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 5 Feb 2021 11:10:20 +0800 Subject: [PATCH 08/16] rtl8189es: add package --- package/ctcgfw/rtl8189es/Makefile | 72 +++++++++++++++++++ package/ctcgfw/rtl8189es/files/50_rtl-wifi | 6 ++ .../patches/001-use-kernel-byteorder.patch | 15 ++++ .../patches/010-remove-repeat-flies.patch | 39 ++++++++++ 4 files changed, 132 insertions(+) create mode 100644 package/ctcgfw/rtl8189es/Makefile create mode 100644 package/ctcgfw/rtl8189es/files/50_rtl-wifi create mode 100644 package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch create mode 100644 package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch diff --git a/package/ctcgfw/rtl8189es/Makefile b/package/ctcgfw/rtl8189es/Makefile new file mode 100644 index 0000000000..9a82b67f8a --- /dev/null +++ b/package/ctcgfw/rtl8189es/Makefile @@ -0,0 +1,72 @@ +# +# Copyright (C) 2021 [CTCGFW] Project OpenWrt +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=rtl8189es +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2020-06-15 +PKG_SOURCE_VERSION:=42f293406700988c10655aaa5ee865b411389aeb +PKG_MIRROR_HASH:=1609e1dd2c8c7b664c9c012ff6b2f04d6a3989573d01b6e31e5988a88b2f8ef0 + +PKG_MAINTAINER:=Hauke Mehrtens +PKG_BUILD_PARALLEL:=1 + +STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h + +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/rtl8189es + SUBMENU:=Wireless Drivers + TITLE:=Realtek RTL8189ETV SDIO WiFi + DEPENDS:=+kmod-cfg80211 +kmod-mmc +@DRIVER_11N_SUPPORT + FILES:=$(PKG_BUILD_DIR)/rtl8189es.ko + AUTOLOAD:=$(call AutoProbe,rtl8189es) +endef + +NOSTDINC_FLAGS = \ + -I$(PKG_BUILD_DIR) \ + -I$(PKG_BUILD_DIR)/include \ + -I$(STAGING_DIR)/usr/include/mac80211-backport \ + -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ + -I$(STAGING_DIR)/usr/include/mac80211 \ + -I$(STAGING_DIR)/usr/include/mac80211/uapi \ + -include backport/autoconf.h \ + -include backport/backport.h + +EXTRA_KCONFIG:= \ + CONFIG_RTL8189ES=m \ + USER_MODULE_NAME=rtl8189es + +EXTRA_CFLAGS:= \ + -DRTW_SINGLE_WIPHY \ + -DRTW_USE_CFG80211_STA_EVENT \ + -DCONFIG_IOCTL_CFG80211 + +MAKE_OPTS:= \ + $(KERNEL_MAKE_FLAGS) \ + M="$(PKG_BUILD_DIR)" \ + NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ + USER_EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + $(EXTRA_KCONFIG) + +define Build/Compile + +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ + $(MAKE_OPTS) \ + modules +endef + +define KernelPackage/rtl8189es/install + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_DATA) ./files/50_rtl-wifi $(1)/etc/uci-defaults/ +endef + +$(eval $(call KernelPackage,rtl8189es)) diff --git a/package/ctcgfw/rtl8189es/files/50_rtl-wifi b/package/ctcgfw/rtl8189es/files/50_rtl-wifi new file mode 100644 index 0000000000..6214d8d071 --- /dev/null +++ b/package/ctcgfw/rtl8189es/files/50_rtl-wifi @@ -0,0 +1,6 @@ +#!/bin/sh + +sed -i '/iw dev "$wdev" del/d' /lib/netifd/wireless/mac80211.sh +ip link set dev wlan0 up + +exit 0 diff --git a/package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch b/package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch new file mode 100644 index 0000000000..9e4d3d1999 --- /dev/null +++ b/package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch @@ -0,0 +1,15 @@ +Fix compile problem when rtw_byteorder.h and asm/byteorder.h gets +included in addition for example indirectly, do not use realtek own copy +of the byteorder headers. + +--- a/include/drv_types.h ++++ b/include/drv_types.h +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch b/package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch new file mode 100644 index 0000000000..b017b641f5 --- /dev/null +++ b/package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch @@ -0,0 +1,39 @@ +From 9b2b0ec1bc2d31ddf93ed74d63fdfa6044e329a4 Mon Sep 17 00:00:00 2001 +From: Ben Greear +Date: Fri, 9 Nov 2018 16:21:43 -0800 +Subject: [PATCH] Fix build against openwrt backports tree. + +Like breaks builds elsewhere, can fix it up later. + +Signed-off-by: Ben Greear +--- + include/drv_conf.h | 4 +++- + .../{wireless.h => old_unused_rtl_wireless.h} | 0 + include/{autoconf.h => rtl_autoconf.h} | 0 + 3 files changed, 3 insertions(+), 1 deletions(-) + rename include/linux/{wireless.h => old_unused_rtl_wireless.h} (100%) + rename include/{autoconf.h => rtl_autoconf.h} (100%) + +diff --git a/include/drv_conf.h b/include/drv_conf.h +index 0d20a7e..f0a9f88 100644 +--- a/include/drv_conf.h ++++ b/include/drv_conf.h +@@ -19,7 +19,9 @@ + ******************************************************************************/ + #ifndef __DRV_CONF_H__ + #define __DRV_CONF_H__ +-#include "autoconf.h" ++ ++#include ++#include "rtl_autoconf.h" + #include "hal_ic_cfg.h" + + #if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) +diff --git a/include/linux/wireless.h b/include/linux/old_unused_rtl_wireless.h +similarity index 100% +rename from include/linux/wireless.h +rename to include/linux/old_unused_rtl_wireless.h +diff --git a/include/autoconf.h b/include/rtl_autoconf.h +similarity index 100% +rename from include/autoconf.h +rename to include/rtl_autoconf.h From 2a4203c81e2bd0e99431f0cf68001e26f55eb5ad Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 6 Feb 2021 04:10:25 +0800 Subject: [PATCH 09/16] autocore: style improvements Acked-by: AmadeusGhost Signed-off-by: CN_SZTL --- package/lean/autocore/Makefile | 2 +- package/lean/autocore/files/arm/sbin/cpuinfo | 35 +++++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 1348a9fccf..94bcf509a0 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=38 +PKG_RELEASE:=39 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo index 8e1d2d919a..1ea33f869e 100755 --- a/package/lean/autocore/files/arm/sbin/cpuinfo +++ b/package/lean/autocore/files/arm/sbin/cpuinfo @@ -10,28 +10,23 @@ elif grep -q "bcm53xx" "/etc/openwrt_release"; then cpu_freq="$(nvram get clkfreq | awk -F ',' '{print $1}')MHz" elif grep -q "mvebu" "/etc/openwrt_release"; then cpu_freq="$(cat "/proc/cpuinfo" | grep "BogoMIPS" | sed -n "1p" | awk -F ': ' '{print $2}')MHz" -else - cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz" +elif [ -e "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq" ]; then + cpu_freq="$(expr $(cat "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq") / 1000)MHz" fi -if grep -q "ipq" "/etc/openwrt_release"; then +if grep -q "bcm27xx" "/etc/openwrt_release"; then + cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" +else + [ -e "/sys/class/thermal/thermal_zone0/temp" ] && \ + cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat "/sys/class/thermal/thermal_zone0/temp")/1000)}")°C" +fi + +if [ -z "${cpu_freq}" ] && [ -z "${cpu_temp}" ]; then + echo -n "${cpu_arch} x ${cpu_cores}" +elif [ -z "${cpu_temp}" ] || grep -q "ipq" "/etc/openwrt_release"; then echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})" +elif [ -z "${cpu_freq}" ]; then + echo -n "${cpu_arch} x ${cpu_cores} (${cpu_temp})" else - if grep -q "bcm27xx" "/etc/openwrt_release"; then - cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" - else - if [ -f /sys/class/thermal/thermal_zone0/temp ]; then - cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" - fi - fi - - if grep -q "sunxi" "/etc/openwrt_release"; then - if [ -f /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq ]; then - echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})" - else - echo -n "${cpu_arch} x ${cpu_cores}" - fi - else - echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${cpu_temp})" - fi + echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${cpu_temp})" fi From cf26e2a6a28b82d600f9c16e74a5c02b823bbe02 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 2 Feb 2021 12:56:16 +0000 Subject: [PATCH 10/16] kernel: add defaults for new SELinux options Signed-off-by: Daniel Golle --- config/Config-kernel.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 51c84704c3..7f0b6cb344 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -939,6 +939,16 @@ config KERNEL_SECURITY_SELINUX_DEVELOP depends on KERNEL_SECURITY_SELINUX default y +config KERNEL_SECURITY_SELINUX_SIDTAB_HASH_BITS + int + depends on KERNEL_SECURITY_SELINUX + default 9 + +config KERNEL_SECURITY_SELINUX_SID2STR_CACHE_SIZE + int + depends on KERNEL_SECURITY_SELINUX + default 256 + config KERNEL_LSM string default "lockdown,yama,loadpin,safesetid,integrity,selinux" From 041b825af2c47f5c17b44ea695430109c5e9549e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 5 Feb 2021 13:16:21 +0000 Subject: [PATCH 11/16] selinux-policy: update to version 0.6 Signed-off-by: Daniel Golle --- package/system/selinux-policy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/system/selinux-policy/Makefile b/package/system/selinux-policy/Makefile index 491b26a83e..8f5a290fa6 100644 --- a/package/system/selinux-policy/Makefile +++ b/package/system/selinux-policy/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=selinux-policy PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git -PKG_VERSION:=0.5 -PKG_MIRROR_HASH:=c96a8cf7ac3445c52a28150c5000a55bde8112402bc77ccfee825cff0bdc8a03 +PKG_VERSION:=0.6 +PKG_MIRROR_HASH:=55a27eab67f39a03ba586691984a04234d16b97e816bca17ac42c94aae01c3c6 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host From 430f57296019d88206f565f1325ca9587728a6ff Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 21 Sep 2020 16:48:37 -1000 Subject: [PATCH 12/16] build: use SPDX license tags The license folder is a core part of OpenWrt and all GPL-2.0 licensed. Use SPDX license tags to allow machines to check licenses. Signed-off-by: Paul Spooren [rebase, keep some Copyright lines, sharpen commit message] Signed-off-by: Adrian Schmutzler --- BSDmakefile | 7 +++---- Config.in | 6 ++---- Makefile | 6 +----- config/Config-build.in | 6 ++---- config/Config-devel.in | 6 ++---- config/Config-images.in | 6 ++---- config/Config-kernel.in | 6 ++---- include/autotools.mk | 7 ++----- include/debug.mk | 7 ++----- include/depends.mk | 8 +++----- include/download.mk | 5 +---- include/feeds.mk | 5 +---- include/hardening.mk | 7 ++----- include/host-build.mk | 7 ++----- include/image.mk | 7 ++----- include/kernel-build.mk | 8 +++----- include/kernel-defaults.mk | 7 ++----- include/kernel-version.mk | 2 +- include/kernel.mk | 7 ++----- include/netfilter.mk | 7 ++----- include/nls.mk | 7 ++----- include/package-bin.mk | 7 ++----- include/package-defaults.mk | 7 ++----- include/package-dumpinfo.mk | 7 ++----- include/package-ipkg.mk | 7 ++----- include/package-seccomp.mk | 7 ++----- include/package.mk | 7 ++----- include/prereq-build.mk | 7 ++----- include/prereq.mk | 7 ++----- include/quilt.mk | 6 ++---- include/subdir.mk | 7 ++----- include/target.mk | 5 +---- include/toolchain-build.mk | 7 ++----- include/toplevel.mk | 8 ++------ include/unpack.mk | 7 ++----- include/verbose.mk | 7 ++----- include/version.mk | 5 +---- rules.mk | 5 +---- 38 files changed, 72 insertions(+), 175 deletions(-) diff --git a/BSDmakefile b/BSDmakefile index c6a0425698..66fe08858f 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# + world ${.TARGETS}: @gmake $@ diff --git a/Config.in b/Config.in index d30c04839e..546e8249cc 100644 --- a/Config.in +++ b/Config.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# mainmenu "OpenWrt Configuration" diff --git a/Makefile b/Makefile index 0144b0c5ff..aecee6929e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,6 @@ -# Makefile for OpenWrt +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# TOPDIR:=${CURDIR} LC_ALL:=C diff --git a/config/Config-build.in b/config/Config-build.in index 752404eedb..93d2f48371 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# menu "Global build settings" diff --git a/config/Config-devel.in b/config/Config-devel.in index ff555b707b..57031d42f6 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# menuconfig DEVEL bool "Advanced configuration options (for developers)" diff --git a/config/Config-images.in b/config/Config-images.in index 0231fbdfac..40d1e28dd3 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# menu "Target Images" diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 7f0b6cb344..fd44ddb46b 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# config KERNEL_BUILD_USER string "Custom Kernel Build User Name" diff --git a/include/autotools.mk b/include/autotools.mk index ae320fbde0..ec67c844f7 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2)) diff --git a/include/debug.mk b/include/debug.mk index 59a99c0f77..98a1d6e889 100644 --- a/include/debug.mk +++ b/include/debug.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org # debug flags: # diff --git a/include/depends.mk b/include/depends.mk index ace7139000..0080b97876 100644 --- a/include/depends.mk +++ b/include/depends.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org + # define a dependency on a subtree # parameters: # 1: directories/files diff --git a/include/download.mk b/include/download.mk index d393bf3907..a638e69382 100644 --- a/include/download.mk +++ b/include/download.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2006-2012 OpenWrt.org # Copyright (C) 2016 LEDE project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# PROJECT_GIT = https://git.openwrt.org diff --git a/include/feeds.mk b/include/feeds.mk index 2b259b96b3..ef5fef7f4b 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2014 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TMP_DIR)/.packageauxvars diff --git a/include/hardening.mk b/include/hardening.mk index 4e49e6b1b9..6acd862f5c 100644 --- a/include/hardening.mk +++ b/include/hardening.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2015-2020 OpenWrt.org PKG_CHECK_FORMAT_SECURITY ?= 1 PKG_ASLR_PIE ?= 1 diff --git a/include/host-build.mk b/include/host-build.mk index ab6e05e14f..e4a5c48e72 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org include $(INCLUDE_DIR)/download.mk diff --git a/include/image.mk b/include/image.mk index 73c11f337e..d8783488d5 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org override TARGET_BUILD= include $(INCLUDE_DIR)/prereq.mk diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 14cfc1754f..32eb545b57 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org + include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/depends.mk diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index db93a53d71..898765b9c2 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifdef CONFIG_STRIP_KERNEL_EXPORTS KERNEL_MAKEOPTS += \ diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 6e8696456c..c0b1c2b476 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -1,5 +1,5 @@ -# Use the default kernel version if the Makefile doesn't override it +# Use the default kernel version if the Makefile doesn't override it LINUX_RELEASE?=1 ifdef CONFIG_TESTING_KERNEL diff --git a/include/kernel.mk b/include/kernel.mk index 02d0949a72..cc5d94fe88 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(filter check,$(MAKECMDGOALS)),) CHECK:=1 diff --git a/include/netfilter.mk b/include/netfilter.mk index e7c72deb41..6165ff51d5 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(__inc_netfilter),1) __inc_netfilter:=1 diff --git a/include/nls.mk b/include/nls.mk index 04838821b4..742f8c25aa 100644 --- a/include/nls.mk +++ b/include/nls.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2011-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2011-2020 OpenWrt.org # iconv full ifeq ($(CONFIG_BUILD_NLS),y) diff --git a/include/package-bin.mk b/include/package-bin.mk index 4ae049af54..192f0726d2 100644 --- a/include/package-bin.mk +++ b/include/package-bin.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org ifeq ($(DUMP),) define BuildTarget/bin diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 2a04bc17e9..3ee3a965f2 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org PKG_DEFAULT_DEPENDS = +libc +USE_GLIBC:librt +USE_GLIBC:libpthread diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index ef98c482fb..30b0187f11 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(DUMP),) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 32de3cc93e..ead4b5742c 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifndef DUMP include $(INCLUDE_DIR)/feeds.mk diff --git a/include/package-seccomp.mk b/include/package-seccomp.mk index fa49617d41..86e834450d 100644 --- a/include/package-seccomp.mk +++ b/include/package-seccomp.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2015-2020 OpenWrt.org PKG_CONFIG_DEPENDS+= CONFIG_KERNEL_SECCOMP diff --git a/include/package.mk b/include/package.mk index f413b4f1b3..7ed12dd042 100644 --- a/include/package.mk +++ b/include/package.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org __package_mk:=1 diff --git a/include/prereq-build.mk b/include/prereq-build.mk index fb11a070a1..6dce11cba2 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/prereq.mk diff --git a/include/prereq.mk b/include/prereq.mk index 6d14140792..c11178a884 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(__prereq_inc),1) __prereq_inc:=1 diff --git a/include/quilt.mk b/include/quilt.mk index 56f674a2f3..00597ca0f2 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# Copyright (C) 2007-2020 OpenWrt.org ifeq ($(TARGET_BUILD),1) PKG_BUILD_DIR:=$(LINUX_DIR) diff --git a/include/subdir.mk b/include/subdir.mk index f01cd55f30..be080859b7 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org ifeq ($(MAKECMDGOALS),prereq) SUBTARGETS:=prereq diff --git a/include/target.mk b/include/target.mk index 35dbc31f2c..de9fb5016b 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2007-2008 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# ifneq ($(__target_inc),1) __target_inc=1 diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk index 35d8c9380e..b7a253b71b 100644 --- a/include/toolchain-build.mk +++ b/include/toolchain-build.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2009-2020 OpenWrt.org override CONFIG_AUTOREBUILD= override CONFIG_AUTOREMOVE= diff --git a/include/toplevel.mk b/include/toplevel.mk index 23bae149d4..744695b19c 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -1,10 +1,6 @@ -# Makefile for OpenWrt -# -# Copyright (C) 2007-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# SPDX-License-Identifier: GPL-2.0-only # +# Copyright (C) 2007-2020 OpenWrt.org PREP_MK= OPENWRT_BUILD= QUIET=0 diff --git a/include/unpack.mk b/include/unpack.mk index 5bb27d41c9..6a56b8e742 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org HOST_TAR:=$(TAR) TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS) diff --git a/include/verbose.mk b/include/verbose.mk index d260080195..3ecf842d11 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifndef OPENWRT_VERBOSE OPENWRT_VERBOSE:= diff --git a/include/version.mk b/include/version.mk index b7f42e13bb..f39e35cd09 100644 --- a/include/version.mk +++ b/include/version.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2012-2015 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# # Substituted by SDK, do not remove # REVISION:=x diff --git a/rules.mk b/rules.mk index 7d7851e32e..15af58e157 100644 --- a/rules.mk +++ b/rules.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# ifneq ($(__rules_inc),1) __rules_inc=1 From 46f3481d47d67c6a91f7488c300471ca04c89026 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 6 Feb 2021 16:53:05 +0800 Subject: [PATCH 13/16] Project ImmortalWrt: update feed urls Signed-off-by: CN_SZTL --- README.md | 12 ++++++------ feeds.conf.default | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index edaa95394b..02d30b0248 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# PROJECT OPENWRT -## The Source Code of OpenWrt-Lean Modified by CTCGFW +# PROJECT IMMORTALWRT +## The Core Source Code of ImmortalWrt ### Welcome to our Telegram Group: [@ctcgfw\_openwrt\_discuss](https://t.me/ctcgfw_openwrt_discuss). - - - @@ -24,7 +24,7 @@ sudo bash -c "bash <(curl -s https://build-scripts.project-openwrt.eu.org/init_b ## Clone the source ```bash -git clone -b openwrt-18.06 --single-branch https://github.com/project-openwrt/openwrt && cd openwrt +git clone -b openwrt-18.06 --single-branch https://github.com/immortalwrt/immortalwrt && cd openwrt ./scripts/feeds update -a && ./scripts/feeds install -a ``` #### For developer, you may use `openwrt-18.06-dev` branch instead of `openwrt-18.06`. @@ -36,7 +36,7 @@ make menuconfig ## Make it ```bash -make -j1 V=s +make -j$(nproc) V=s ``` ## Tips @@ -44,7 +44,7 @@ You'd better not use **root** to make it, or you may be not able to use.
Default login address: 192.168.1.1, username is **root** and password is **password**. # Contributed -### See [CONTRIBUTED.md](https://github.com/project-openwrt/openwrt/blob/openwrt-18.06/CONTRIBUTED.md). +### See [CONTRIBUTED.md](https://github.com/immortalwrt/immortalwrt/blob/openwrt-18.06/CONTRIBUTED.md). # License -### [GNU General Public License v3.0](https://github.com/project-openwrt/openwrt/blob/openwrt-18.06/LICENSE). +### [GNU General Public License v3.0](https://github.com/immortalwrt/immortalwrt/blob/openwrt-18.06/LICENSE). diff --git a/feeds.conf.default b/feeds.conf.default index 40511a8016..b3384a73a7 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/project-openwrt/packages.git;openwrt-18.06 -src-git luci https://github.com/project-openwrt/luci.git;openwrt-18.06 +src-git packages https://github.com/immortalwrt/packages.git;openwrt-18.06 +src-git luci https://github.com/immortalwrt/luci.git;openwrt-18.06 src-git routing https://github.com/openwrt-routing/packages.git src-git telephony https://github.com/openwrt/telephony.git From 25ca7ccd5f2ff322f2d895f94239ef43acbfaab5 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 6 Feb 2021 16:56:20 +0800 Subject: [PATCH 14/16] README: fix typo err Signed-off-by: CN_SZTL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02d30b0248..8ac09bec2d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ sudo bash -c "bash <(curl -s https://build-scripts.project-openwrt.eu.org/init_b ## Clone the source ```bash -git clone -b openwrt-18.06 --single-branch https://github.com/immortalwrt/immortalwrt && cd openwrt +git clone -b openwrt-18.06 --single-branch https://github.com/immortalwrt/immortalwrt && cd immortalwrt ./scripts/feeds update -a && ./scripts/feeds install -a ``` #### For developer, you may use `openwrt-18.06-dev` branch instead of `openwrt-18.06`. From 7c8d14f671a9268d2b3fbd5a96f887cc37a4f252 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 6 Feb 2021 17:30:40 +0800 Subject: [PATCH 15/16] luci-app-unblockneteasemusic-mini: remove outdated server Signed-off-by: CN_SZTL --- .../ctcgfw/luci-app-unblockneteasemusic-mini/Makefile | 4 ++-- .../luasrc/model/cbi/unblockneteasemusic-mini.lua | 5 ++--- .../root/etc/init.d/unblockneteasemusic-mini | 11 +++-------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index 7d0de70af3..8cf4b88b39 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) LUCI_DEPENDS:=+busybox +dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index 8ce41be904..89ea2a8595 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua @@ -1,8 +1,8 @@ --- Created By [CTCGFW]Project-OpenWrt +-- Created By ImmortalWrt -- https://github.com/project-openwrt mp = Map("unblockneteasemusic-mini", translate("解除网易云音乐播放限制 (Mini)")) -mp.description = translate("原理：采用 [QQ/酷狗/酷我/咪咕] 等音源，替换网易云音乐 无版权/收费 歌曲链接
由 [CTCGFW]Project-OpenWrt & hyird & Sunsky 提供服务器支持
详细说明参见：https://github.com/project-openwrt/luci-app-unblockneteasemusic-mini") +mp.description = translate("原理：采用 [QQ/酷狗/酷我/咪咕] 等音源，替换网易云音乐 无版权/收费 歌曲链接
由 Project ImmortalWrt 提供服务器支持
详细说明参见：https://github.com/immortalwrt/luci-app-unblockneteasemusic-mini") mp:section(SimpleSection).template = "unblockneteasemusic-mini/unblockneteasemusic_mini_status" @@ -16,7 +16,6 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务器位置")) -select_server:value("tencent_shanghai_nodejs", translate("[CTCGFW] 腾讯云上海（高音质）")) select_server:value("ucloud_guangzhou_nodejs", translate("[CTCGFW] UCloud广州（高音质）")) select_server.description = translate("请合理使用本插件与各个服务器，请勿滥用") select_server.default = "tencent_shanghai_nodejs" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 7c6455bfc8..52ba64ce02 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT -# https://github.com/project-openwrt +# Created By ImmortalWrt +# https://github.com/immortalwrt START=92 STOP=10 @@ -8,12 +8,7 @@ STOP=10 enable="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].enable)" select_server="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].select_server)" -if [ "${select_server}" = "tencent_shanghai_nodejs" ]; then - unblock_server_ip="$(ping "cdn-shanghai.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" - [ -z "${unblock_server_ip}" ] && unblock_server_ip="122.51.88.18" - unblock_server_http_port="30000" - unblock_server_https_port="30001" -elif [ "${select_server}" = "ucloud_guangzhou_nodejs" ]; then +if [ "${select_server}" = "ucloud_guangzhou_nodejs" ]; then unblock_server_ip="$(ping "uc-gz.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" [ -z "${unblock_server_ip}" ] && unblock_server_ip="106.75.156.183" unblock_server_http_port="30000" From cef6593412172f5f112987a5d65825ddf21f1a27 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 6 Feb 2021 17:52:37 +0800 Subject: [PATCH 16/16] treewide: update Copyright info Signed-off-by: CN_SZTL --- package/ctcgfw/ChinaDNS/Makefile | 2 +- package/ctcgfw/annie/Makefile | 2 +- package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile | 2 +- package/ctcgfw/brook/Makefile | 2 +- package/ctcgfw/chinadns-ng/Makefile | 2 +- package/ctcgfw/cxxopts/Makefile | 2 +- package/ctcgfw/filebrowser/Makefile | 2 +- package/ctcgfw/filebrowser/files/filebrowser.init | 2 +- package/ctcgfw/gost/Makefile | 2 +- package/ctcgfw/gost/files/gost.init | 2 +- package/ctcgfw/gotop/Makefile | 2 +- package/ctcgfw/gowebdav/Makefile | 2 +- package/ctcgfw/gowebdav/files/gowebdav.init | 2 +- package/ctcgfw/ipt2socks-alt/Makefile | 2 +- package/ctcgfw/jpcre2/Makefile | 2 +- package/ctcgfw/lua-maxminddb/Makefile | 2 +- package/ctcgfw/luci-app-baidupcs-web/Makefile | 2 +- .../luasrc/model/cbi/baidupcs-web.lua | 2 +- package/ctcgfw/luci-app-filebrowser/Makefile | 7 ++++--- package/ctcgfw/luci-app-gost/Makefile | 4 ++-- package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua | 4 ++-- package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua | 4 ++-- package/ctcgfw/luci-app-gowebdav/Makefile | 2 +- .../ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua | 4 ++-- package/ctcgfw/luci-app-naiveproxy/Makefile | 2 +- .../luci-app-naiveproxy/luasrc/controller/naiveproxy.lua | 4 ++-- .../luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua | 4 ++-- package/ctcgfw/luci-app-ssocks/Makefile | 4 ++-- .../ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua | 4 ++-- package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua | 4 ++-- package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks | 4 ++-- .../luasrc/controller/unblockneteasemusic-mini.lua | 4 ++-- .../luasrc/model/cbi/unblockneteasemusic-mini.lua | 4 ++-- package/ctcgfw/luci-app-unblockneteasemusic/Makefile | 4 ++-- .../luasrc/controller/unblockneteasemusic.lua | 6 +++--- .../luasrc/model/cbi/unblockneteasemusic.lua | 2 +- .../root/etc/init.d/unblockneteasemusic | 4 ++-- .../root/usr/share/unblockneteasemusic/gen_qq_provider.sh | 2 +- .../root/usr/share/unblockneteasemusic/log_check.sh | 2 +- .../root/usr/share/unblockneteasemusic/update.sh | 2 +- package/ctcgfw/mentohust/Makefile | 2 +- package/ctcgfw/microsocks11/Makefile | 2 +- package/ctcgfw/msgpack-c/Makefile | 2 +- package/ctcgfw/mt7601u-ap/Makefile | 7 +++---- package/ctcgfw/mwol/Makefile | 2 +- package/ctcgfw/naiveproxy/Makefile | 2 +- package/ctcgfw/naiveproxy/files/naiveproxy.init | 2 +- package/ctcgfw/naiveproxy/src/init_env.sh | 2 +- package/ctcgfw/nps/Makefile | 2 +- package/ctcgfw/parted/Makefile | 2 +- package/ctcgfw/phicomm-k3screenctrl/Makefile | 2 +- package/ctcgfw/quickjs/Makefile | 2 +- package/ctcgfw/rapidjson/Makefile | 2 +- package/ctcgfw/rtl8189es/Makefile | 2 +- package/ctcgfw/rtl8812au-ac/Makefile | 2 +- package/ctcgfw/rtl8821cu/Makefile | 2 +- package/ctcgfw/rtl88x2bu/Makefile | 2 +- package/ctcgfw/simple-obfs/Makefile | 2 +- package/ctcgfw/simple-torrent/Makefile | 2 +- package/ctcgfw/ssocks/Makefile | 2 +- package/ctcgfw/sub-web/Makefile | 2 +- package/ctcgfw/subconverter/Makefile | 2 +- package/ctcgfw/subweb/Makefile | 6 +++--- package/ctcgfw/tcping-simple/Makefile | 2 +- package/ctcgfw/tmate/Makefile | 2 +- package/ctcgfw/v2ray-plugin/Makefile | 2 +- package/ctcgfw/verysync/Makefile | 2 +- package/ctcgfw/webdav-go/Makefile | 2 +- package/lean/UnblockNeteaseMusic-Go/Makefile | 2 +- package/lean/UnblockNeteaseMusic/Makefile | 2 +- package/lean/amule/Makefile | 2 +- package/lean/antileech/Makefile | 2 +- package/lean/autocore/Makefile | 2 +- package/lean/default-settings/Makefile | 2 +- package/lean/dnsforwarder/Makefile | 2 +- package/lean/gmediarender/Makefile | 2 +- package/lean/libcryptopp/Makefile | 2 +- .../luasrc/model/cbi/unblockmusic.lua | 4 ++-- package/lean/microsocks/Makefile | 2 +- package/lean/n2n_v2/Makefile | 2 +- package/lean/pandownload-fake-server/Makefile | 2 +- package/lean/pdnsd-alt/Makefile | 2 +- package/lean/ps3netsrv/Makefile | 2 +- package/lean/shadowsocksr-libev/Makefile | 2 +- package/lean/tcpping/Makefile | 2 +- package/lean/vlmcsd/Makefile | 2 +- package/lienol/dns-forwarder/Makefile | 2 +- package/lienol/dns2socks/Makefile | 2 +- package/lienol/ipt2socks/Makefile | 2 +- package/lienol/redsocks2/Makefile | 2 +- package/lienol/tcping/Makefile | 2 +- 91 files changed, 115 insertions(+), 115 deletions(-) diff --git a/package/ctcgfw/ChinaDNS/Makefile b/package/ctcgfw/ChinaDNS/Makefile index f449f798e6..83b7cd0bcd 100644 --- a/package/ctcgfw/ChinaDNS/Makefile +++ b/package/ctcgfw/ChinaDNS/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2014-2018 OpenWrt-dist # Copyright (C) 2014-2018 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/annie/Makefile b/package/ctcgfw/annie/Makefile index b881ed8fa5..7416ab24bb 100644 --- a/package/ctcgfw/annie/Makefile +++ b/package/ctcgfw/annie/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile index 41b3f1045d..c2d36c1b7b 100644 --- a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile +++ b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/brook/Makefile b/package/ctcgfw/brook/Makefile index 24f6503ac1..b1b2249e8e 100644 --- a/package/ctcgfw/brook/Makefile +++ b/package/ctcgfw/brook/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/chinadns-ng/Makefile b/package/ctcgfw/chinadns-ng/Makefile index beeb887ce9..5b42212b80 100644 --- a/package/ctcgfw/chinadns-ng/Makefile +++ b/package/ctcgfw/chinadns-ng/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/cxxopts/Makefile b/package/ctcgfw/cxxopts/Makefile index af1f3d5b20..10b21e2bb0 100644 --- a/package/ctcgfw/cxxopts/Makefile +++ b/package/ctcgfw/cxxopts/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/filebrowser/Makefile b/package/ctcgfw/filebrowser/Makefile index 73722a71ab..d3072d1797 100644 --- a/package/ctcgfw/filebrowser/Makefile +++ b/package/ctcgfw/filebrowser/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Project OpenWrt +# Copyright (C) 2021 ImmortalWrt # This is free software, licensed under the GNU General Public License v3. # See /LICENSE.txt for more information. # diff --git a/package/ctcgfw/filebrowser/files/filebrowser.init b/package/ctcgfw/filebrowser/files/filebrowser.init index db076123b5..fe9faf73ad 100755 --- a/package/ctcgfw/filebrowser/files/filebrowser.init +++ b/package/ctcgfw/filebrowser/files/filebrowser.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2019 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt . /lib/functions.sh . /lib/functions/procd.sh diff --git a/package/ctcgfw/gost/Makefile b/package/ctcgfw/gost/Makefile index ee1e718ca6..1cb085d632 100644 --- a/package/ctcgfw/gost/Makefile +++ b/package/ctcgfw/gost/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/gost/files/gost.init b/package/ctcgfw/gost/files/gost.init index bdf00b4eb7..d3bbdc278e 100644 --- a/package/ctcgfw/gost/files/gost.init +++ b/package/ctcgfw/gost/files/gost.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt START=99 diff --git a/package/ctcgfw/gotop/Makefile b/package/ctcgfw/gotop/Makefile index e3bb14b0d2..463d6dcb31 100644 --- a/package/ctcgfw/gotop/Makefile +++ b/package/ctcgfw/gotop/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/gowebdav/Makefile b/package/ctcgfw/gowebdav/Makefile index 237c090b1e..561cdf548c 100644 --- a/package/ctcgfw/gowebdav/Makefile +++ b/package/ctcgfw/gowebdav/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/gowebdav/files/gowebdav.init b/package/ctcgfw/gowebdav/files/gowebdav.init index e0df0143b0..d1e3e04260 100755 --- a/package/ctcgfw/gowebdav/files/gowebdav.init +++ b/package/ctcgfw/gowebdav/files/gowebdav.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2020 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt START=99 STOP=10 diff --git a/package/ctcgfw/ipt2socks-alt/Makefile b/package/ctcgfw/ipt2socks-alt/Makefile index e892f50959..cbb7ab1b18 100644 --- a/package/ctcgfw/ipt2socks-alt/Makefile +++ b/package/ctcgfw/ipt2socks-alt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/jpcre2/Makefile b/package/ctcgfw/jpcre2/Makefile index 5365f81dd7..2a021e86e2 100644 --- a/package/ctcgfw/jpcre2/Makefile +++ b/package/ctcgfw/jpcre2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/lua-maxminddb/Makefile b/package/ctcgfw/lua-maxminddb/Makefile index af1f98e3c1..404323560e 100644 --- a/package/ctcgfw/lua-maxminddb/Makefile +++ b/package/ctcgfw/lua-maxminddb/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 jerryk # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/luci-app-baidupcs-web/Makefile b/package/ctcgfw/luci-app-baidupcs-web/Makefile index b94acea218..852179e3cc 100644 --- a/package/ctcgfw/luci-app-baidupcs-web/Makefile +++ b/package/ctcgfw/luci-app-baidupcs-web/Makefile @@ -2,7 +2,7 @@ # # # Copyright (C) 2020 KFERMercer -# Copyright (C) 2020 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt # # THIS IS FREE SOFTWARE, LICENSED UNDER GPLv3. # diff --git a/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua b/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua index c693aad02d..c96dd58a17 100644 --- a/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua +++ b/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua @@ -1,7 +1,7 @@ --[[ Copyright (C) 2020 KFERMercer -Copyright (C) 2020 [CTCGFW] Project OpenWRT +Copyright (C) 2021 ImmortalWrt THIS IS FREE SOFTWARE, LICENSED UNDER GPLv3 diff --git a/package/ctcgfw/luci-app-filebrowser/Makefile b/package/ctcgfw/luci-app-filebrowser/Makefile index a34075954a..765e781c1f 100644 --- a/package/ctcgfw/luci-app-filebrowser/Makefile +++ b/package/ctcgfw/luci-app-filebrowser/Makefile @@ -1,6 +1,8 @@ -# Copyright (C) 2016 Openwrt.org # -# This is free software, licensed under the Apache License, Version 2.0 . +# Copyright (C) 2021 ImmortalWrt +# +# +# This is free software, licensed under the GNU General Public License v3. # include $(TOPDIR)/rules.mk @@ -14,7 +16,6 @@ PKG_VERSION:=snapshot PKG_RELEASE:=118071b PKG_LICENSE:=GPLv3 -PKG_MAINTAINER:=[CTCGFW] Project OpenWRT include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-gost/Makefile b/package/ctcgfw/luci-app-gost/Makefile index 6d6c372801..2c674d816e 100644 --- a/package/ctcgfw/luci-app-gost/Makefile +++ b/package/ctcgfw/luci-app-gost/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ LUCI_TITLE:=LuCI support for Gost LUCI_DEPENDS:=+gost LUCI_PKGARCH:=all -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua b/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua index aa37fce9ba..1105b08700 100644 --- a/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua +++ b/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.gost", package.seeall) diff --git a/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua b/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua index 0a4d53988f..116bd0dc9d 100644 --- a/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua +++ b/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua @@ -1,5 +1,5 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("gost", translate("Gost")) mp.description = translate("A simple security tunnel written in Golang.") diff --git a/package/ctcgfw/luci-app-gowebdav/Makefile b/package/ctcgfw/luci-app-gowebdav/Makefile index e17dd9cfd4..32aa0425ea 100644 --- a/package/ctcgfw/luci-app-gowebdav/Makefile +++ b/package/ctcgfw/luci-app-gowebdav/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk diff --git a/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua b/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua index a93f8de044..4a92e784ad 100644 --- a/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua +++ b/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua @@ -1,5 +1,5 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt m = Map("gowebdav", translate("GoWebDav"), translate("GoWebDav is a tiny, simple, fast WevDav server.")) diff --git a/package/ctcgfw/luci-app-naiveproxy/Makefile b/package/ctcgfw/luci-app-naiveproxy/Makefile index ae64510325..74ddc5be2a 100644 --- a/package/ctcgfw/luci-app-naiveproxy/Makefile +++ b/package/ctcgfw/luci-app-naiveproxy/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua b/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua index 39180ab190..b6897a8cbd 100644 --- a/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.naiveproxy", package.seeall) diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua b/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua index 5991a0d898..619b5bbb3e 100644 --- a/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua @@ -1,5 +1,5 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("naiveproxy", translate("NaiveProxy")) mp.description = translate("NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security.") diff --git a/package/ctcgfw/luci-app-ssocks/Makefile b/package/ctcgfw/luci-app-ssocks/Makefile index 9feeaf3800..ba721b5a25 100644 --- a/package/ctcgfw/luci-app-ssocks/Makefile +++ b/package/ctcgfw/luci-app-ssocks/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ PKG_NAME:=luci-app-ssocks PKG_VERSION:=1.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua b/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua index 4fc9995c90..8af4b2a41f 100644 --- a/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua +++ b/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.ssocks", package.seeall) diff --git a/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua b/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua index 5a55c77cb2..3ff85a778b 100644 --- a/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua +++ b/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("ssocks", translate("sSocks Server")) mp.description = translate("sSocks Server is a simple, small, and easy-to-use Socks5 server program, but supports TCP on IPv4 only.") diff --git a/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks b/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks index 389a21ba85..4a20b65c72 100755 --- a/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks +++ b/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT -# https://github.com/project-openwrt +# Created By ImmortalWrt +# https://github.com/immortalwrt START=99 STOP=10 diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua index 73460b723c..9def636203 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.unblockneteasemusic-mini", package.seeall) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index 89ea2a8595..9b23d95916 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua @@ -1,5 +1,5 @@ -- Created By ImmortalWrt --- https://github.com/project-openwrt +-- https://github.com/immortalwrt mp = Map("unblockneteasemusic-mini", translate("解除网易云音乐播放限制 (Mini)")) mp.description = translate("原理：采用 [QQ/酷狗/酷我/咪咕] 等音源，替换网易云音乐 无版权/收费 歌曲链接
由 Project ImmortalWrt 提供服务器支持
详细说明参见：https://github.com/immortalwrt/luci-app-unblockneteasemusic-mini") @@ -16,7 +16,7 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务器位置")) -select_server:value("ucloud_guangzhou_nodejs", translate("[CTCGFW] UCloud广州（高音质）")) +select_server:value("ucloud_guangzhou_nodejs", translate("UCloud广州（高音质）")) select_server.description = translate("请合理使用本插件与各个服务器，请勿滥用") select_server.default = "tencent_shanghai_nodejs" select_server.rmempty = false diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile index 788accc7e0..6cc5d7036f 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ PKG_NAME:=luci-app-unblockneteasemusic PKG_VERSION:=2.8 PKG_RELEASE:=8 -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua index 844816ab20..c2978f00ad 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.unblockneteasemusic", package.seeall) @@ -28,7 +28,7 @@ function act_status() end function update_luci() - luci_cloud_ver=luci.sys.exec("curl -s 'https://github.com/project-openwrt/luci-app-unblockneteasemusic/releases/latest'| grep -Eo '[0-9\.]+\-[0-9]+'") + luci_cloud_ver=luci.sys.exec("curl -s 'https://github.com/immortalwrt/luci-app-unblockneteasemusic/releases/latest'| grep -Eo '[0-9\.]+\-[0-9]+'") if not luci_cloud_ver then return "1" else diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua index dbc96c3883..68f56c0297 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua @@ -1,5 +1,5 @@ mp = Map("unblockneteasemusic", translate("解除网易云音乐播放限制")) -mp.description = translate("原理：采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX] 等音源，替换网易云音乐 无版权/收费 歌曲链接
具体使用方法参见：https://github.com/project-openwrt/luci-app-unblockneteasemusic") +mp.description = translate("原理：采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX] 等音源，替换网易云音乐 无版权/收费 歌曲链接
具体使用方法参见：https://github.com/immortalwrt/luci-app-unblockneteasemusic") mp:section(SimpleSection).template = "unblockneteasemusic/unblockneteasemusic_status" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index efca9ac4f8..dd32daf673 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT -# https://github.com/project-openwrt +# Created By ImmortalWrt +# https://github.com/immortalwrt START=92 STOP=10 diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh index e8fae9dbaf..0bdaa2496c 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt header="const cache = require('../cache') diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh index 4d51a68b00..ab25f24487 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt NAME="unblockneteasemusic" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh index fbf62c6d95..2355a48441 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt NAME="unblockneteasemusic" diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile index de2bbc9123..6bb9067bdb 100644 --- a/package/ctcgfw/mentohust/Makefile +++ b/package/ctcgfw/mentohust/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2014-2015 KyleRicardo # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/microsocks11/Makefile b/package/ctcgfw/microsocks11/Makefile index db34388e10..e81c268215 100644 --- a/package/ctcgfw/microsocks11/Makefile +++ b/package/ctcgfw/microsocks11/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile index c78d7688da..d6a35d947d 100644 --- a/package/ctcgfw/msgpack-c/Makefile +++ b/package/ctcgfw/msgpack-c/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/mt7601u-ap/Makefile b/package/ctcgfw/mt7601u-ap/Makefile index 56fb9ae7ea..3a5a2e175f 100644 --- a/package/ctcgfw/mt7601u-ap/Makefile +++ b/package/ctcgfw/mt7601u-ap/Makefile @@ -1,7 +1,7 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -16,10 +16,9 @@ PKG_SOURCE_URL:=https://github.com/Anthony96922/mt7601u-ap.git PKG_SOURCE_VERSION:=624307427149e53b75937ccbe7cb235ec3ef2f58 PKG_MIRROR_HASH:=70e8f7e94ddca09e1f55ef1b30a47fa7c504750ec654bc0c500f1a3d491eca97 -PKG_MAINTAINER:=[CTCGFW] Project OpenWrt PKG_BUILD_PARALLEL:=1 -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/kernel.mk diff --git a/package/ctcgfw/mwol/Makefile b/package/ctcgfw/mwol/Makefile index c2345a02c6..922384bd41 100644 --- a/package/ctcgfw/mwol/Makefile +++ b/package/ctcgfw/mwol/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2019 mleaf.org # 微信公众号【WiFi物联网】 # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile index 910b92ccdb..8988bd288e 100644 --- a/package/ctcgfw/naiveproxy/Makefile +++ b/package/ctcgfw/naiveproxy/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/naiveproxy/files/naiveproxy.init b/package/ctcgfw/naiveproxy/files/naiveproxy.init index c524070f71..651b72a990 100644 --- a/package/ctcgfw/naiveproxy/files/naiveproxy.init +++ b/package/ctcgfw/naiveproxy/files/naiveproxy.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt . /lib/functions.sh . /lib/functions/procd.sh diff --git a/package/ctcgfw/naiveproxy/src/init_env.sh b/package/ctcgfw/naiveproxy/src/init_env.sh index affd7f40f1..1aaf1760f7 100755 --- a/package/ctcgfw/naiveproxy/src/init_env.sh +++ b/package/ctcgfw/naiveproxy/src/init_env.sh @@ -1,5 +1,5 @@ #!/bin/bash -# [CTCGFW] Project-OpenWrt +# Project ImmortalWrt # Use it under GPLv3. # -------------------------------------------------------- # Init build dependencies for naiveproxy diff --git a/package/ctcgfw/nps/Makefile b/package/ctcgfw/nps/Makefile index 10bd40295e..3ff56868b4 100644 --- a/package/ctcgfw/nps/Makefile +++ b/package/ctcgfw/nps/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/parted/Makefile b/package/ctcgfw/parted/Makefile index 9f597d27db..7adb76f946 100644 --- a/package/ctcgfw/parted/Makefile +++ b/package/ctcgfw/parted/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/phicomm-k3screenctrl/Makefile b/package/ctcgfw/phicomm-k3screenctrl/Makefile index 79d23e8284..0c7bd3df52 100644 --- a/package/ctcgfw/phicomm-k3screenctrl/Makefile +++ b/package/ctcgfw/phicomm-k3screenctrl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/quickjs/Makefile b/package/ctcgfw/quickjs/Makefile index 9d48b3695e..6855bb46e9 100644 --- a/package/ctcgfw/quickjs/Makefile +++ b/package/ctcgfw/quickjs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile index 85dcb6a59a..628cf0a645 100644 --- a/package/ctcgfw/rapidjson/Makefile +++ b/package/ctcgfw/rapidjson/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rtl8189es/Makefile b/package/ctcgfw/rtl8189es/Makefile index 9a82b67f8a..ec0cf806b7 100644 --- a/package/ctcgfw/rtl8189es/Makefile +++ b/package/ctcgfw/rtl8189es/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 [CTCGFW] Project OpenWrt +# Copyright (C) 2021 ImmortalWrt # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 07e931784b..4b3bd62e49 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 stepheny # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index b01246ed63..675b63bec6 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index 7d27ca8131..9968ee13ee 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/simple-obfs/Makefile b/package/ctcgfw/simple-obfs/Makefile index d422eba70a..032e4981f3 100644 --- a/package/ctcgfw/simple-obfs/Makefile +++ b/package/ctcgfw/simple-obfs/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2017-2019 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/simple-torrent/Makefile b/package/ctcgfw/simple-torrent/Makefile index d83596b975..f9f4cfc021 100644 --- a/package/ctcgfw/simple-torrent/Makefile +++ b/package/ctcgfw/simple-torrent/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/ssocks/Makefile b/package/ctcgfw/ssocks/Makefile index 6d1b30048b..87a69ff0e9 100644 --- a/package/ctcgfw/ssocks/Makefile +++ b/package/ctcgfw/ssocks/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2017-2018 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/sub-web/Makefile b/package/ctcgfw/sub-web/Makefile index de6cc81f80..eebbddd4dd 100644 --- a/package/ctcgfw/sub-web/Makefile +++ b/package/ctcgfw/sub-web/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile index c3f24ec357..10ef886b97 100644 --- a/package/ctcgfw/subconverter/Makefile +++ b/package/ctcgfw/subconverter/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/subweb/Makefile b/package/ctcgfw/subweb/Makefile index be26faeac9..bfd6eff256 100644 --- a/package/ctcgfw/subweb/Makefile +++ b/package/ctcgfw/subweb/Makefile @@ -1,9 +1,10 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2021 ImmortalWrt # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_NAME:=subweb @@ -19,7 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=[CTCGFW]Project OpenWrt PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/ctcgfw/tcping-simple/Makefile b/package/ctcgfw/tcping-simple/Makefile index 8962f1312a..48376395d4 100644 --- a/package/ctcgfw/tcping-simple/Makefile +++ b/package/ctcgfw/tcping-simple/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2014-2018 OpenWrt-dist -# Copyright (C) 2019 [CTCGFW]Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/tmate/Makefile b/package/ctcgfw/tmate/Makefile index cc65b77105..8bb674d83b 100644 --- a/package/ctcgfw/tmate/Makefile +++ b/package/ctcgfw/tmate/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/v2ray-plugin/Makefile b/package/ctcgfw/v2ray-plugin/Makefile index fbbdfeed5e..bb5d48ce52 100644 --- a/package/ctcgfw/v2ray-plugin/Makefile +++ b/package/ctcgfw/v2ray-plugin/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 SharerMax # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/verysync/Makefile b/package/ctcgfw/verysync/Makefile index d22823754c..186749439b 100644 --- a/package/ctcgfw/verysync/Makefile +++ b/package/ctcgfw/verysync/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/webdav-go/Makefile b/package/ctcgfw/webdav-go/Makefile index 46ee6c27e3..ca6e39aeed 100644 --- a/package/ctcgfw/webdav-go/Makefile +++ b/package/ctcgfw/webdav-go/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index 7df39aef1e..210b843f85 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index 22ff039ce1..da5bb98013 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/amule/Makefile b/package/lean/amule/Makefile index 81bca39550..4cd2d38e2d 100644 --- a/package/lean/amule/Makefile +++ b/package/lean/amule/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/antileech/Makefile b/package/lean/antileech/Makefile index 7291bfb08d..6948c267d2 100644 --- a/package/lean/antileech/Makefile +++ b/package/lean/antileech/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 94bcf509a0..bb20edaef6 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Lean # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index d5e525f92f..5b860174ae 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2021 Lean # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/dnsforwarder/Makefile b/package/lean/dnsforwarder/Makefile index c6e0957d3f..9cf3b16a0f 100644 --- a/package/lean/dnsforwarder/Makefile +++ b/package/lean/dnsforwarder/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/gmediarender/Makefile b/package/lean/gmediarender/Makefile index f2b03e39e8..85362ce15b 100644 --- a/package/lean/gmediarender/Makefile +++ b/package/lean/gmediarender/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Lean # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/libcryptopp/Makefile b/package/lean/libcryptopp/Makefile index 076d450678..6dc1371bb3 100644 --- a/package/lean/libcryptopp/Makefile +++ b/package/lean/libcryptopp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index 1ba920913c..6d77bba41a 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -21,7 +21,7 @@ end if nixio.fs.access("/usr/share/UnblockNeteaseMusic/app.js") then apptype:value("nodejs", translate("NodeJS 版本")) end -apptype:value("cloud", translate("云解锁（ [CTCGFW] 云服务器）")) +apptype:value("cloud", translate("云解锁（ 云服务器）")) speedtype = s:option(Value, "musicapptype", translate("音源选择")) speedtype:value("default", translate("默认")) @@ -38,7 +38,7 @@ speedtype:depends("apptype", "nodejs") speedtype:depends("apptype", "go") cloudserver = s:option(Value, "cloudserver", translate("服务器位置")) -cloudserver:value("uc-gz.service.project-openwrt.eu.org:30000:30001", translate("[CTCGFW] UCloud广州（高音质）")) +cloudserver:value("uc-gz.service.project-openwrt.eu.org:30000:30001", translate("[ImmortalWrt] UCloud广州（高音质）")) cloudserver.description = translate("自定义服务器格式为 IP[域名]:HTTP端口:HTTPS端口
如果服务器为LAN内网IP，需要将这个服务器IP放入例外客户端 (不代理HTTP和HTTPS)") cloudserver.default = "uc-gz.service.project-openwrt.eu.org:30000:30001" cloudserver.rmempty = true diff --git a/package/lean/microsocks/Makefile b/package/lean/microsocks/Makefile index 70d30bba5e..aaef0d8e47 100644 --- a/package/lean/microsocks/Makefile +++ b/package/lean/microsocks/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/n2n_v2/Makefile b/package/lean/n2n_v2/Makefile index 573624cd7f..0cefb43adf 100644 --- a/package/lean/n2n_v2/Makefile +++ b/package/lean/n2n_v2/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 - ntop.org and contributors # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/pandownload-fake-server/Makefile b/package/lean/pandownload-fake-server/Makefile index 45fd535844..fa1fd5f247 100644 --- a/package/lean/pandownload-fake-server/Makefile +++ b/package/lean/pandownload-fake-server/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/pdnsd-alt/Makefile b/package/lean/pdnsd-alt/Makefile index 9d36521274..474e17232a 100644 --- a/package/lean/pdnsd-alt/Makefile +++ b/package/lean/pdnsd-alt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/ps3netsrv/Makefile b/package/lean/ps3netsrv/Makefile index 2148839eeb..63dfdea806 100644 --- a/package/lean/ps3netsrv/Makefile +++ b/package/lean/ps3netsrv/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/shadowsocksr-libev/Makefile b/package/lean/shadowsocksr-libev/Makefile index ee46682b0c..013fb38710 100644 --- a/package/lean/shadowsocksr-libev/Makefile +++ b/package/lean/shadowsocksr-libev/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/tcpping/Makefile b/package/lean/tcpping/Makefile index c7c65de5e1..cc3ecbb72d 100644 --- a/package/lean/tcpping/Makefile +++ b/package/lean/tcpping/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/vlmcsd/Makefile b/package/lean/vlmcsd/Makefile index 617e9c1f5f..4f670b8c36 100644 --- a/package/lean/vlmcsd/Makefile +++ b/package/lean/vlmcsd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/dns-forwarder/Makefile b/package/lienol/dns-forwarder/Makefile index 424ae7c09e..3f1371fe57 100644 --- a/package/lienol/dns-forwarder/Makefile +++ b/package/lienol/dns-forwarder/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2015 OpenWrt-dist # Copyright (C) 2015 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/dns2socks/Makefile b/package/lienol/dns2socks/Makefile index ef8cec73f6..383c544edf 100644 --- a/package/lienol/dns2socks/Makefile +++ b/package/lienol/dns2socks/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/ipt2socks/Makefile b/package/lienol/ipt2socks/Makefile index b3aef05c75..90c0d1f0b6 100644 --- a/package/lienol/ipt2socks/Makefile +++ b/package/lienol/ipt2socks/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/redsocks2/Makefile b/package/lienol/redsocks2/Makefile index 029bc90104..2fbe1a0f57 100644 --- a/package/lienol/redsocks2/Makefile +++ b/package/lienol/redsocks2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/tcping/Makefile b/package/lienol/tcping/Makefile index 749cabd4b8..ee6b59d258 100644 --- a/package/lienol/tcping/Makefile +++ b/package/lienol/tcping/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3.