From 0fecccf852281cbdd1b4ae39a559215e7daafaed Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Tue, 6 Aug 2024 23:37:35 +0200 Subject: [PATCH] build: fix local Signed-off-by: AuxXxilium --- img-gen-x.sh | 8 ++++---- img-gen.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/img-gen-x.sh b/img-gen-x.sh index a47bc466..187ecd8d 100755 --- a/img-gen-x.sh +++ b/img-gen-x.sh @@ -19,7 +19,7 @@ getOffline "files/p3/configs" getBuildrootx "latest" "brx" # Xbase -IMAGE_FILE="arc.img" +IMAGE_FILE="arc-next.img" gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" @@ -58,6 +58,6 @@ rmdir "/tmp/p3" sudo losetup --detach ${LOOPX} -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 \ No newline at end of file +qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-next-dyn.vmdk +qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc-next.vmdk +qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc-next.vhdx \ No newline at end of file diff --git a/img-gen.sh b/img-gen.sh index c59dd06e..f74bb640 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -19,7 +19,7 @@ getOffline "files/p3/configs" getBuildroots "latest" "brs" # Sbase -IMAGE_FILE="arc-s.img" +IMAGE_FILE="arc.img" gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" @@ -37,9 +37,9 @@ 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 "${VERSION}" >files/p1/ARC-VERSION +echo "${VERSION}" >VERSION +sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh echo "Repack initrd" cp -f "brs/bzImage-arc" "files/p3/bzImage-arc" @@ -58,6 +58,6 @@ 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 +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 \ No newline at end of file