From 9b2f7b6f8924c9421eb108f882d79a470384ccaa Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Tue, 21 Jan 2025 20:06:29 +0100 Subject: [PATCH] tree: merge all to one Signed-off-by: AuxXxilium --- .github/workflows/build.yml | 206 +------------------------- Taskfile.yaml | 16 +- files/initrd/opt/arc/arc-functions.sh | 12 +- files/p1/ARC-VERSION | 1 - img-gen.sh | 4 +- scripts/func.sh | 26 +--- 6 files changed, 18 insertions(+), 247 deletions(-) delete mode 100644 files/p1/ARC-VERSION diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab9908de..9a87bdc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,18 +32,6 @@ on: description: "pre release" default: false type: boolean - minimal: - description: "minimal" - default: true - type: boolean - microcode: - description: "microcode" - default: false - type: boolean - extended: - description: "extended" - default: false - type: boolean clean: description: "clean" default: false @@ -98,15 +86,7 @@ jobs: getOffline "files/p3/configs" getLKMs "files/p3/lkms" getTheme "files/p1/boot/grub" - if [ "${{ inputs.extended }}" = "true" ]; then - getBuildroot "ext" "brx" - fi - if [ "${{ inputs.minimal }}" = "true" ]; then - getBuildroot "min" "brs" - fi - if [ "${{ inputs.microcode }}" = "true" ]; then - getBuildroot "micro" "brm" - fi + getBuildroot "evo" "br" # Export Dependencies Version to env echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV @@ -116,23 +96,20 @@ jobs: echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV - echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV - echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV - echo "BRMTAG=${BRMTAG}" >> $GITHUB_ENV + echo "BRTAG=${BRTAG}" >> $GITHUB_ENV echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV echo "OK" # Build incremental - - name: Build extended Image - if: ${{ inputs.extended }} + - name: Build evo Image run: | . scripts/func.sh # Modify Source File ARC_BUILD="$(date +'%y%m%d')" ARC_VERSION="${{ inputs.version }}" - ARC_BRANCH="extended" + ARC_BRANCH="evo" echo "${ARC_BUILD}" > "files/p1/ARC-BUILD" echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV echo "${ARC_VERSION}" > "files/p1/ARC-VERSION" @@ -153,11 +130,11 @@ jobs: sudo mount ${LOOPX}p1 "/tmp/p1" sudo mount ${LOOPX}p3 "/tmp/p3" - [ ! -f "brx/bzImage-arc" ] || [ ! -f "brx/initrd-arc" ] && return 1 + [ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1 echo "Repack initrd" - cp -f "brx/bzImage-arc" "files/p3/bzImage-arc" - repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" + cp -f "br/bzImage-arc" "files/p3/bzImage-arc" + repackInitrd "br/initrd-arc" "files/initrd" "files/p3/initrd-arc" echo "Copying files" sudo cp -rf "files/p1/"* "/tmp/p1" @@ -197,166 +174,6 @@ jobs: sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash" fi - # Cleanup - - name: Cleanup - if: ${{ inputs.extended }} - run: | - rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc" 2>/dev/null - - # Build incremental - - name: Build minimal Image - if: ${{ inputs.minimal }} - run: | - . scripts/func.sh - - # Modify Source File - ARC_BUILD="$(date +'%y%m%d')" - ARC_VERSION="${{ inputs.version }}" - ARC_BRANCH="minimal" - echo "${ARC_BUILD}" > "files/p1/ARC-BUILD" - echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV - echo "${ARC_VERSION}" > "files/p1/ARC-VERSION" - echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV - echo "${ARC_BRANCH}" > "files/p1/ARC-BRANCH" - - echo "Create Arc Image" - IMAGE_FILE="arc.img" - gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" - fdisk -l "${IMAGE_FILE}" - - LOOPX=$(sudo losetup -f) - sudo losetup -P "${LOOPX}" "${IMAGE_FILE}" - - echo "Mounting Image File" - mkdir -p "/tmp/p1" - mkdir -p "/tmp/p3" - sudo mount ${LOOPX}p1 "/tmp/p1" - sudo mount ${LOOPX}p3 "/tmp/p3" - - [ ! -f "brs/bzImage-arc" ] || [ ! -f "brs/initrd-arc" ] && return 1 - - echo "Repack initrd" - cp -f "brs/bzImage-arc" "files/p3/bzImage-arc" - repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc" - - echo "Copying files" - sudo cp -rf "files/p1/"* "/tmp/p1" - sudo cp -rf "files/p3/"* "/tmp/p3" - sudo sync - - echo "Unmount image file" - sudo umount "/tmp/p1" - sudo umount "/tmp/p3" - rmdir "/tmp/p1" - rmdir "/tmp/p3" - - sudo losetup --detach ${LOOPX} - - echo "Image Converter" - qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk - qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk - - echo "Create Arc vhd" - createvmc "arc.vmc" - qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd - - echo "Create Arc ova" - convertova "${IMAGE_FILE}" "arc.ova" - - # Zip image and generate checksum - - name: Pack minimal Image - if: ${{ inputs.minimal }} - run: | - if [ -n "${{ env.ARC_VERSION }}" ]; then - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhd.zip" arc.vhd arc.vmc - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.ova.zip" arc.ova - (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3) - sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash" - fi - - # Cleanup - - name: Cleanup - if: ${{ inputs.minimal }} - run: | - rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc" 2>/dev/null - - # Build incremental - - name: Build microcode Image - if: ${{ inputs.microcode }} - run: | - . scripts/func.sh - - # Modify Source File - ARC_BUILD="$(date +'%y%m%d')" - ARC_VERSION="${{ inputs.version }}" - ARC_BRANCH="microcode" - echo "${ARC_BUILD}" > "files/p1/ARC-BUILD" - echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV - echo "${ARC_VERSION}" > "files/p1/ARC-VERSION" - echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV - echo "${ARC_BRANCH}" > "files/p1/ARC-BRANCH" - - echo "Create Arc Image" - IMAGE_FILE="arc.img" - gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" - fdisk -l "${IMAGE_FILE}" - - LOOPX=$(sudo losetup -f) - sudo losetup -P "${LOOPX}" "${IMAGE_FILE}" - - echo "Mounting Image File" - mkdir -p "/tmp/p1" - mkdir -p "/tmp/p3" - sudo mount ${LOOPX}p1 "/tmp/p1" - sudo mount ${LOOPX}p3 "/tmp/p3" - - [ ! -f "brm/bzImage-arc" ] || [ ! -f "brm/initrd-arc" ] && return 1 - - echo "Repack initrd" - cp -f "brm/bzImage-arc" "files/p3/bzImage-arc" - repackInitrd "brm/initrd-arc" "files/initrd" "files/p3/initrd-arc" - - echo "Copying files" - sudo cp -rf "files/p1/"* "/tmp/p1" - sudo cp -rf "files/p3/"* "/tmp/p3" - sudo sync - - echo "Unmount image file" - sudo umount "/tmp/p1" - sudo umount "/tmp/p3" - rmdir "/tmp/p1" - rmdir "/tmp/p3" - - sudo losetup --detach ${LOOPX} - - echo "Image Converter" - qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk - qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk - - echo "Create Arc vhd" - createvmc "arc.vmc" - qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd - - echo "Create Arc ova" - convertova "${IMAGE_FILE}" "arc.ova" - - # Zip image and generate checksum - - name: Pack minimal Image - if: ${{ inputs.minimal }} - run: | - if [ -n "${{ env.ARC_VERSION }}" ]; then - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhd.zip" arc.vhd arc.vmc - zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.ova.zip" arc.ova - (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3) - sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash" - fi - # Publish a release if is a tag - name: Release if: success() && env.ARC_VERSION != '' @@ -375,11 +192,6 @@ jobs: - Changelog is available in my Discord - Based on VisionZ Evolution Code Base - ### Versions: - ${{ inputs.minimal && '- minimal: full image, all dependencies included (reduced size, faster boot)' || '' }} - ${{ inputs.microcode && '- microcode: minimal + additional microcode updates' || '' }} - ${{ inputs.extended && '- extended: full image, all dependencies included (new features to test)' || '' }} - ### Dependencies: - Addons: ${{ env.ADDONTAG }} - Modules: ${{ env.MODULETAG }} @@ -387,9 +199,7 @@ jobs: - Patches: ${{ env.PATCHTAG }} - Custom: ${{ env.CUSTOMTAG }} - LKMs: ${{ env.LKMTAG }} - ${{ inputs.minimal && format('- Buildroot minimal: {0}-evo', env.BRSTAG) || '' }} - ${{ inputs.microcode && format('- Buildroot microcode: {0}-evo', env.BRMTAG) || '' }} - ${{ inputs.extended && format('- Buildroot extended: {0}-evo', env.BRXTAG) || '' }} + - Basesystem: ${{ env.BRTAG }} ### Release - ${{ env.BUILD_TIME }} diff --git a/Taskfile.yaml b/Taskfile.yaml index 2c00c9a3..2129df05 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -3,23 +3,11 @@ version: "3" tasks: - build-ext: + build-evo: cmds: - git reset --hard - git pull - - ./img-gen.sh ext - - build-min: - cmds: - - git reset --hard - - git pull - - ./img-gen.sh min - - build-micro: - cmds: - - git reset --hard - - git pull - - ./img-gen.sh micro + - ./img-gen.sh evo compile-kpatch: dir: kpatch diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index fdeb6910..03d47cf4 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -890,20 +890,14 @@ function updateMenu() { 4) dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \ --menu "Choose a Branch" 0 0 0 \ - 1 "minimal - reduced size and faster boot" \ - 2 "microcode - minimal with microcode" \ - 3 "extended - new features to test" \ - 4 "dev - Development only" \ + 1 "evolution - Stable System" \ + 3 "dev - Development System" \ 2>"${TMP_PATH}/opts" [ $? -ne 0 ] && break opts=$(cat ${TMP_PATH}/opts) if [ ${opts} -eq 1 ]; then - ARC_BRANCH="minimal" + ARC_BRANCH="stable" elif [ ${opts} -eq 2 ]; then - ARC_BRANCH="microcode" - elif [ ${opts} -eq 3 ]; then - ARC_BRANCH="extended" - elif [ ${opts} -eq 4 ]; then ARC_BRANCH="dev" fi writeConfigKey "arc.branch" "${ARC_BRANCH}" "${USER_CONFIG_FILE}" diff --git a/files/p1/ARC-VERSION b/files/p1/ARC-VERSION deleted file mode 100644 index 9b241d7f..00000000 --- a/files/p1/ARC-VERSION +++ /dev/null @@ -1 +0,0 @@ -23.1.1 diff --git a/img-gen.sh b/img-gen.sh index 73615b8e..c98ae638 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -28,9 +28,7 @@ getLKMs "files/p3/lkms" getTheme "files/p1/boot/grub" getOffline "files/p3/configs" case "${1}" in - min) getBuildroot "${1}" "br" ;; - ext) getBuildroot "${1}" "br" ;; - micro) getBuildroot "${1}" "br" ;; + evo) getBuildroot "${1}" "br" ;; *) echo "Invalid option specified" ;; esac diff --git a/scripts/func.sh b/scripts/func.sh index 7d0b809b..68e4e54e 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -194,36 +194,18 @@ function getBuildroot() { local REPO="" local ZIP_NAME="" local TAG_VAR="" - - case "${TYPE}" in - min) - REPO="arc-buildroot-s" - TAG_VAR="BRSTAG" - ;; - ext) - REPO="arc-buildroot-x" - TAG_VAR="BRXTAG" - ;; - micro) - REPO="arc-buildroot-m" - TAG_VAR="BRMTAG" - ;; - *) - echo "Invalid type specified" - return 1 - ;; - esac + local REPO="arc-buildroot-${TYPE}" echo "Getting Buildroot-${TYPE} begin" TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/${REPO}/releases" | jq -r ".[].tag_name" | sort -rV | head -1) - export ${TAG_VAR}="${TAG}" + export BRTAG="${TAG}-${TYPE}" [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}" rm -f "${DEST_PATH}/bzImage-arc" rm -f "${DEST_PATH}/initrd-arc" while read -r ID NAME; do - if [ "${NAME}" = "buildroot-${TAG:0:9}.zip" ]; then + if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/${REPO}/releases/assets/${ID}" -o "${DEST_PATH}/br.zip" - echo "Buildroot-${TYPE}: ${TAG}" + echo "Buildroot: ${TAG}-${TYPE}" unzip -o "${DEST_PATH}/br.zip" -d "${DEST_PATH}" mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc" mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"