@@ -12,12 +12,14 @@ ROOT_LABEL="ROOT"
1212IMG_SIZE=" $(( SKIP_SIZE + BOOT_SIZE + ROOT_SIZE)) "
1313
1414OUT_FILENAME=" ArchLinuxARM-aarch64_S905X"
15- ARCHLINUXARM_TARBALL_FILE=" ArchLinuxARM-aarch64.tar.gz"
16- OUT_DIR=" BUILD_OUT"
15+ WORKING_DIR=" /tmp/BUILD_DIR"
16+ ARCHLINUXARM_TARBALL_FILE=" ${WORKING_DIR} /ArchLinuxARM-aarch64.tar.gz"
17+ OUT_DIR=" ${WORKING_DIR} /BUILD_OUT"
1718IMG_FILENAME=" ${OUT_FILENAME} .img"
1819
19- BOOT_FILES=" src/boot-files"
20- PATCH_FILES=" src/patch"
20+ BOOT_FILES=" ${WORKING_DIR} /src/boot-files"
21+ PATCH_FILES=" ${WORKING_DIR} /src/patch"
22+
2123
2224# Create IMG file
2325
@@ -36,7 +38,7 @@ make_image() {
3638 sync
3739
3840 parted -s ${IMG_FILENAME} mklabel msdos 2> /dev/null
39- parted -s ${IMG_FILENAME} mkpart primary fat32 $(( SKIP_SIZE)) MiB $( SKIP_SIZE + BOOT_SIZE - 1) MiB 2> /dev/null
41+ parted -s ${IMG_FILENAME} mkpart primary fat32 $(( SKIP_SIZE)) MiB $(( SKIP_SIZE + BOOT_SIZE - 1 ) ) MiB 2> /dev/null
4042 parted -s ${IMG_FILENAME} mkpart primary ${ROOTFS_TYPE} $(( SKIP_SIZE + BOOT_SIZE)) MiB 100% 2> /dev/null
4143 sync
4244
@@ -55,11 +57,11 @@ make_image() {
5557 mkdir -p mnt/boot
5658
5759 if ! mount ${LOOP_DEV} p2 mnt; then
58- error_msg " mount ${LOOP_DEV} p2 failed!"
60+ print_err " mount ${LOOP_DEV} p2 failed!"
5961 fi
6062
6163 if ! mount ${LOOP_DEV} p1 mnt/boot; then
62- error_msg " mount ${LOOP_DEV} p1 failed!"
64+ print_err " mount ${LOOP_DEV} p1 failed!"
6365 fi
6466
6567 cp -a ${BOOT_FILES} /* mnt/boot
@@ -74,6 +76,6 @@ make_image() {
7476 gzip -9 ${IMG_FILENAME} && sync && mv " ${IMG_FILENAME} .gz ${OUT_DIR} /"
7577}
7678
77- mkdir /tmp/BUILD_DIR && cd $_
79+ cd ${WORKING_DIR}
7880
7981make_image
0 commit comments