diff --git a/.gitignore b/.gitignore index 56593d5e..1d209c85 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,8 @@ rr*.img rr*.vmdk *.zip -.buildroot -test*.sh -cache *.bak *.o **.mo tests -/extractor Changelog* \ No newline at end of file diff --git a/Taskfile.yaml b/Taskfile.yaml deleted file mode 100644 index 0731b94a..00000000 --- a/Taskfile.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# https://taskfile.dev - -version: "3" - -tasks: - build-img: - cmds: - - ./img-gen.sh - - build-docker-img: - dir: docker - cmds: - - ./build.sh - - compile-kpatch: - dir: kpatch - cmds: - - make clean all - - mv kpatch ../files/initrd/opt/rr/ diff --git a/files/grub.img.gz b/files/grub.img.gz deleted file mode 100644 index 6b614ead..00000000 Binary files a/files/grub.img.gz and /dev/null differ diff --git a/files/p1/EFI/BOOT/SynoBootLoader.conf b/files/mnt/p1/EFI/BOOT/SynoBootLoader.conf similarity index 100% rename from files/p1/EFI/BOOT/SynoBootLoader.conf rename to files/mnt/p1/EFI/BOOT/SynoBootLoader.conf diff --git a/files/p1/EFI/BOOT/SynoBootLoader.efi b/files/mnt/p1/EFI/BOOT/SynoBootLoader.efi similarity index 100% rename from files/p1/EFI/BOOT/SynoBootLoader.efi rename to files/mnt/p1/EFI/BOOT/SynoBootLoader.efi diff --git a/files/p1/RR_VERSION b/files/mnt/p1/RR_VERSION similarity index 100% rename from files/p1/RR_VERSION rename to files/mnt/p1/RR_VERSION diff --git a/files/p1/boot/grub/grub.cfg b/files/mnt/p1/boot/grub/grub.cfg similarity index 100% rename from files/p1/boot/grub/grub.cfg rename to files/mnt/p1/boot/grub/grub.cfg diff --git a/files/p1/.locale b/files/p1/.locale deleted file mode 100644 index 04bd3500..00000000 --- a/files/p1/.locale +++ /dev/null @@ -1 +0,0 @@ -zh_CN.UTF-8 \ No newline at end of file diff --git a/files/p3/addons/.gitkeep b/files/p3/addons/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/files/p3/cks/.gitkeep b/files/p3/cks/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/files/p3/extractor/.gitkeep b/files/p3/extractor/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/files/p3/lkms/.gitkeep b/files/p3/lkms/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/files/p3/modules/.gitkeep b/files/p3/modules/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/img-gen.sh b/img-gen.sh deleted file mode 100755 index 920a2152..00000000 --- a/img-gen.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env bash - -set -e - -. scripts/func.sh - -# Convert po2mo -convertpo2mo "files/initrd/opt/rr/lang" - -IMAGE_FILE="rr.img" -gzip -dc "files/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/files/p1" -sudo rm -rf "/tmp/files/p3" -sudo mkdir -p "/tmp/files/p1" -sudo mkdir -p "/tmp/files/p3" -sudo mount ${LOOPX}p1 "/tmp/files/p1" -sudo mount ${LOOPX}p3 "/tmp/files/p3" - -echo "Get Buildroot" -[ ! -f "/tmp/files/p3/bzImage-rr" -o ! -f "/tmp/files/p3/initrd-rr" ] && getBuildroot "/tmp/files/p3" true -[ ! -f "/tmp/files/p3/bzImage-rr" -o ! -f "/tmp/files/p3/initrd-rr" ] && return 1 - -read -p "Press enter to continue" - -echo "Repack initrd" -repackInitrd "/tmp/files/p3/initrd-rr" "files/initrd" - -echo "Copying files" -sudo cp -Rf "files/p1/"* "/tmp/files/p1" -sudo cp -Rf "files/p3/"* "/tmp/files/p3" -# Get extractor, LKM, addons and Modules -getCKs "/tmp/files/p3/cks" true -getLKMs "/tmp/files/p3/lkms" true -getAddons "/tmp/files/p3/addons" true -getModules "/tmp/files/p3/modules" true -getExtractor "/tmp/files/p3/extractor" - -sync - -# update.zip -sha256sum update-list.yml update-check.sh >sha256sum -zip -9j update.zip update-list.yml update-check.sh -while read F; do - if [ -d "/tmp/${F}" ]; then - FTGZ="$(basename "/tmp/${F}").tgz" - tar -czf "${FTGZ}" -C "/tmp/${F}" . - sha256sum "${FTGZ}" >>sha256sum - zip -9j update.zip "${FTGZ}" - sudo rm -f "${FTGZ}" - else - (cd $(dirname "/tmp/${F}") && sha256sum $(basename "/tmp/${F}")) >>sha256sum - zip -9j update.zip "/tmp/${F}" - fi -done <<<$(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml) -zip -9j update.zip sha256sum - -echo "Unmount image file" -sudo umount "/tmp/files/p1" -sudo umount "/tmp/files/p3" - -sudo losetup --detach ${LOOPX} diff --git a/scripts/grub.sh b/scripts/grub.sh deleted file mode 100755 index a17441d0..00000000 --- a/scripts/grub.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (C) 2022 Ing -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# -# sudo apt update -# sudo apt install -y autoconf automake autopoint gettext build-essential bison flex libtool dosfstools e2fsprogs -# - -GRUB=${1:-"grub-2.12"} -BIOS=${2:-"i386-pc i386-efi x86_64-efi"} -NAME=${3:-"RR"} - - -# Create image -rm -f grub.img -dd if=/dev/zero of=grub.img bs=1M seek=1024 count=0 -echo -e "n\np\n1\n\n+50M\nn\np\n2\n\n+50M\nn\np\n3\n\n\na\n1\nw\nq\n" | fdisk grub.img -fdisk -l grub.img - -LOOPX=$(sudo losetup -f) -sudo losetup -P ${LOOPX} grub.img -sudo mkdosfs -F32 -n ${NAME}1 ${LOOPX}p1 -sudo mkfs.ext2 -F -L ${NAME}2 ${LOOPX}p2 -sudo mkfs.ext4 -F -L ${NAME}3 ${LOOPX}p3 - -rm -rf ${NAME}1 -mkdir -p ${NAME}1 -sudo mount ${LOOPX}p1 ${NAME}1 - -sudo mkdir -p ${NAME}1/EFI -sudo mkdir -p ${NAME}1/boot/grub -cat >device.map <