From 5d356731847b5e335a4b9832b2d2fb1a1f033ceb Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Tue, 6 Aug 2024 22:58:23 +0200
Subject: [PATCH] build: update

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 Taskfile.yaml                |  4 ++--
 img-gen-s.sh => img-gen-x.sh | 24 ++++++++++++------------
 img-gen.sh                   | 24 ++++++++++++------------
 3 files changed, 26 insertions(+), 26 deletions(-)
 rename img-gen-s.sh => img-gen-x.sh (67%)

diff --git a/Taskfile.yaml b/Taskfile.yaml
index 98be0e3b..62f0ce17 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -8,10 +8,10 @@ tasks:
       - git pull
       - ./img-gen.sh
 
-  build-img-s:
+  build-img-x:
     cmds:
       - git pull
-      - ./img-gen-s.sh
+      - ./img-gen-x.sh
 
   compile-kpatch:
     dir: kpatch
diff --git a/img-gen-s.sh b/img-gen-x.sh
similarity index 67%
rename from img-gen-s.sh
rename to img-gen-x.sh
index c59dd06e..a47bc466 100755
--- a/img-gen-s.sh
+++ b/img-gen-x.sh
@@ -16,10 +16,10 @@ getPatches "files/p3/patches"
 getCustom "files/p3/custom"
 getTheme "files/p1/boot/grub"
 getOffline "files/p3/configs"
-getBuildroots "latest" "brs"
+getBuildrootx "latest" "brx"
 
-# Sbase
-IMAGE_FILE="arc-s.img"
+# Xbase
+IMAGE_FILE="arc.img"
 gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
@@ -34,16 +34,16 @@ 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
+[[ ! -f "brx/bzImage-arc" || ! -f "brx/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"
-repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
+repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 
 echo "Copying files"
 sudo cp -Rf "files/p1/"* "/tmp/p1"
@@ -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
diff --git a/img-gen.sh b/img-gen.sh
index a47bc466..c59dd06e 100755
--- a/img-gen.sh
+++ b/img-gen.sh
@@ -16,10 +16,10 @@ getPatches "files/p3/patches"
 getCustom "files/p3/custom"
 getTheme "files/p1/boot/grub"
 getOffline "files/p3/configs"
-getBuildrootx "latest" "brx"
+getBuildroots "latest" "brs"
 
-# Xbase
-IMAGE_FILE="arc.img"
+# Sbase
+IMAGE_FILE="arc-s.img"
 gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
@@ -34,16 +34,16 @@ 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 "brs/bzImage-arc" || ! -f "brs/initrd-arc" ]] && return 1
 
 VERSION=$(date +'%y.%-m.dev')
-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 "${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 "brx/bzImage-arc" "files/p3/bzImage-arc"
-repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+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"
@@ -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-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