build: update local build files

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

README.md

@@ -17,7 +17,6 @@ The Arc Loader is a customized Redpill Loader for DSM 7.x (Xpenology) with enhan
 - <a href="https://github.com/AuxXxilium">Overview</a>
 - <a href="https://auxxxilium.tech/wiki">FAQ & Wiki</a>
 - <a href="https://github.com/AuxXxilium/arc/releases?q=prerelease%3Afalse&expanded=true">Download latest Build</a>
-- <a href="https://auxxxilium.github.io/arc">Customized Build with automated Config</a>
 
 ### Developer
 

Taskfile.yaml

@@ -3,23 +3,18 @@
 version: "3"
 
 tasks:
-  build-img:
+  build-img-n:
     cmds:
       - git pull
-      - ./img-gen.sh
+      - ./img-gen-n.sh
 
-  build-img-next:
+  build-img-s:
     cmds:
       - git pull
-      - ./img-gen-next.sh
+      - ./img-gen-s.sh
-
-  build-img-all:
-    cmds:
-      - git pull
-      - ./img-gen-all.sh
 
   compile-kpatch:
     dir: kpatch
     cmds:
       - make clean all
-      - mv kpatch ../files/board/arc/overlayfs/opt/arc/
+      - mv kpatch ../files/p3/system/

img-gen-all.sh

@@ -1,110 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Clean cached Files
-sudo git clean -fdx
-
-. scripts/func.sh
-
-# Get extractor, LKM, addons and Modules
-getLKMs "files/p3/lkms"
-getAddons "files/p3/addons"
-getModules "files/p3/modules"
-getConfigs "files/p3/configs"
-getPatches "files/p3/patches"
-getCustom "files/p3/custom"
-getTheme "files/p1/boot/grub"
-getOffline "files/p3/offline"
-getBuildroots "latest" "brs"
-getBuildrootx "latest" "brx"
-
-# Sbase
-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"
-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}" >files/p1/ARC-VERSION
-echo "${VERSION}" >VERSION
-echo "stable" >files/p1/ARC-BRANCH
-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"
-
-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-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
-
-# Xbase
-IMAGE_FILE="arc-next.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 "brx/bzImage-arc" || ! -f "brx/initrd-arc" ]] && return 1
-
-VERSION=$(date +'%y.%m.dev')
-echo "${VERSION}" >files/p1/ARC-VERSION
-echo "${VERSION}" >VERSION
-echo "next" >files/p1/ARC-BRANCH
-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"
-
-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-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

img-gen-n.sh

@@ -8,18 +8,19 @@ sudo git clean -fdx
 . scripts/func.sh
 
 # Get extractor, LKM, addons and Modules
-getLKMs "files/p3/lkms"
+echo "Get Dependencies"
 getAddons "files/p3/addons"
 getModules "files/p3/modules"
 getConfigs "files/p3/configs"
 getPatches "files/p3/patches"
 getCustom "files/p3/custom"
+getLKMs "files/p3/lkms"
 getTheme "files/p1/boot/grub"
-getOffline "files/p3/offline"
+getOffline "files/p3/configs"
-getBuildrootx "latest" "brx"
+getBuildrootx "brx"
 
-# Xbase
+# Sbase
-IMAGE_FILE="arc-next.img"
+IMAGE_FILE="arc.img"
 gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
@@ -39,11 +40,11 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 VERSION=$(date +'%y.%m.dev')
 echo "${VERSION}" >files/p1/ARC-VERSION
 echo "${VERSION}" >VERSION
-echo "next" >files/p1/ARC-BRANCH
+echo "dev" >files/p1/ARC-BRANCH
-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"
+cp -f "brx/initrd-arc" "files/p3/initrd-arc"
 repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 
 echo "Copying files"
@@ -59,6 +60,4 @@ rmdir "/tmp/p3"
 
 sudo losetup --detach ${LOOPX}
 
-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.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

img-gen-s.sh

@@ -8,15 +8,16 @@ sudo git clean -fdx
 . scripts/func.sh
 
 # Get extractor, LKM, addons and Modules
-getLKMs "files/p3/lkms"
+echo "Get Dependencies"
 getAddons "files/p3/addons"
 getModules "files/p3/modules"
 getConfigs "files/p3/configs"
 getPatches "files/p3/patches"
 getCustom "files/p3/custom"
+getLKMs "files/p3/lkms"
 getTheme "files/p1/boot/grub"
-getOffline "files/p3/offline"
+getOffline "files/p3/configs"
-getBuildroots "latest" "brs"
+getBuildroots "brs"
 
 # Sbase
 IMAGE_FILE="arc.img"
@@ -39,11 +40,11 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 VERSION=$(date +'%y.%m.dev')
 echo "${VERSION}" >files/p1/ARC-VERSION
 echo "${VERSION}" >VERSION
-echo "stable" >files/p1/ARC-BRANCH
+echo "dev" >files/p1/ARC-BRANCH
-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"
+cp -f "brs/initrd-arc" "files/p3/initrd-arc"
 repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 
 echo "Copying files"
@@ -59,6 +60,4 @@ 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