update

.github/workflows/Openwrt-AutoBuild.yml

@@ -251,6 +251,7 @@ jobs:
         cp openwrt/${{matrix.target}}.config  ./firmware/${{matrix.target}}/${{matrix.target}}.config || true
         cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}/${{matrix.target}}_kernel.config
         kernel_v="$(cat openwrt/include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
+        echo "KERNEL=${kernel_v}" >> $GITHUB_ENV
         cp -rf openwrt/bin/targets/*/*/packages ./kmods/$kernel_v || true
         cp -rf openwrt/bin/packages/*/base/*-firmware* ./kmods/$kernel_v || true
         rm -rf openwrt/bin/targets/*/*/packages/*.ipk
@@ -314,7 +315,7 @@ jobs:
         username: root
         key: ${{ env.SSH_PRIVATE_KEY }}
         script: |
-          cd /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/$(cat openwrt/include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')
+          cd /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/${{ env.KERNEL }}
           opkg &
 
     - name: Upload firmware for artifact

devices/common/.config

@@ -2,6 +2,8 @@
 CONFIG_GRUB_TIMEOUT="0"
 CONFIG_TARGET_ROOTFS_EXT4FS=n
 CONFIG_TARGET_ROOTFS_TARGZ=y
+CONFIG_TARGET_ROOTFS_INITRAMFS=n
+CONFIG_TARGET_ROOTFS_CPIOGZ=n
 CONFIG_LUCI_CSSTIDY=n
 CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n
@@ -13,7 +15,6 @@ CONFIG_TESTING_KERNEL=y
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
 CONFIG_ALL_KMODS=y
-CONFIG_PACKAGE_kmod-rtl88x2bu=n
 CONFIG_PACKAGE_kmod-ipt-coova=n
 CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
 
@@ -37,9 +38,6 @@ CONFIG_PACKAGE_luci-theme-bootstrap=y
 CONFIG_PACKAGE_luci-theme-edge=y
 CONFIG_PACKAGE_luci-theme-argon=y
 
-# Wireless
-CONFIG_PACKAGE_wpad-basic-wolfssl=y
-
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_dnsmasq=n
 CONFIG_PACKAGE_dnsmasq-full=y

devices/common/diy.sh

@@ -2,10 +2,10 @@
 #=================================================
 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)"
+commitid="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
 version="$(git rev-parse HEAD)"
 git checkout master
-[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $commitid
+#[ "$(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-*,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
@@ -15,12 +15,12 @@ mv -f .github/linux-firmware package/firmware/
 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 ' ')"
+kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
 sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-upnp luci-app-autoreboot \
-luci-app-wizard luci-app-attendedsysupgrade dnsmasq-full luci-base luci-compat luci-lib-ipkg \
+luci-app-wizard luci-app-attendedsysupgrade dnsmasq-full luci-base luci-compat luci-lib-ipkg fdisk \
 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
@@ -67,8 +67,8 @@ sed -i '$a CONFIG_ACPI=y\nCONFIG_X86_ACPI_CPUFREQ=y\nCONFIG_NR_CPUS=128\nCONFIG_
 CONFIG_CRYPTO_CHACHA20POLY1305=y\nCONFIG_BINFMT_MISC=y' `find target/linux -path "target/linux/*/config-*"`
 sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/files/uhttpd.config
 #rm -rf ./feeds/packages/lang/{golang,node}
+sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab
 
-sed -i "s/tty1::askfirst/tty1::respawn/g" target/linux/*/base-files/etc/inittab
 date=`date +%m.%d.%Y`
 sed -i -e "/\(# \)\?REVISION:=/c\REVISION:=$date" -e '/VERSION_CODE:=/c\VERSION_CODE:=$(REVISION)' include/version.mk
 

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"><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>';
+		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

@@ -1,6 +1,6 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,12 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+@@ -38,13 +38,13 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  		./files/repositories.conf \
  		$(TMP_DIR)/.targetinfo \
  		$(TMP_DIR)/.packageinfo \
@@ -12,6 +12,7 @@
  	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
  	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
 -endif
++	$(SED) 's/^src\/gz openwrt_core/# src\/gz openwrt_core/' $(PKG_BUILD_DIR)/repositories.conf
  
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
  	# create an empty package index so `opkg` doesn't report an error
@@ -56,7 +57,7 @@
  	@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)" VIP=$(VIP) \
++	nice -n 19 $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
  		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
  
  $(BIN_DIR)/profiles.json: FORCE
@@ -67,9 +68,8 @@
  $(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
-+	nice $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
+ 	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
  		-nopad -noappend -root-owned \
 -		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
 -		-processors 1

phicomm-N1/.config → devices/phicomm-N1/.config

@@ -1,4 +1,7 @@
 CONFIG_TARGET_armvirt=y
 CONFIG_TARGET_armvirt_64=y
 CONFIG_TARGET_armvirt_64_Default=y
+CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_ROOTFS_SQUASHFS=n
+
 

devices/phicomm-N1/diy.sh

@@ -1,4 +1,4 @@
-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
+sed -i 's/\(DEFAULT_PACKAGES +=.*\)/\1 perl btrfs-progs my-autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armvirt/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y
@@ -21,5 +21,5 @@ 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
+' >> ./target/linux/armvirt/64/config-5.15
 

devices/x86_64/patches/Intel_gpu.patch

@@ -178,3 +178,58 @@ index 5ed0d5dbbf2..a853a8c7980 100644
 +endef
 +
 +$(eval $(call KernelPackage,i915-gvt))
+diff --git a/target/linux/x86/64/config-5.15 b/target/linux/x86/64/config-5.15
+index d168f3608ed7..21250d5fbfb8 100644
+--- a/target/linux/x86/64/config-5.15
++++ b/target/linux/x86/64/config-5.15
+@@ -113,30 +113,16 @@ CONFIG_DRM_FBDEV_EMULATION=y
+ CONFIG_DRM_FBDEV_OVERALLOC=100
+ CONFIG_DRM_GEM_SHMEM_HELPER=y
+ # CONFIG_DRM_HYPERV is not set
+-CONFIG_DRM_I915=y
+-CONFIG_DRM_I915_CAPTURE_ERROR=y
+-CONFIG_DRM_I915_COMPRESS_ERROR=y
+-# CONFIG_DRM_I915_DEBUG is not set
+-# CONFIG_DRM_I915_DEBUG_GUC is not set
+-# CONFIG_DRM_I915_DEBUG_MMIO is not set
+-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+-CONFIG_DRM_I915_FENCE_TIMEOUT=10000
+ CONFIG_DRM_I915_FORCE_PROBE=""
+-CONFIG_DRM_I915_GVT=y
++CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
++CONFIG_DRM_I915_FENCE_TIMEOUT=10000
++CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+ CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+-CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+ CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+ CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
+-# CONFIG_DRM_I915_SELFTEST is not set
++CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+ CONFIG_DRM_I915_STOP_TIMEOUT=100
+-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+ CONFIG_DRM_I915_TIMESLICE_DURATION=1
+-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+-CONFIG_DRM_I915_USERPTR=y
+-# CONFIG_DRM_I915_WERROR is not set
+ CONFIG_DRM_KMS_HELPER=y
+ CONFIG_DRM_MIPI_DSI=y
+ CONFIG_DRM_PANEL=y
+@@ -174,6 +160,7 @@ CONFIG_FB_CMDLINE=y
+ CONFIG_FB_DEFERRED_IO=y
+ CONFIG_FB_EFI=y
+ CONFIG_FB_HYPERV=y
++# CONFIG_FB_INTEL is not set
+ CONFIG_FB_MODE_HELPERS=y
+ CONFIG_FB_SIMPLE=y
+ CONFIG_FB_SYS_COPYAREA=y
+@@ -420,6 +407,7 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
+ # CONFIG_TOSHIBA_BT_RFKILL is not set
+ CONFIG_TREE_RCU=y
+ CONFIG_TREE_SRCU=y
++# CONFIG_UACCE is not set
+ # CONFIG_UCLAMP_TASK is not set
+ CONFIG_UCS2_STRING=y
+ # CONFIG_UNWINDER_ORC is not set

phicomm-N1/diy.sh

@@ -1,25 +0,0 @@
-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
-