From 136cfac33b55a9c50d2663033b10fda753015082 Mon Sep 17 00:00:00 2001
From: lindongping <lindongping2027@phytium.com.cn>
Date: Thu, 1 Feb 2024 18:44:43 +0800
Subject: [PATCH] rootfs support xz and img support 7z

---
 configs/phytiumpi_defconfig         | 2 +-
 configs/phytiumpi_desktop_defconfig | 1 +
 package/genimage/genimage.mk        | 2 +-
 package/p7zip/p7zip.mk              | 9 +++++++++
 support/scripts/genimage.sh         | 9 +++++++++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig
index ac222e38..8dab967e 100644
--- a/configs/phytiumpi_defconfig
+++ b/configs/phytiumpi_defconfig
@@ -5,6 +5,7 @@ BR2_cortex_a53=y
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_TAR_XZ=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="15G"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/phytium/post-image.sh support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/phytium/genimage-phytiumpi.cfg"
@@ -58,7 +59,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
-
 BR2_PACKAGE_BUSYBOX=n
 BR2_PACKAGE_PHYUBOOT=y
 
diff --git a/configs/phytiumpi_desktop_defconfig b/configs/phytiumpi_desktop_defconfig
index 2a31b09b..52f7597a 100644
--- a/configs/phytiumpi_desktop_defconfig
+++ b/configs/phytiumpi_desktop_defconfig
@@ -5,6 +5,7 @@ BR2_cortex_a53=y
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_TAR_XZ=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="15G"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/phytium/post-image.sh support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/phytium/genimage-phytiumpi.cfg"
diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
index 44963b48..79d0b94d 100644
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@@ -7,7 +7,7 @@
 GENIMAGE_VERSION = 15
 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
 GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION)
-HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse
+HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse host-p7zip
 GENIMAGE_LICENSE = GPL-2.0
 GENIMAGE_LICENSE_FILES = COPYING
 
diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk
index b6c5adae..e3d2f29d 100644
--- a/package/p7zip/p7zip.mk
+++ b/package/p7zip/p7zip.mk
@@ -31,4 +31,13 @@ define P7ZIP_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/$(P7ZIP_TARGET)
 endef
 
+define HOST_P7ZIP_BUILD_CMDS
+	$(BR2_MAKE1) -C $(@D) $(P7ZIP_TARGET)
+endef
+
+define HOST_P7ZIP_INSTALL_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/bin/$(P7ZIP_TARGET) $(HOST_DIR)/bin/$(P7ZIP_TARGET)
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh
index 2796e19e..f951561e 100755
--- a/support/scripts/genimage.sh
+++ b/support/scripts/genimage.sh
@@ -46,3 +46,12 @@ genimage \
 	--inputpath "${BINARIES_DIR}"  \
 	--outputpath "${BINARIES_DIR}" \
 	--config "${GENIMAGE_CFG}"
+
+if [ -e ${BINARIES_DIR}/disk.img ]; then
+	7zr a ${BINARIES_DIR}/disk.img.7z ${BINARIES_DIR}/disk.img
+fi
+
+if [ -e ${BINARIES_DIR}/sdcard.img ]; then
+        7zr a ${BINARIES_DIR}/sdcard.img.7z ${BINARIES_DIR}/sdcard.img
+fi
+
-- 
Gitee