Skip to content

Commit b49578b

Browse files
committed
.
1 parent b3cbc32 commit b49578b

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

.github/workflows/build-ArchLinux-ARM.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55

66
env:
7-
REQUIRED_PACKAGES: acl aptly aria2 bc binfmt-support bison btrfs-progs build-essential busybox ca-certificates ccache coreutils cpio cryptsetup crossbuild-essential-arm64 clang curl debian-archive-keyring debian-keyring debootstrap device-tree-compiler dialog dirmngr dosfstools dwarves f2fs-tools fakeroot flex gawk gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu gdisk git gpg gzip imagemagick jq kmod libbison-dev libc6-dev-armhf-cross libcrypto++-dev libelf-dev libfdt-dev libfile-fcntllock-perl parallel libfl-dev liblz4-tool libncurses-dev libncurses5 libncurses5-dev libncursesw5-dev libpython2.7-dev libssl-dev libusb-1.0-0-dev linux-base llvm lld lzma lz4 locales lzop ncurses-base ncurses-term nfs-kernel-server ntpdate p7zip p7zip-full parted patchutils pigz pixz pkg-config pv python3-dev python3-distutils qemu-user-static rename rsync swig subversion tar u-boot-tools udev unzip uuid-dev vim wget whiptail xz-utils xsltproc zip zlib1g-dev zstd distcc lib32ncurses-dev lib32stdc++6 libc6-i386 python2 python3 axel
7+
REQUIRED_PACKAGES: acl aptly aria2 bc binfmt-support bison btrfs-progs build-essential busybox ca-certificates ccache coreutils cpio cryptsetup crossbuild-essential-arm64 clang curl debian-archive-keyring debian-keyring debootstrap device-tree-compiler dialog dirmngr dosfstools dwarves f2fs-tools fakeroot flex gawk gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu gdisk git gpg gzip imagemagick jq kmod libbison-dev libc6-dev-armhf-cross libcrypto++-dev libelf-dev libfdt-dev libfile-fcntllock-perl parallel libfl-dev liblz4-tool libncurses-dev libncurses5 libncurses5-dev libncursesw5-dev libpython2.7-dev libssl-dev libusb-1.0-0-dev linux-base llvm lld lzma lz4 locales lzop ncurses-base ncurses-term nfs-kernel-server ntpdate p7zip p7zip-full parted patchutils pigz pixz pkg-config pv python3-dev python3-distutils qemu-user-static rename rsync swig subversion tar u-boot-tools udev unzip uuid-dev vim wget whiptail xz-utils xsltproc zip zlib1g-dev zstd distcc lib32ncurses-dev lib32stdc++6 libc6-i386 python2 python3 axel bsdtar
88
DOWNLOAD_URL: http://os.archlinuxarm.org/os/ArchLinuxARM-aarch64-latest.tar.gz
99
TZ: Asia/Jakarta
1010
WORKING_DIR: /tmp/BUILD_DIR
@@ -40,7 +40,7 @@ jobs:
4040
run: |
4141
sudo chmod +x $GITHUB_WORKSPACE/build.sh
4242
echo "BUILD_DATE=$(date +"%m%d")" >> $GITHUB_ENV
43-
sudo -i cp -a $GITHUB_WORKSPACE/src ${{ env.WORKING_DIR }}
43+
sudo -i cp -a $GITHUB_WORKSPACE/src ${{ env.WORKING_DIR }}/src
4444
sudo -i $GITHUB_WORKSPACE/build.sh
4545
echo "::set-output name=status::success"
4646

build.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ ROOT_LABEL="ROOT"
1212
IMG_SIZE="$((SKIP_SIZE + BOOT_SIZE + ROOT_SIZE))"
1313

1414
OUT_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"
1718
IMG_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

7981
make_image

0 commit comments

Comments
 (0)