From 131cf8dc7972b111241cfb5c3e65fa4d3d85da4f Mon Sep 17 00:00:00 2001 From: ophub Date: Sat, 16 Apr 2022 08:51:53 +0800 Subject: [PATCH] Adjust the partition unit to MiB --- build-armbian/common-files/rootfs/usr/sbin/armbian-install | 4 ++-- .../tools/config/{config-5.4.187 => config-5.4.189} | 2 +- rebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename compile-kernel/tools/config/{config-5.4.187 => config-5.4.189} (99%) diff --git a/build-armbian/common-files/rootfs/usr/sbin/armbian-install b/build-armbian/common-files/rootfs/usr/sbin/armbian-install index a300c1c599..22105af728 100755 --- a/build-armbian/common-files/rootfs/usr/sbin/armbian-install +++ b/build-armbian/common-files/rootfs/usr/sbin/armbian-install @@ -235,8 +235,8 @@ fi # Format emmc disk echo "Start create MBR and partittion" parted -s "${DEV_EMMC}" mklabel msdos 2>/dev/null -parted -s "${DEV_EMMC}" mkpart primary fat32 $((BLANK1))M $((BLANK1 + BOOT - 1))M 2>/dev/null -parted -s "${DEV_EMMC}" mkpart primary ${file_system_type} $((BLANK1 + BOOT + BLANK2))M 100% 2>/dev/null +parted -s "${DEV_EMMC}" mkpart primary fat32 $((BLANK1))MiB $((BLANK1 + BOOT - 1))MiB 2>/dev/null +parted -s "${DEV_EMMC}" mkpart primary ${file_system_type} $((BLANK1 + BOOT + BLANK2))MiB 100% 2>/dev/null sync # Write the uboot diff --git a/compile-kernel/tools/config/config-5.4.187 b/compile-kernel/tools/config/config-5.4.189 similarity index 99% rename from compile-kernel/tools/config/config-5.4.187 rename to compile-kernel/tools/config/config-5.4.189 index d609a2645f..b9aef945dd 100755 --- a/compile-kernel/tools/config/config-5.4.187 +++ b/compile-kernel/tools/config/config-5.4.189 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.187 Kernel Configuration +# Linux/arm64 5.4.189 Kernel Configuration # # diff --git a/rebuild b/rebuild index 3b084c9aac..fbe967f620 100755 --- a/rebuild +++ b/rebuild @@ -608,8 +608,8 @@ make_image() { sync parted -s ${build_image_file} mklabel msdos 2>/dev/null - parted -s ${build_image_file} mkpart primary fat32 $((SKIP_MB))M $((SKIP_MB + BOOT_MB - 1))M 2>/dev/null - parted -s ${build_image_file} mkpart primary ${ROOTFS_TYPE} $((SKIP_MB + BOOT_MB))M 100% 2>/dev/null + parted -s ${build_image_file} mkpart primary fat32 $((SKIP_MB))MiB $((SKIP_MB + BOOT_MB - 1))MiB 2>/dev/null + parted -s ${build_image_file} mkpart primary ${ROOTFS_TYPE} $((SKIP_MB + BOOT_MB))MiB 100% 2>/dev/null sync loop_new=$(losetup -P -f --show "${build_image_file}")