update

README.md

@@ -28,7 +28,7 @@
 
 + 自建插件仓库囊括了市面上几乎所有开源插件,插件库日更,系统自动更新所有已安装插件.
 
-+ 在线一键定制固件,可在[bf.supes.top](https://bf.supes.top)也可在后台系统定制升级菜单中一键定制, 同时支持github云编译和本地一键编译.
++ 在线一键定制固件,可在[supes.top](https://supes.top)也可在后台系统定制升级菜单中一键定制, 同时支持github云编译和本地一键编译.
 
 + 后台一键OTA更新固件,省去了每次固件升级都需要找固件,下载固件,上传固件等繁琐操作.
 
@@ -45,19 +45,14 @@
 + 自定制清爽Material风格新主题Edge
 
 
-| 设备           | 固件下载                                             | 🐳 Docker |说明                                 |
-|----------------|-----------------------------------------------------|--|--------------------------------------|
-| X86_64         | [📥](https://op.supes.top/firmware/x86_64/)  | [kiddin9/openwrt-nginx:x86_64](https://hub.docker.com/r/kiddin9/openwrt-nginx)      | 请分配不少于1G的存储空间           |
-| NanoPi-R2S    | [📥](https://op.supes.top/firmware/nanopi-r2s/) | [kiddin9/openwrt-nginx:nanopi-r2s](https://hub.docker.com/r/kiddin9/openwrt-nginx)   | 默认交换了网口,靠近电源口的是WAN口   |
-| NanoPi-R4S    | [📥](https://op.supes.top/firmware/nanopi-r4s/) | [kiddin9/openwrt-nginx:nanopi-r4s](https://hub.docker.com/r/kiddin9/openwrt-nginx)   |
-| Raspberry Pi 4B (树莓派4B)| [📥](https://op.supes.top/firmware/Rpi-4B/)  | [kiddin9/openwrt-nginx:rpi-4b](https://hub.docker.com/r/kiddin9/openwrt-nginx)   |
-
-####  固件下载与定制: [https://bf.supes.top](https://bf.supes.top)
+####  固件下载与定制: [https://supes.top](https://supes.top)
 
 #### 后台入口 op/ 或 10.0.0.1  (若后台无法打开,请插拔交换wan,lan网线顺序.)
 
 #### 默认密码 root
 
+####  Docker镜像: [kiddin9/openwrt-nginx](https://hub.docker.com/r/kiddin9/openwrt-nginx)
+
 #### 固件内置的快捷访问入口(部分服务需要先自行在软件包中安装并启用):
 
 + op/ 可打开 OpenWRT后台 即 lan ip

devices/Rpi-4B/patches/imagebuilder.patch

@@ -1,10 +0,0 @@
---- a/target/imagebuilder/Makefile
-+++ b/target/imagebuilder/Makefile
-@@ -31,6 +31,7 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
- 	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
- 	$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
- 	$(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
-+	$(SED) 's/^CONFIG_TARGET_ROOTFS_TARGZ=.*/# CONFIG_TARGET_ROOTFS_TARGZ is not set/' $(PKG_BUILD_DIR)/.config
- 	$(CP) -L \
- 		$(INCLUDE_DIR) $(SCRIPT_DIR) \
- 		$(TOPDIR)/rules.mk \

devices/common/.config

@@ -7,6 +7,8 @@ CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n
 CONFIG_SIGNATURE_CHECK=n
 
+CONFIG_TESTING_KERNEL=y
+
 # 设置固件大小:
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
@@ -75,6 +77,8 @@ CONFIG_PACKAGE_kmod-lib-lz4=y
 CONFIG_PACKAGE_kmod-lib-zstd=y
 CONFIG_NODEJS_14=y
 
+CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
+
 CONFIG_PACKAGE_kmod-ipt-offload=y
 CONFIG_PACKAGE_kmod-tcp-bbr=y
 

devices/common/diy.sh

@@ -4,16 +4,15 @@ shopt -s extglob
 
 commitid="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
 version="$(git rev-parse HEAD)"
-git checkout $commitid
-git checkout HEAD^
+git checkout master
 [ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $commitid
-mv -f target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk .github/
+mv -f target/linux package/kernel package/firmware/linux-firmware include/{kernel-*,netfilter.mk} .github/
 git checkout $version
 rm -rf target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk
 mv -f .github/linux target/
 mv -f .github/kernel package/
 mv -f .github/linux-firmware package/firmware/
-mv -f  .github/kernel-version.mk .github/kernel-5.15 .github/kernel-defaults.mk include/
+mv -f  .github/{kernel-*,netfilter.mk} include/
 sed -i 's/ libelf//' tools/Makefile
 
 kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-5.15* | cut -f 2 -d - | cut -f 1 -d ' ')"
@@ -26,6 +25,12 @@ coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash \
 kmod-usb2 kmod-usb3 automount /" include/target.mk
 sed -i "/dnsmasq \\\/d" include/target.mk
 
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
+
+sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/af9ddeb7c95186854733262554c944d29513a58a.patch | patch -d './' -p1 --forward"
+sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/b4a6d7f974f7b17052ade15a3cf63086bd52736d.patch | patch -d './' -p1 --forward"
+sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
+
 sed -i '/	refresh_config();/d' scripts/feeds
 [ ! -f feeds.conf ] && {
 sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default

devices/common/files/usr/lib/lua/luci/view/admin_status/index/links.htm

@@ -1,6 +1,6 @@
 <script>
 		var links = document.createElement('div');
-		links.innerHTML ='<div class="table"><div class="tr"><div class="td left" width="25%"><a href="https://supes.top/fadian/" target="_blank">赞助</a></div><div class="td left" width="25%"><a href="https://t.me/opwrts" target="_blank">TG交流(小粉红勿扰)</a></div><div class="td left" width="25%"><a href="https://github.com/kiddin9/OpenWrt_x86-r2s-r4s" target="_blank">源码与反馈</a></div><div class="td left"><a href="https://supes.top/" target="_blank">固件下载与定制</a></div></div></div>';
+		links.innerHTML ='<div class="table"><div class="tr"><div class="td left"><a href="https://supes.top/" target="_blank">固件下载与定制</a></div><div class="td left" width="25%"><a href="https://supes.top/fadian/" target="_blank" style="color:orangered">赞助</a></div><div class="td left" width="25%"><a href="https://t.me/opwrts" target="_blank">TG交流(小粉红勿扰)</a></div><div class="td left" width="25%"><a href="https://github.com/kiddin9/OpenWrt_x86-r2s-r4s" target="_blank">源码与反馈</a></div></div></div>';
 		setTimeout(function(){
 		var telegram = document.querySelectorAll(".cbi-section")[0];
 		telegram.appendChild(links);

devices/common/patches/imagebuilder.patch

@@ -53,20 +53,30 @@
  	@echo Building images...
  	rm -rf $(BUILD_DIR)/json_info_files/
 -	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
-+	nice $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
++	nice $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" VIP=$(VIP) \
  		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
  
  $(BIN_DIR)/profiles.json: FORCE
 
 --- a/include/image.mk
 +++ b/include/image.mk
-@@ -225,7 +225,8 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
+@@ -225,10 +225,17 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
  $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
  
  define Image/mkfs/squashfs-common
 -	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
 +	echo -998 > /proc/$$$$/oom_score_adj || true
++	if [ $(VIP) == True ] ; then \
++	nice $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
++		-nopad -noappend -root-owned \
++		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT); \
++	else \
 +	nice $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
  		-nopad -noappend -root-owned \
  		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
- 		-processors 1
+-		-processors 1
++		-processors 1; \
++	fi
+ endef
+ 
+ ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)

devices/nanopi-r2s/patches/imagebuilder.patch

@@ -1,10 +0,0 @@
---- a/target/imagebuilder/Makefile
-+++ b/target/imagebuilder/Makefile
-@@ -31,6 +31,7 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
- 	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
- 	$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
- 	$(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
-+	$(SED) 's/^CONFIG_TARGET_ROOTFS_TARGZ=.*/# CONFIG_TARGET_ROOTFS_TARGZ is not set/' $(PKG_BUILD_DIR)/.config
- 	$(CP) -L \
- 		$(INCLUDE_DIR) $(SCRIPT_DIR) \
- 		$(TOPDIR)/rules.mk \

devices/phicomm-N1/diy.sh

@@ -0,0 +1,25 @@
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-amlogic wpad-basic-wolfssl iw kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/armvirt/Makefile
+
+echo '
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM64=y
+CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64=y
+CONFIG_CRYPTO_SIMD=y
+CONFIG_REALTEK_PHY=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/armvirt/64/config-5.10
+

devices/x86_64/patches/Intel_gpu.patch

@@ -109,78 +109,6 @@ index 923701c703d..7f60014ea6c 100644
 +endef
 +$(eval $(call BuildPackage,i915-firmware))
 
-diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
-index 12efcad2c7e..348b6f24efc 100644
---- a/package/kernel/linux/modules/video.mk
-+++ b/package/kernel/linux/modules/video.mk
-@@ -243,11 +243,15 @@ define KernelPackage/drm
-   SUBMENU:=$(VIDEO_MENU)
-   TITLE:=Direct Rendering Manager (DRM) support
-   HIDDEN:=1
--  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight
--  KCONFIG:=CONFIG_DRM
-+  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit  +PACKAGE_kmod-backlight:kmod-backlight
-+  KCONFIG:=	\
-+	CONFIG_DRM	\
-+	CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y	\
-+	CONFIG_DRM_FBDEV_EMULATION=y \
-+	CONFIG_DRM_FBDEV_OVERALLOC=100 \
-+	CONFIG_HDMI
-   FILES:= \
--	$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
--	$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
-+	$(LINUX_DIR)/drivers/gpu/drm/drm.ko
-   AUTOLOAD:=$(call AutoLoad,05,drm)
- endef
- 
-@@ -318,8 +322,6 @@ define KernelPackage/drm-imx
-   TITLE:=Freescale i.MX DRM support
-   DEPENDS:=@TARGET_imx +kmod-drm-kms-helper
-   KCONFIG:=CONFIG_DRM_IMX \
--	CONFIG_DRM_FBDEV_EMULATION=y \
--	CONFIG_DRM_FBDEV_OVERALLOC=100 \
- 	CONFIG_IMX_IPUV3_CORE \
- 	CONFIG_RESET_CONTROLLER=y \
- 	CONFIG_DRM_IMX_IPUV3 \
-@@ -1046,3 +1048,38 @@ define KernelPackage/video-gspca-konica/description
- endef
- 
- $(eval $(call KernelPackage,video-gspca-konica))
-+
-+define KernelPackage/drm-i915
-+  SUBMENU:=$(VIDEO_MENU)
-+  TITLE:=Intel GPU drm support
-+  DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware
-+  KCONFIG:=	\
-+          CONFIG_INTEL_GTT=y			\
-+          CONFIG_DRM_I915=m			\
-+          CONFIG_DRM_I915_CAPTURE_ERROR=y	\
-+          CONFIG_DRM_I915_COMPRESS_ERROR=y	\
-+          CONFIG_DRM_I915_USERPTR=y		\
-+          CONFIG_DRM_I915_GVT=y			\
-+          CONFIG_DRM_I915_WERROR=n		\
-+          CONFIG_DRM_I915_DEBUG=n		\
-+          CONFIG_DRM_I915_DEBUG_MMIO=n		\
-+          CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n	\
-+          CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n	\
-+          CONFIG_DRM_I915_DEBUG_GUC=n		\
-+          CONFIG_DRM_I915_SELFTEST=n		\
-+          CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n	\
-+          CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n	\
-+          CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n
-+  FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko
-+  AUTOLOAD:=$(call AutoProbe,i915)
-+endef
-+
-+define KernelPackage/drm-i915/description
-+  Direct Rendering Manager (DRM) support for "Intel Graphics
-+  Media Accelerator" or "HD Graphics" integrated graphics,
-+  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
-+  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
-+  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
-+endef
-+
-+$(eval $(call KernelPackage,drm-i915))
 diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
 index 5ed0d5dbbf2..a853a8c7980 100644
 --- a/package/kernel/linux/modules/virt.mk
@@ -205,7 +133,7 @@ index 5ed0d5dbbf2..a853a8c7980 100644
 +	  CONFIG_VFIO_MDEV_DEVICE
 +  FILES:=	\
 +	  $(LINUX_DIR)/drivers/vfio/mdev/mdev.ko	\
-+          $(LINUX_DIR)/drivers/vfio/mdev/vfio_mdev.ko
++          $(LINUX_DIR)/drivers/vfio/mdev/vfio_mdev.ko@lt5.10
 +  AUTOLOAD:=$(call AutoProbe,mdev vfio_mdev)
 +endef
 +

phicomm-N1/.config

@@ -0,0 +1,4 @@
+CONFIG_TARGET_armvirt=y
+CONFIG_TARGET_armvirt_64=y
+CONFIG_TARGET_armvirt_64_Default=y
+

phicomm-N1/diy.sh

@@ -0,0 +1,25 @@
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-amlogic wpad-basic-wolfssl iw kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/armvirt/Makefile
+
+echo '
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM64=y
+CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA256_ARM64=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64=y
+CONFIG_CRYPTO_SIMD=y
+CONFIG_REALTEK_PHY=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/armvirt/64/config-5.10
+