update

.github/workflows/Openwrt-AutoBuild.yml

@@ -65,7 +65,7 @@ jobs:
         if [ ${{matrix.target}} == "x86_64" ]; then
             echo "ARCH=linux/amd64" >> $GITHUB_ENV
             echo "MTARGET=x86_64" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (Rpi-4B|nanopi-r2s|nanopi-r4s) ]]; then
+        elif [[ ${{matrix.target}} =~ (Rpi-4B|nanopi-r2s|nanopi-r2c|nanopi-r4s) ]]; then
             echo "ARCH=linux/arm64" >> $GITHUB_ENV
         fi
         if [ ${{matrix.target}} == "Rpi-4B" ]; then
@@ -250,7 +250,7 @@ jobs:
         fi
         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.10 | grep LINUX_KERNEL_HASH-5.10* | cut -f 2 -d - | cut -f 1 -d ' ')"
+        kernel_v="$(cat openwrt/include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
         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 +314,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.10 | grep LINUX_KERNEL_HASH-5.10* | cut -f 2 -d - | cut -f 1 -d ' ')
+          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 ' ')
           opkg &
 
     - name: Upload firmware for artifact
@@ -325,6 +325,7 @@ jobs:
         name: ${{ env.VERSION }}_${{matrix.target}}
         path: |
           ./firmware/
+          /www/wwwroot/op.supes.top/releases/
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
@@ -409,7 +410,7 @@ jobs:
       uses: GitRML/delete-workflow-runs@main
       continue-on-error: true
       with:
-        retain_days: 10
+        retain_days: 30
         keep_minimum_runs: 0
 
     - name: Remove old Releases

devices/common/.config

@@ -15,7 +15,7 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 CONFIG_ALL_KMODS=y
 CONFIG_PACKAGE_kmod-rtl88x2bu=n
 CONFIG_PACKAGE_kmod-ipt-coova=n
-CONFIG_PACKAGE_kmod-backlight=n
+CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
 
 CONFIG_IB=y
 CONFIG_IB_STANDALONE=y

devices/common/diy.sh

@@ -26,6 +26,7 @@ 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
+sed -i "s/+PACKAGE_kmod-backlight.*//" 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"
@@ -43,6 +44,10 @@ rm -rf package/{base-files,network/config/firewall,network/services/dnsmasq,netw
 ./scripts/feeds install -a
 cd feeds/kiddin9; git pull; cd -
 
+rm -f package/feeds/packages/libpfring; svn export https://github.com/openwrt/packages/trunk/libs/libpfring package/feeds/kiddin9/libpfring
+rm -f package/feeds/packages/xtables-addons; svn export https://github.com/openwrt/packages/trunk/net/xtables-addons package/feeds/kiddin9/xtables-addons
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/packages/master/libs/xr_usb_serial_common/patches/0001-fix-build-with-kernel-5.15.patch -o package/feeds/packages/xr_usb_serial_common/patches/0001-fix-build-with-kernel-5.15.patch
+
 (
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl

devices/common/patches/disable-antfs.patch

@@ -0,0 +1,24 @@
+--- a/package/feeds/packages/antfs/Makefile
++++ b/package/feeds/packages/antfs/Makefile
+@@ -20,7 +20,7 @@ define KernelPackage/fs-antfs
+ 	TITLE:=AVM NTFS Read/Write Driver
+ 	FILES:=$(PKG_BUILD_DIR)/antfs.ko
+ 	AUTOLOAD:=$(call AutoLoad,30,antfs,1)
+-	DEPENDS:=+kmod-nls-base
++	DEPENDS:=@!LINUX_5_15 +kmod-nls-base
+ endef
+ 
+ define KernelPackage/fs-antfs/description
+diff --git a/utils/antfs-mount/Makefile b/utils/antfs-mount/Makefile
+index 48ffc6f1cc..a9ee67dd2c 100644
+--- a/package/feeds/packages/antfs-mount/Makefile
++++ b/package/feeds/packages/antfs-mount/Makefile
+@@ -11,7 +11,7 @@ define Package/antfs-mount
+ 	SUBMENU:=Filesystem
+ 	TITLE:=NTFS mount script for AVM NTFS driver
+ 	PKGARCH:=all
+-	DEPENDS:=+kmod-fs-antfs
++	DEPENDS:=@!LINUX_5_15 +kmod-fs-antfs
+ endef
+ 
+ define Build/Configure

devices/common/patches/imagebuilder.patch

@@ -1,7 +1,10 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
-@@ -40,11 +40,9 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+@@ -38,13 +38,12 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+ 		./files/repositories.conf \
+ 		$(TMP_DIR)/.targetinfo \
  		$(TMP_DIR)/.packageinfo \
++		$(TOPDIR)/files \
  		$(PKG_BUILD_DIR)/
  
 -ifeq ($(CONFIG_IB_STANDALONE),)
@@ -60,23 +63,37 @@
 
 --- a/include/image.mk
 +++ b/include/image.mk
-@@ -225,10 +225,17 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
+@@ -225,10 +225,10 @@ $(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) \
+-		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
 -		-processors 1
-+		-processors 1; \
-+	fi
++		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT)
  endef
  
  ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
+
+--- a/scripts/json_overview_image_info.py
++++ b/scripts/json_overview_image_info.py
+@@ -47,7 +47,7 @@ def get_initial_output(image_info):
+ 
+ 
+ if output:
+-    default_packages, output["arch_packages"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
+         [
+             "make",
+             "--no-print-directory",
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
+             "target/linux/",
+             "val.DEFAULT_PACKAGES",
+             "val.ARCH_PACKAGES",
++            "val.LINUX_VERSION",
+         ],
+         stdout=PIPE,
+         stderr=PIPE,

devices/x86_64/diy.sh

@@ -3,7 +3,7 @@
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.15 target/linux/x86/patches-5.15
 rm -rf target/linux/x86/patches-5.15/.svn
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 kmod-igc kmod-drm-i915/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 kmod-igc kmod-drm-i915 kmod-mlx4-core/' target/linux/x86/Makefile
 
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 

devices/x86_64/patches/exsi.patch

@@ -0,0 +1,52 @@
+--- a/include/image-commands.mk
++++ b/include/image-commands.mk
+@@ -329,6 +329,17 @@ endef
+ 
+ # Convert a raw image into a $1 type image.
+ # E.g. | qemu-image vdi
++define Build/qemu-exsi
++	if command -v qemu-img; then \
++		name="$(subst .vmdk.zip,,$@)"; \
++		qemu-img convert -f raw -O $1 $@ $$name.vmdk; \
++		rm -f $@; \
++		zip -jm $@ $$name*.vmdk; \
++	else \
++		echo "WARNING: Install qemu-img to create VDI/VMDK images" >&2; exit 1; \
++	fi
++endef
++
+ define Build/qemu-image
+ 	if command -v qemu-img; then \
+ 		qemu-img convert -f raw -O $1 $@ [email protected]; \
+
+--- a/target/linux/x86/image/Makefile
++++ b/target/linux/x86/image/Makefile
+@@ -108,7 +108,7 @@ define Device/Default
+   IMAGE/combined.img := grub-config pc | combined | grub-install | append-metadata
+   IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip | append-metadata
+   IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi
+-  IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk
++  IMAGE/combined.vmdk.zip := grub-config pc | combined | grub-install | qemu-exsi vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat
+   IMAGE/combined.vhdx := grub-config pc | combined | grub-install | qemu-image vhdx -o subformat=dynamic
+   IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
+   IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
+@@ -116,7 +116,7 @@ define Device/Default
+   IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi | append-metadata
+   IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
+   IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi
+-  IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
++  IMAGE/combined-efi.vmdk.zip := grub-config efi | combined efi | grub-install efi | qemu-exsi vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat
+   IMAGE/combined-efi.vhdx := grub-config efi | combined efi | grub-install efi | qemu-image vhdx -o subformat=dynamic
+   ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
+     IMAGES-y := rootfs.img.gz
+@@ -139,8 +139,8 @@ define Device/Default
+     IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vdi
+   endif
+   ifeq ($(CONFIG_VMDK_IMAGES),y)
+-    IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk
+-    IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk
++    IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk.zip
++    IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk.zip
+   endif
+   ifeq ($(CONFIG_VHDX_IMAGES),y)
+     IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vhdx