update

devices/armvirt_64/patches/image.patch

@@ -1,18 +0,0 @@
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -294,5 +294,5 @@
- endef
- 
--ROOTFSTZ = $(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
-+ROOTFSTZ = $(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).tar.gz
- ifdef CONFIG_TARGET_ROOTFS_TARGZ
-   define Image/Build/targz
-@@ -308,6 +308,6 @@
- 	FILE_NAME="$(ROOTFSTZ)" \
- 	FILE_DIR="$(BIN_DIR)" \
--	FILE_TYPE="rootfs" \
--	FILE_FILESYSTEM="rootfs" \
-+	FILE_TYPE="sysupgrade" \
-+	FILE_FILESYSTEM="ext4" \
- 	DEVICE_IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))" \
- 	DEVICE_VENDOR="$(shell echo $($(PROFILE)_NAME) | cut -d " " -f1)" \

devices/at91_sama5/.config

@@ -2,9 +2,7 @@
 CONFIG_TARGET_at91=y
 CONFIG_TARGET_at91_sama5=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_at91_sama5_DEVICE_wankeyun=y
-
-CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_DEVICE_at91_sama5_DEVICE_microchip_sama5d3-xplained=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/at91_sama5/diy.sh

@@ -4,5 +4,5 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/mediatek/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq fdisk lsblk btrfs-progs block-mount blkid parted dosfstools e2fsprogs pv losetup uuidgen automount tune2fs resize2fs/' target/linux/at91/Makefile
 

devices/at91_sama5/patches/wankeyun.patch

@@ -1,19 +1,32 @@
 --- a/target/linux/at91/image/sama5.mk
 +++ b/target/linux/at91/image/sama5.mk
-@@ -120,6 +120,16 @@ define Device/microchip_sama5d3-xplained
- endef
- TARGET_DEVICES += microchip_sama5d3-xplained
+@@ -111,8 +111,8 @@ TARGET_DEVICES += microchip_sama5d2-ptc-ek
  
-+define Device/wankeyun
-+  $(Device/evaluation-dtb)
+ define Device/microchip_sama5d3-xplained
+   $(Device/evaluation-dtb)
+-  DEVICE_VENDOR := Microchip
+-  DEVICE_MODEL := SAMA5D3 Xplained
 +  DEVICE_VENDOR := 玩客云
-+  DEVICE_MODEL := WanKeYun
-+  DEVICE_DTS := at91-sama5d3_xplained
-+  KERNEL_SIZE := 6144k
-+  $(Device/evaluation-sdimage)
++  DEVICE_MODEL := OneCloud
+   DEVICE_DTS := at91-sama5d3_xplained
+   SUPPORTED_DEVICES := atmel,sama5d3-xplained
+   KERNEL_SIZE := 6144k
+
+--- a/target/linux/at91/image/Makefile
++++ b/target/linux/at91/image/Makefile
+@@ -76,4 +76,15 @@ define Device/production-dtb
+ 	append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
+ endef
+ 
++define Image/Build
++	if [ $(PROFILE_SANITIZED) == "microchip_sama5d3-xplained" ]; then \
++		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
++		export BIN_DIR=$(BIN_DIR); \
++		export TARGET_ROOTFS_DIR=$(TARGET_DIR); \
++		cd $(TOPDIR)/../packit; \
++		./build.sh; \
++		gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).img || true; \
++	fi
 +endef
-+TARGET_DEVICES += wankeyun
 +
- ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
-  ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
-   define Device/laird_wb50n
+ $(eval $(call BuildImage))

devices/common/.config

@@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci-compat=y
 CONFIG_PACKAGE_luci-lib-ipkg=y
 CONFIG_LUCI_LANG_zh_Hans=y
-CONFIG_luci-i18n-base-en=y
+CONFIG_PACKAGE_luci-i18n-base-en=y
 CONFIG_PACKAGE_coremark=y
 CONFIG_DEVEL=y
 CONFIG_CCACHE=y
@@ -71,9 +71,6 @@ CONFIG_OPENSSL_ENGINE_BUILTIN=y
 CONFIG_OPENSSL_ENGINE_BUILTIN_AFALG=y
 CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO=y
 
-CONFIG_PACKAGE_kmod-tcp-bbr=y
-CONFIG_PACKAGE_miniupnpd=y
-
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES=y

devices/common/kernel_5.15.sh

@@ -2,6 +2,7 @@
 
 rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk}
 latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
+latest=""
 mkdir new; cp -rf .git new/.git
 cd new
 [ "$latest" ] && git reset --hard $latest || git reset --hard origin/master

devices/common/patches/imagebuilder.patch

@@ -55,24 +55,23 @@
  
  _call_manifest: FORCE
  	rm -rf $(TARGET_DIR)
-@@ -166,7 +181,15 @@ package_install: FORCE
+@@ -166,7 +181,14 @@ package_install: FORCE
  	@echo Installing packages...
  	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
  	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
 -	$(OPKG) install $(BUILD_PACKAGES)
-+	packages="luci-i18n-base-zh-cn luci-i18n-base-en"; \
 +	for p in $(BUILD_PACKAGES); do \
 +		if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
-+			packages="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn $$packages"; \
++			packages+="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn "; \
 +		fi \
 +	done; \
-+	$(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES); \
++	$(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES) luci-i18n-base-zh-cn luci-i18n-base-en; \
 +	$(OPKG) install $$packages || true
 +	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
  
  prepare_rootfs: FORCE
  	@echo
-@@ -180,12 +203,15 @@ prepare_rootfs: FORCE
+@@ -180,12 +202,15 @@ prepare_rootfs: FORCE
  		) \
  	)
  	$(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES))

devices/ipq807x/diy.sh

@@ -4,7 +4,7 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat target/linux/generic
+rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-board package/firmware/ath11k-board
@@ -13,15 +13,11 @@ svn export --force https://github.com/Boos4721/openwrt/trunk/package/qca package
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/qat package/qat
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel/mac80211 package/kernel/mac80211
 
-svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic target/linux/generic
+svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/pending-5.15 target/linux/generic/pending-5.15
+
 svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x
 
 curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/package/kernel/linux/modules/netsupport.mk -o package/kernel/linux/modules/netsupport.mk
-curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/include/kernel-5.15.mk -o include/kernel-5.15
-
-kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
-echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
-sed -i "s?targets/%S/.*'?targets/%S/$kernel_v'?" include/feeds.mk
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-turboacc/' target/linux/ipq807x/Makefile
 

devices/rockchip_armv8/patches/r5s.patch

@@ -73,7 +73,7 @@
 
 --- a/target/linux/rockchip/image/Makefile
 +++ b/target/linux/rockchip/image/Makefile
-@@ -75,4 +75,16 @@ endef
+@@ -75,4 +75,17 @@ endef
  
  include $(SUBTARGET).mk
  
@@ -81,11 +81,12 @@
 +	if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r5s" ]; then \
 +		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 +		export BIN_DIR=$(BIN_DIR); \
-+		export PARTSIZE=$(CONFIG_TARGET_ROOTFS_PARTSIZE); \
-+		cd $(TOPDIR)/../openwrt_packit; \
++		export TOPDIR=$(TOPDIR); \
++		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/openwrt_packit; \
++		. ../modify_packit.sh; \
 +		./build.sh sd-img; \
-+		./build.sh emmc-img; \
-+		rm -rf $(BIN_DIR)/*r5s-squashfs-sysupgrade.img.gz; \
++		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
++		rm -rf $(BIN_DIR)/*r5s-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
 +	fi
 +endef
 +