From 94c11747711ceb7f0b95cd24f60b05f4438924d6 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Wed, 31 Jul 2024 17:40:40 +0200 Subject: [PATCH] tree: remove arc branches (s/x) Signed-off-by: AuxXxilium --- .github/workflows/autobuild.yml | 80 ++------------------- .github/workflows/build.yml | 96 ++++---------------------- files/initrd/opt/arc/arc-functions.sh | 22 +----- files/initrd/opt/arc/arc.sh | 1 - files/initrd/opt/arc/include/update.sh | 23 ++---- files/initrd/opt/arc/init.sh | 1 - img-gen.sh | 53 ++------------ 7 files changed, 28 insertions(+), 248 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d5852085..c6cd7964 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -64,10 +64,8 @@ jobs: getPatches "files/p3/patches" getTheme "files/p1/boot/grub" getOffline "files/p3/configs" - getBuildroot "latest" "brx" + getBuildroot "latest" "br" echo "BR_XVERSION=${TAG}" >> $GITHUB_ENV - getBuildroot "stable" "brs" - echo "BR_SVERSION=${TAG}" >> $GITHUB_ENV echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV echo "OK" @@ -98,11 +96,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" @@ -129,63 +127,6 @@ jobs: zip -9j update.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg" sha256sum update.zip >checksum.sha256 - # Build incremental - - name: Build Image S - run: | - . scripts/func.sh - - if [ -n "${VERSION}" ]; then - # Modify Source File - echo "s-${VERSION}" >VERSION - echo "s-${VERSION}" >files/p1/ARC-VERSION - sed 's/^ARC_VERSION=.*/ARC_VERSION="'s-${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh - fi - - echo "Create Arc Image" - IMAGE_FILE="arc-s.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" - 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 ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-s-dyn.vmdk - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc-s.vmdk - qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc-s.vhdx - - echo "Create Arc ova" - convertova "${IMAGE_FILE}" "arc-s.ova" - - # Zip update and generate checksum - zip -9j update-s.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg" - sha256sum update-s.zip >checksum-s.sha256 - # Zip image and generate checksum - name: Pack run: | @@ -196,12 +137,6 @@ jobs: zip -9 "arc-${{ env.VERSION }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk zip -9 "arc-${{ env.VERSION }}.vhdx.zip" arc.vhdx zip -9 "arc-${{ env.VERSION }}.ova.zip" arc.ova - # SBase - zip -9 "arc-s-${{ env.VERSION }}.img.zip" arc-s.img - zip -9 "arc-s-${{ env.VERSION }}.vmdk-dyn.zip" arc-s-dyn.vmdk - zip -9 "arc-s-${{ env.VERSION }}.vmdk-flat.zip" arc-s.vmdk arc-s-flat.vmdk - zip -9 "arc-s-${{ env.VERSION }}.vhdx.zip" arc-s.vhdx - zip -9 "arc-s-${{ env.VERSION }}.ova.zip" arc-s.ova fi echo "${{ inputs.update_version }}" >check.update @@ -220,9 +155,6 @@ jobs: Release: ${{ env.BUILD_TIME }} - Full Changelog and Arc Patch (Decryption Key) can be found in my Discord. - - Version: - - without "s": Latest Buildroot System (incl. Hyper-V and XEN (still in testing)) - - with "s": Stable Buildroot System (For the most Systems) ### Versions: Addons: ${{ env.ADDONSTAG }} @@ -231,11 +163,9 @@ jobs: Patches: ${{ env.PATCHESTAG }} Theme: ${{ env.THEMETAG }} LKM: ${{ env.LKMTAG }} - Buildroot: ${{ env.BR_XVERSION }} | Buildroot S: ${{ env.BR_SVERSION }} + Buildroot: ${{ env.BR_XVERSION }} artifacts: | arc-*.zip update.zip - update-s.zip checksum.sha256 - checksum-s.sha256 check.update \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cec1c852..a9bae43a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,6 +77,13 @@ jobs: VERSION="`date +'%y.%m.%d'`" fi + if [ -n "${VERSION}" ]; then + # Modify Source File + echo "${VERSION}" >VERSION + echo "${VERSION}" >files/p1/ARC-VERSION + sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh + fi + echo "Version: ${VERSION}" echo "VERSION=${VERSION}" >> $GITHUB_ENV @@ -98,10 +105,8 @@ jobs: getTheme "files/p1/boot/grub" echo "THEMETAG=${TAG}" >> $GITHUB_ENV getOffline "files/p3/configs" - getBuildroot "latest" "brx" - echo "BR_XVERSION=${TAG}" >> $GITHUB_ENV - getBuildroot "stable" "brs" - echo "BR_SVERSION=${TAG}" >> $GITHUB_ENV + getBuildroot "latest" "br" + echo "BR_VERSION=${TAG}" >> $GITHUB_ENV echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV echo "OK" @@ -111,13 +116,6 @@ jobs: run: | . scripts/func.sh - if [ -n "${VERSION}" ]; then - # Modify Source File - echo "${VERSION}" >VERSION - echo "${VERSION}" >files/p1/ARC-VERSION - sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh - fi - echo "Create Arc Image" IMAGE_FILE="arc.img" gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" @@ -132,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" @@ -163,63 +161,6 @@ jobs: zip -9j update.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg" sha256sum update.zip >checksum.sha256 - # Build incremental - - name: Build Image S - run: | - . scripts/func.sh - - if [ -n "${VERSION}" ]; then - # Modify Source File - echo "s-${VERSION}" >VERSION - echo "s-${VERSION}" >files/p1/ARC-VERSION - sed 's/^ARC_VERSION=.*/ARC_VERSION="'s-${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh - fi - - echo "Create Arc Image" - IMAGE_FILE="arc-s.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" - 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 ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-s-dyn.vmdk - qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc-s.vmdk - qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc-s.vhdx - - echo "Create Arc ova" - convertova "${IMAGE_FILE}" "arc-s.ova" - - # Zip update and generate checksum - zip -9j update-s.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg" - sha256sum update-s.zip >checksum-s.sha256 - # Zip image and generate checksum - name: Pack run: | @@ -230,12 +171,6 @@ jobs: zip -9 "arc-${{ env.VERSION }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk zip -9 "arc-${{ env.VERSION }}.vhdx.zip" arc.vhdx zip -9 "arc-${{ env.VERSION }}.ova.zip" arc.ova - # SBase - zip -9 "arc-s-${{ env.VERSION }}.img.zip" arc-s.img - zip -9 "arc-s-${{ env.VERSION }}.vmdk-dyn.zip" arc-s-dyn.vmdk - zip -9 "arc-s-${{ env.VERSION }}.vmdk-flat.zip" arc-s.vmdk arc-s-flat.vmdk - zip -9 "arc-s-${{ env.VERSION }}.vhdx.zip" arc-s.vhdx - zip -9 "arc-s-${{ env.VERSION }}.ova.zip" arc-s.ova fi echo "${{ inputs.update_version }}" >check.update @@ -254,9 +189,6 @@ jobs: Release: ${{ env.BUILD_TIME }} - Full Changelog and Arc Patch (Decryption Key) can be found in my Discord. - - Version: - - without "s": Latest Buildroot System (incl. Hyper-V and XEN (still in testing)) - - with "s": Stable Buildroot System (For the most Systems) ### Versions: Addons: ${{ env.ADDONSTAG }} @@ -265,11 +197,9 @@ jobs: Patches: ${{ env.PATCHESTAG }} Theme: ${{ env.THEMETAG }} LKM: ${{ env.LKMTAG }} - Buildroot: ${{ env.BR_XVERSION }} | Buildroot S: ${{ env.BR_SVERSION }} + Buildroot: ${{ env.BR_XVERSION }} artifacts: | arc-*.zip update.zip - update-s.zip checksum.sha256 - checksum-s.sha256 check.update diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index b2ec2fe4..8e7bca27 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -831,7 +831,6 @@ function updateMenu() { 6 "Update LKMs" \ 7 "Update Modules" \ 8 "Update Patches" \ - 9 "Switch Buildroot" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && break case "$(cat ${TMP_PATH}/resp)" in @@ -1007,24 +1006,6 @@ function updateMenu() { writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" ;; - 9) - # Ask for Arc Branch - dialog --clear --backtitle "$(backtitle)" --title "Switch Buildroot" \ - --menu "Which Branch?" 0 0 0 \ - 1 "x - latest" \ - 2 "s - stable" \ - 2>"${TMP_PATH}/opts" - opts=$(cat ${TMP_PATH}/opts) - [ -z "${opts}" ] && return 1 - if [ ${opts} -eq 1 ]; then - writeConfigKey "arc.branch" "" "${USER_CONFIG_FILE}" - elif [ ${opts} -eq 2 ]; then - writeConfigKey "arc.branch" "s" "${USER_CONFIG_FILE}" - fi - ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" - dialog --backtitle "$(backtitle)" --title "Switch Buildroot" --aspect 18 \ - --msgbox "Updates are using ${ARCBRANCH} Branch!" 0 0 - ;; esac done return @@ -1066,7 +1047,6 @@ function sysinfo() { VENDOR=$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i') ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" ETHN="$(echo ${ETHX} | wc -w)" - ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" if [ "${CONFDONE}" == "true" ]; then @@ -1163,7 +1143,7 @@ function sysinfo() { TEXT+="\n\Zb$(lspci -s ${NETBUS} -nnk | awk '{$1=""}1' | awk '{$1=$1};1')\Zn\n" done # Print Config Informations - TEXT+="\n\Z4> Arc: ${ARC_VERSION} | Branch: ${ARCBRANCH:-x}\Zn" + TEXT+="\n\Z4> Arc: ${ARC_VERSION}\Zn" TEXT+="\n Subversion: \ZbAddons ${ADDONSVERSION} | Configs ${CONFIGSVERSION} | LKM ${LKMVERSION} | Modules ${MODULESVERSION} | Patches ${PATCHESVERSION}\Zn" TEXT+="\n Config | Build: \Zb${CONFDONE} | ${BUILDDONE}\Zn" TEXT+="\n Config Version: \Zb${CONFIGVER}\Zn" diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 4d7609fd..dd943ff4 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -57,7 +57,6 @@ RAIDCONTROLLER="$(readConfigKey "device.raidcontroller" "${USER_CONFIG_FILE}")" SASCONTROLLER="$(readConfigKey "device.sascontroller" "${USER_CONFIG_FILE}")" # Get Config/Build Status -ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" diff --git a/files/initrd/opt/arc/include/update.sh b/files/initrd/opt/arc/include/update.sh index 1663fd65..d9fa4430 100755 --- a/files/initrd/opt/arc/include/update.sh +++ b/files/initrd/opt/arc/include/update.sh @@ -7,7 +7,6 @@ function upgradeLoader () { local ARCNIC="$(readConfigKey "arc.nic" "${USER_CONFIG_FILE}")" local AUTOMATED="$(readConfigKey "automated" "${USER_CONFIG_FILE}")" - local ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" if [ -z "${1}" ]; then # Check for new Version idx=0 @@ -44,11 +43,7 @@ function upgradeLoader () { ( # Download update file echo "Downloading ${TAG}" - if [ -n "${ARCBRANCH}" ]; then - local URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/arc-${ARCBRANCH}-${TAG}.img.zip" - else - local URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/arc-${TAG}.img.zip" - fi + local URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/arc-${TAG}.img.zip" if [ "${ARCNIC}" == "auto" ]; then curl -#kL "${URL}" -o "${TMP_PATH}/arc.img.zip" 2>&1 | while IFS= read -r -n1 char; do [[ $char =~ [0-9] ]] && keep=1 ; @@ -74,11 +69,7 @@ function upgradeLoader () { echo "Installing new Loader Image..." # Process complete update umount "${PART1_PATH}" "${PART2_PATH}" "${PART3_PATH}" - if [ -n "${ARCBRANCH}" ]; then - dd if="${TMP_PATH}/arc-${ARCBRANCH}.img" of=$(blkid | grep 'LABEL="ARC3"' | cut -d3 -f1) bs=1M conv=fsync - else - dd if="${TMP_PATH}/arc.img" of=$(blkid | grep 'LABEL="ARC3"' | cut -d3 -f1) bs=1M conv=fsync - fi + dd if="${TMP_PATH}/arc.img" of=$(blkid | grep 'LABEL="ARC3"' | cut -d3 -f1) bs=1M conv=fsync # Ask for Boot rm -f "${TMP_PATH}/arc.img" >/dev/null echo "Upgrade done! -> Rebooting..." @@ -94,7 +85,6 @@ function upgradeLoader () { function updateLoader() { local ARCNIC="$(readConfigKey "arc.nic" "${USER_CONFIG_FILE}")" local AUTOMATED="$(readConfigKey "automated" "${USER_CONFIG_FILE}")" - local ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" if [ -z "${1}" ]; then # Check for new Version idx=0 @@ -136,13 +126,8 @@ function updateLoader() { ( # Download update file echo "Downloading ${TAG}" - if [ -n "${ARCBRANCH}" ]; then - local URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${ARCBRANCH}.zip" - local SHA="https://github.com/AuxXxilium/arc/releases/download/${TAG}/checksum-${ARCBRANCH}.sha256" - else - local URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update.zip" - local SHA="https://github.com/AuxXxilium/arc/releases/download/${TAG}/checksum.sha256" - fi + local URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update.zip" + local SHA="https://github.com/AuxXxilium/arc/releases/download/${TAG}/checksum.sha256" if [ "${ARCNIC}" == "auto" ]; then curl -#kL "${URL}" -o "${TMP_PATH}/update.zip" 2>&1 | while IFS= read -r -n1 char; do [[ $char =~ [0-9] ]] && keep=1 ; diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index e6b71815..fee9754e 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -83,7 +83,6 @@ if grep -q "automated_arc" /proc/cmdline; then else writeConfigKey "automated" "false" "${USER_CONFIG_FILE}" fi -[ $(echo "${ARC_VERSION}" | grep -q "s" | wc -l) -gt 0 ] && writeConfigKey "arc.branch" "s" "${USER_CONFIG_FILE}" || writeConfigKey "arc.branch" "" "${USER_CONFIG_FILE}" [ -f "${PART3_PATH}/automated" ] && rm -f "${PART3_PATH}/automated" >/dev/null # Check for compatibility compatboot diff --git a/img-gen.sh b/img-gen.sh index 2fe3252a..6b7dd6e7 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -15,8 +15,7 @@ getConfigs "files/p3/configs" getPatches "files/p3/patches" getTheme "files/p1/boot/grub" getOffline "files/p3/configs" -getBuildroot "latest" "brx" -getBuildroot "stable" "brs" +getBuildroot "latest" "br" # Xbase IMAGE_FILE="arc.img" @@ -34,7 +33,7 @@ mkdir -p "/tmp/p3" 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 VERSION=$(date +'%y.%-m.dev') echo "${VERSION}" >files/p1/ARC-VERSION @@ -42,8 +41,8 @@ echo "${VERSION}" >VERSION sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh 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" @@ -62,46 +61,4 @@ qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx -# Sbase -IMAGE_FILE="arc-s.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" -sudo rm -rf "/tmp/p1" -sudo rm -rf "/tmp/p3" -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 - -VERSION=$(date +'%y.%-m.dev') -echo "${VERSION}-s" >files/p1/ARC-VERSION -echo "${VERSION}-s" >VERSION -sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}-s'"/' -i files/initrd/opt/arc/include/consts.sh - -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" -sync - -echo "Unmount image file" -sudo umount "/tmp/p1" -sudo umount "/tmp/p3" -rmdir "/tmp/p1" -rmdir "/tmp/p3" - -sudo losetup --detach ${LOOPX} - -qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-s-dyn.vmdk -qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc-s.vmdk -qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc-s.vhdx \ No newline at end of file +exit 0 \ No newline at end of file