From 9e688e76ce364b24fe0991e96a363e417a331f4c Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 3 Jan 2025 16:51:39 +0100 Subject: [PATCH] build: modify arc Signed-off-by: AuxXxilium --- .github/workflows/build.yml | 4 +--- img-ext.sh | 7 ++++++- img-min.sh | 7 ++++++- scripts/func.sh | 13 ++----------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f4c338c..25eaff12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2024 AuxXxilium +# Copyright (C) 2025 AuxXxilium # # This is free software, licensed under the MIT License. # See /LICENSE for more information. @@ -146,7 +146,6 @@ jobs: echo "Repack initrd" cp -f "brx/bzImage-arc" "files/p3/bzImage-arc" - createArc repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" @@ -232,7 +231,6 @@ jobs: echo "Repack initrd" cp -f "brs/bzImage-arc" "files/p3/bzImage-arc" - createArc repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" diff --git a/img-ext.sh b/img-ext.sh index e6f6a0d9..b4bd9833 100755 --- a/img-ext.sh +++ b/img-ext.sh @@ -1,4 +1,10 @@ #!/usr/bin/env bash +# +# Copyright (C) 2025 AuxXxilium +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# set -e @@ -50,7 +56,6 @@ echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH echo "Repack initrd" if [ -f "brx/bzImage-arc" ] && [ -f "brx/initrd-arc" ]; then cp -f "brx/bzImage-arc" "files/p3/bzImage-arc" - createArc repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" else exit 1 diff --git a/img-min.sh b/img-min.sh index 493f6a69..71064b13 100755 --- a/img-min.sh +++ b/img-min.sh @@ -1,4 +1,10 @@ #!/usr/bin/env bash +# +# Copyright (C) 2025 AuxXxilium +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# set -e @@ -49,7 +55,6 @@ echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH echo "Repack initrd" if [ -f "brs/bzImage-arc" ] && [ -f "brs/initrd-arc" ]; then cp -f "brs/bzImage-arc" "files/p3/bzImage-arc" - createArc repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc" else exit 1 diff --git a/scripts/func.sh b/scripts/func.sh index aca9ad05..6af1616e 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Copyright (C) 2024 AuxXxilium -# +# Copyright (C) 2025 AuxXxilium +# # This is free software, licensed under the MIT License. # See /LICENSE for more information. # @@ -499,13 +499,4 @@ function copyBuildroot() { mkdir -p "${DEST_PATH}" cp -f "../${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc" cp -f "../${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc" -} - -# create arc executable -function createArc() { - [ ! -f "arc" ] && ./scripts/make/makeself.sh --current --zstd "files/initrd/opt/arc" arc "Arc Loader" "./init.sh" || true - rm -rf "files/initrd/opt/arc" - mkdir -p "files/initrd/opt/arc" - cp -f "arc" "files/initrd/opt/arc/" - cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz" } \ No newline at end of file