update

kiddin9 · Jul 28, 2022 · 574092b · 574092b
1 parent b7ad85d
commit 574092b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/devices/at91_sama5/patches/wankeyun.patch b/devices/at91_sama5/patches/wankeyun.patch
@@ -10,4 +10,23 @@
 +  DEVICE_MODEL := OneCloud
    DEVICE_DTS := at91-sama5d3_xplained
    SUPPORTED_DEVICES := atmel,sama5d3-xplained
-   KERNEL_SIZE := 6144k
+   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
++
+ $(eval $(call BuildImage))
diff --git a/devices/common/patches/imagebuilder.patch b/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))

diff --git a/devices/rockchip_armv8/patches/r5s.patch b/devices/rockchip_armv8/patches/r5s.patch
@@ -73,19 +73,20 @@
 
 --- 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
 
 +define Image/Build
 +	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
 +