Skip to content

Commit 51f6845

Browse files
kiddin9kiddin9
committed
update
1 parent c7952ae commit 51f6845

File tree

13 files changed

+379
-38
lines changed

13 files changed

+379
-38
lines changed

‎.github/workflows/Openwrt-AutoBuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
elif [ ${{matrix.target}} == "x86_generic" ]; then
7070
echo "ARCH=linux/amd32" >> $GITHUB_ENV
7171
echo "MTARGET=x86_generic" >> $GITHUB_ENV
72-
elif [[ ${{matrix.target}} =~ (armsr_armv8|qualcommax_ipq807x|mediatek_mt7622|mediatek_mt7981|mediatek_filogic|bcm27xx_bcm2710|qualcommax_ipq60xx|bcm4908_generic|sunxi_cortexa53) ]]; then
72+
elif [[ ${{matrix.target}} =~ (armsr_armv8|qualcommax_ipq807x|mediatek_mt7622|mediatek_filogic|bcm27xx_bcm2710|qualcommax_ipq60xx|bcm4908_generic|sunxi_cortexa53|amlogic_mesongx) ]]; then
7373
echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
7474
elif [[ ${{matrix.target}} =~ (ramips_mt7621|ramips_mt7620|ramips_mt76x8) ]]; then
7575
echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV

‎.github/workflows/repo-dispatcher.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,8 @@ jobs:
188188
-H "Accept: application/vnd.github.everest-preview+json" \
189189
-H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
190190
-d '{"event_type": "ath79_nand ${{ github.event.inputs.param }}", "client_payload": {"target": "ath79_nand"}}'
191+
curl \
192+
-X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
193+
-H "Accept: application/vnd.github.everest-preview+json" \
194+
-H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
195+
-d '{"event_type": "amlogic_mesongx ${{ github.event.inputs.param }}", "client_payload": {"target": "amlogic_mesongx"}}'

‎devices/amlogic_mesongx/.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11

22
CONFIG_TARGET_amlogic=y
33
CONFIG_TARGET_amlogic_mesongx=y
4-
CONFIG_TARGET_amlogic_mesongx_DEVICE_phicomm_n1=y
5-
6-
CONFIG_TARGET_ROOTFS_SQUASHFS=n
7-
CONFIG_TARGET_ROOTFS_EXT4FS=y
8-
9-
CONFIG_PACKAGE_perf=n
4+
CONFIG_TARGET_MULTI_PROFILE=y
5+
CONFIG_TARGET_ALL_PROFILES=y

‎devices/amlogic_mesongx/diy.sh‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@
22

33
shopt -s extglob
44

5-
SHELL_FOLDER=$(dirname $(readlink -f "$0"))
5+
rm -rf package/kernel
6+
git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/backport-6.1 target/linux/generic/hack-6.1 target/linux/generic/pending-6.1 target/linux/amlogic package/boot/uboot-amlogic package/kernel
67

7-
#bash $SHELL_FOLDER/../common/kernel_6.1.sh
8+
rm -rf package/kernel/bpf-headers
9+
git_clone_path openwrt-24.10 https://github.com/openwrt/openwrt package/kernel/bpf-headers
810

9-
git_clone_path master https://github.com/coolsnowwolf/lede target/linux/amlogic package/boot/uboot-amlogic
11+
sed -i "s/autocore-arm/autocore/" target/linux/amlogic/Makefile
1012

11-
sed -i "s/wpad-openssl/wpad-basic-mbedtls/" target/linux/amlogic/image/mesongx.mk
13+
wget -N https://github.com/coolsnowwolf/lede/raw/refs/heads/master/include/kernel-6.1 -P include/
14+
15+
rm -rf feeds/routing/batman-adv package/kernel/rtw88-usb
16+
17+
echo '
18+
CONFIG_BLK_DEV_INTEGRITY=n
19+
' >> target/linux/amlogic/mesongx/config-6.1
1220

1321

1422

‎devices/amlogic_mesongx/patches/BRCMFMAC_SDIO.patch‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎devices/amlogic_mesongx/patches/fix.patch‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
--- a/target/imagebuilder/Makefile
2+
+++ b/target/imagebuilder/Makefile
3+
@@ -103,7 +103,7 @@ endif
4+
mkdir -p $(PKG_BUILD_DIR)/target/linux/feeds; \
5+
$(CP) -L $(TOPDIR)/target/linux/feeds/$(BOARD) $(PKG_BUILD_DIR)/target/linux/feeds; \
6+
else \
7+
- $(CP) -L $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux; \
8+
+ $(CP) $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux; \
9+
fi
10+
if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \
11+
$(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \
12+
13+
--- a/package/kernel/linux/modules/netdevices.mk
14+
+++ b/package/kernel/linux/modules/netdevices.mk
15+
@@ -290,7 +290,8 @@ define KernelPackage/phy-broadcom
16+
TITLE:=Broadcom Ethernet PHY driver
17+
KCONFIG:=CONFIG_BROADCOM_PHY
18+
DEPENDS:=+kmod-libphy +kmod-phylib-broadcom
19+
- FILES:=$(LINUX_DIR)/drivers/net/phy/broadcom.ko
20+
+ FILES:= \
21+
+ $(LINUX_DIR)/drivers/net/phy/broadcom.ko
22+
AUTOLOAD:=$(call AutoLoad,18,broadcom,1)
23+
endef
24+
25+
26+
--- a/package/kernel/linux/modules/netfilter.mk
27+
+++ b/package/kernel/linux/modules/netfilter.mk
28+
@@ -247,6 +247,7 @@ $(eval $(call KernelPackage,ipt-conntrack))
29+
30+
define KernelPackage/ipt-conntrack-extra
31+
TITLE:=Extra connection tracking modules
32+
+ DEPENDS:=+kmod-nf-conncount
33+
KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA)
34+
FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
35+
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CONNTRACK_EXTRA-m)))
36+
@@ -715,9 +716,24 @@ endef
37+
38+
$(eval $(call KernelPackage,ipt-tproxy))
39+
40+
+define KernelPackage/nf-dup-inet
41+
+ SUBMENU:=$(NF_MENU)
42+
+ TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
43+
+ HIDDEN:=1
44+
+ DEPENDS:=+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
45+
+ KCONFIG:= \
46+
+ CONFIG_NF_DUP_IPV4 \
47+
+ CONFIG_NF_DUP_IPV6
48+
+ FILES:= \
49+
+ $(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
50+
+ $(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko
51+
+endef
52+
+
53+
+$(eval $(call KernelPackage,nf-dup-inet))
54+
+
55+
define KernelPackage/ipt-tee
56+
TITLE:=TEE support
57+
- DEPENDS:=+kmod-ipt-conntrack
58+
+ DEPENDS:=+kmod-ipt-conntrack +kmod-nf-dup-inet
59+
KCONFIG:=$(KCONFIG_IPT_TEE)
60+
FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
61+
AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m)))

‎devices/armsr_armv8/patches/rootfs.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
TARGET_DEVICES += generic
1717

1818
+define Device/box
19-
+ DEVICE_TITLE := 电视盒子全系列 / N1
19+
+ DEVICE_TITLE := 电视盒子全系列
2020
+ DEVICE_PACKAGES := perlbase-base perlbase-utf8 perlbase-time perlbase-xsloader perlbase-file btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk automount
2121
+ IMAGE/rootfs.tar.gz := append-rootfs | gzip
2222
+ IMAGES := rootfs.tar.gz

‎devices/common/diy.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/
3030
wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/package/network/utils/nftables/patches/001-drop-useless-file.patch -P package/network/utils/nftables/patches/
3131
wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/package/libs/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch -P package/libs/libnftnl/patches/
3232
wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/package/firmware/wireless-regdb/patches/600-custom-change-txpower-and-dfs.patch -P package/firmware/wireless-regdb/patches/
33+
wget -N https://github.com/coolsnowwolf/lede/raw/refs/heads/master/package/system/fstools/patches/0200-ntfs3-with-utf8.patch -P package/system/fstools/patches/
3334
wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/master/config/Config-kernel.in -P config/
3435

3536
rm -rf package/libs/openssl package/network/services/ppp feeds/luci/modules/luci-mod-network
36-
git_clone_path openwrt-24.10 https://github.com/immortalwrt/immortalwrt package/libs/openssl package/network/services/ppp
37-
git_clone_path separate-dhcp-dns https://github.com/Alphix/luci modules/luci-mod-network && mv modules/luci-mod-network feeds/luci/modules/
37+
git_clone_path openwrt-24.10 https://github.com/immortalwrt/immortalwrt package/libs/openssl package/network/services/ppp
38+
git_clone_path master https://github.com/openwrt/luci modules/luci-mod-network libs/rpcd-mod-luci; mv modules/luci-mod-network feeds/luci/modules/
39+
wget -N https://github.com/openwrt/luci/raw/refs/heads/master/libs/rpcd-mod-luci/src/luci.c -P feeds/luci/libs/rpcd-mod-luci/src/
3840

3941
echo "$(date +"%s")" >version.date
4042
sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
@@ -63,9 +65,6 @@ wget -N https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/go
6365

6466
git_clone_path master https://github.com/coolsnowwolf/lede mv target/linux/generic/hack-6.6
6567

66-
rm -rf package/system/fstools
67-
git_clone_path master https://github.com/coolsnowwolf/lede package/system/fstools
68-
6968
rm -rf target/linux/generic/hack-6.6/767-net-phy-realtek-add-led*
7069
wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch -P target/linux/generic/pending-6.6/
7170

‎devices/common/patches/luci-dhcp.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
+ so = ss.option(form.Value, 'comments', _('Comments'));
2020
+ so.rmempty = true;
2121
+
22-
var ipaddrs = {};
22+
const ipaddrs = {};
2323

2424
Object.keys(hosts).forEach(function(mac) {

0 commit comments

Comments
 (0)