update

kiddin9 · Jun 2, 2023 · bbee593 · bbee593
1 parent 04756cd
commit bbee593
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 8 deletions.
diff --git a/devices/armvirt_64/diy.sh b/devices/armvirt_64/diy.sh
@@ -4,6 +4,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk/' target/linux/armvirt/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armvirt/Makefile
 
 
diff --git a/devices/armvirt_64/patches/rootfs.patch b/devices/armvirt_64/patches/rootfs.patch
@@ -21,7 +21,7 @@
 +define Device/box
 +  DEVICE_VENDOR := 
 +  DEVICE_MODEL := 电视盒子全系列 / N1
-+  DEVICE_PACKAGES :=
++  DEVICE_PACKAGES := perlbase-base btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk
 +endef
 +TARGET_DEVICES += box
 +

diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -40,9 +40,6 @@ sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_g
 sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
 
 (
-svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.10 target/linux/generic/hack-5.10
-rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-drivers-net*,996-fs-ntfs3*,100-update-mtk_wed_h.patch}
-
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/backport-5.15 target/linux/generic/backport-5.15
 find target/linux/generic/backport-5.15 -name "[0-9][0-9][0-9]-[a-z][a-z]*" -exec rm -f {} \;
@@ -51,8 +48,6 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linu
 sed -i "s/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 ) &
 
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch
-
 sed -i "/BuildPackage,miniupnpd-iptables/d" feeds/packages/net/miniupnpd/Makefile
 sed -i 's/Os/O2/g' include/target.mk
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*

diff --git a/devices/common/patches/imagebuilder.patch b/devices/common/patches/imagebuilder.patch
@@ -41,7 +41,7 @@
  	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
  	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
 +	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-4a-gigabit-v2|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban|DEVICE_zte_e8820v2) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(TOPDIR)/repositories.conf; \
++		echo "src/gz openwrt_smflash https://op.supes.top/packages/small_flash" >>$(TOPDIR)/repositories.conf; \
 +	else \
 +		sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
 +	fi

diff --git a/devices/mediatek_mt7981/patches/fix.patch b/devices/mediatek_mt7981/patches/fix.patch
@@ -39,3 +39,17 @@
          ],
          stdout=PIPE,
          stderr=PIPE,
+
+--- a/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
++++ b/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
+@@ -581,9 +581,7 @@ <h2><%:Interface Configurations%> - <%=vifname and devname.."@"..vifname or devn
+         </table>
+         <h3><%:Access control MAC address list%></h3>
+         <textarea name="__maclist" id="__maclist" style="width:98%; height: 100px;"><%
+-        local list = cfgs["AccessControlList"..(vifidx-1)] or ""
+-        print(table.concat(list:split(";"), "\n"))
+-        %></textarea>
++        local list = cfgs["AccessControlList"..(vifidx-1)] or "" %><%=table.concat(list:split(";"), "\n")%></textarea>
+         </fieldset>
+
+         <% if string.split(cfgs.WirelessMode,";")[1] == "16" or string.split(cfgs.WirelessMode,";")[1] == "17" or string.split(cfgs.WirelessMode,";")[1] == "18" then %>
diff --git a/devices/mediatek_mt7986/patches/fix.patch b/devices/mediatek_mt7986/patches/fix.patch
@@ -39,3 +39,17 @@
          ],
          stdout=PIPE,
          stderr=PIPE,
+
+--- a/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
++++ b/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
+@@ -581,9 +581,7 @@ <h2><%:Interface Configurations%> - <%=vifname and devname.."@"..vifname or devn
+         </table>
+         <h3><%:Access control MAC address list%></h3>
+         <textarea name="__maclist" id="__maclist" style="width:98%; height: 100px;"><%
+-        local list = cfgs["AccessControlList"..(vifidx-1)] or ""
+-        print(table.concat(list:split(";"), "\n"))
+-        %></textarea>
++        local list = cfgs["AccessControlList"..(vifidx-1)] or "" %><%=table.concat(list:split(";"), "\n")%></textarea>
+         </fieldset>
+
+         <% if string.split(cfgs.WirelessMode,";")[1] == "16" or string.split(cfgs.WirelessMode,";")[1] == "17" or string.split(cfgs.WirelessMode,";")[1] == "18" then %>
diff --git a/devices/meson_meson8b/.config b/devices/meson_meson8b/.config
@@ -6,3 +6,5 @@ CONFIG_TARGET_DEVICE_meson_meson8b_DEVICE_thunder-onecloud=y
 
 CONFIG_TARGET_ROOTFS_SQUASHFS=n
 CONFIG_TARGET_ROOTFS_EXT4FS=y
+
+CONFIG_PACKAGE_perf=n
diff --git a/devices/meson_meson8b/diy.sh b/devices/meson_meson8b/diy.sh
@@ -4,5 +4,10 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
+rm -rf target/linux/generic
+
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/target/linux/generic target/linux/generic
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/meson target/linux/meson
 
+curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/include/kernel-5.10 -o include/kernel-5.10
+