From 01350f000132f3ad8deef3fc2322ef61c3a7573f Mon Sep 17 00:00:00 2001 From: kxtz smith Date: Sun, 29 Dec 2024 07:31:19 +0000 Subject: [PATCH] shim builder (works on grunt) --- .vscode/settings.json | 3 +- Makefile | 23 +++- shim-builder/builder.sh | 26 ++--- shim-builder/functions.sh | 158 ++++++++++++++++----------- shim-builder/root/factory_install.sh | 11 ++ 5 files changed, 138 insertions(+), 83 deletions(-) create mode 100755 shim-builder/root/factory_install.sh diff --git a/.vscode/settings.json b/.vscode/settings.json index 3ec69ee..d3101e5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ // this setting isn't "unknown", its just for troubleshooting, // but it fixes the vscode.dev cursor on ChromeOS. - "editor.disableMonospaceOptimizations": true + "editor.disableMonospaceOptimizations": true, + "makefile.configureOnOpen": false } \ No newline at end of file diff --git a/Makefile b/Makefile index ef09596..a15505c 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,14 @@ KVSFLIST := \ src/KVS/hex_utils.c TOOLS := \ + is_ti50 + +TOOL_SRC := \ src/tools/is_ti50.c +TOOL_OBJS := $(patsubst src/tools/%.c,build/$(ARCH)/tools/%.o,$(TOOL_SRC)) +TOOL_BINS := $(patsubst %,build/$(ARCH)/tools/%,$(TOOLS)) + CFLAGS := \ -Iinclude \ -g \ @@ -30,15 +36,24 @@ endif TARGET = ${ARCH}-unknown-linux-${TOOLCHAIN} -all: clean build kvs kvg +all: clean build kvs kvg tools kvs: build build/$(ARCH)/bin/kvs kvg: build build/$(ARCH)/bin/kvg -tools: build build/bin -kvg-c: build build/$(ARCH)bin/kvg-c + +tools: build $(TOOL_BINS) + +build/$(ARCH)/tools/%: build/$(ARCH)/tools/%.o + $(CC) $(LDFLAGS) -static -o $@ $< + mv $@ build/$(ARCH)/bin/ + rm -rf build/$(ARCH)/tools + +build/$(ARCH)/tools/%.o: src/tools/%.c + $(CC) $(CFLAGS) -c -o $@ $< build: - $(shell mkdir -p build/$(ARCH)/bin) + mkdir -p build/$(ARCH)/bin + mkdir -p build/$(ARCH)/tools build/$(ARCH)/bin/kvs: src/KVS/main.c $(CC) $(KVSFLIST) -o build/$(ARCH)/bin/kvs $(CFLAGS) diff --git a/shim-builder/builder.sh b/shim-builder/builder.sh index 1337e55..c0d31a1 100755 --- a/shim-builder/builder.sh +++ b/shim-builder/builder.sh @@ -1,17 +1,17 @@ #!/usr/bin/env bash SCRIPT_DIR=$(dirname "$0") -VERSION=1 +VERSION=2.0.0 HOST_ARCH=$(lscpu | grep Architecture | awk '{print $2}') if [ $HOST_ARCH == "x86_64" ]; then - CGPT="$SCRIPT_DIR/bins/cgpt.x86-64" - SFDISK="$SCRIPT_DIR/bins/sfdisk.x86-64" + CGPT="$SCRIPT_DIR/bins/cgpt.x86-64" + SFDISK="$SCRIPT_DIR/bins/sfdisk.x86-64" else - echo "Building on an ARM system is not supported currently" - exit - # CGPT="$SCRIPT_DIR/bins/cgpt.aarch64" - # SFDISK="$SCRIPT_DIR/bins/sfdisk.aarch64" + echo "Building on an ARM system is not supported currently" + exit + # CGPT="$SCRIPT_DIR/bins/cgpt.aarch64" + # SFDISK="$SCRIPT_DIR/bins/sfdisk.aarch64" fi source $SCRIPT_DIR/functions.sh @@ -68,13 +68,13 @@ safesync log "Checking for anti-skid lock..." if [ "$2" == "--antiskid" ]; then - echo "Skid lock found!" - echo "Disabling RW mount.." - disable_rw_mount "${LOOPDEV}p3" + echo "Skid lock found!" + echo "Disabling RW mount.." + disable_rw_mount "${LOOPDEV}p3" else - echo "Skid lock disabled.." - echo "Enabling RW Mount.." - enable_rw_mount "${LOOPDEV}p3" + echo "Skid lock disabled.." + echo "Enabling RW Mount.." + enable_rw_mount "${LOOPDEV}p3" fi cleanup diff --git a/shim-builder/functions.sh b/shim-builder/functions.sh index e42b48f..c060382 100755 --- a/shim-builder/functions.sh +++ b/shim-builder/functions.sh @@ -18,32 +18,32 @@ COLOR_CYAN_B="\033[1;36m" readlink /proc/$$/exe | grep -q bash || error "You MUST execute this with Bash!" safesync(){ - sync - sleep 0.2 + sync + sleep 0.2 } log() { - printf "%b\n" "${COLOR_BLUE_B}Info: $*${COLOR_RESET}" + printf "%b\n" "${COLOR_BLUE_B}Info: $*${COLOR_RESET}" } cleanup(){ - suppress umount "$ROOT_MNT" - rm -rf "$ROOT_MNT" - - suppress umount "$STATE_MNT" - rm -rf "$STATE_MNT" - - suppress umount -R "$LOOPDEV"* - - losetup -d "$LOOPDEV" - losetup -D #in case of cmd above failing + suppress umount "$ROOT_MNT" + rm -rf "$ROOT_MNT" + + suppress umount "$STATE_MNT" + rm -rf "$STATE_MNT" + + suppress umount -R "$LOOPDEV"* + + losetup -d "$LOOPDEV" + losetup -D #in case of cmd above failing } error(){ - printf "${COLOR_RED_B}ERR: %b${COLOR_RESET}\n" "$*" >&2 || : - printf "${COLOR_RED}Exiting... ${COLOR_RESET}\n" >&2 || : - exit 1 + printf "${COLOR_RED_B}ERR: %b${COLOR_RESET}\n" "$*" >&2 || : + printf "${COLOR_RED}Exiting... ${COLOR_RESET}\n" >&2 || : + exit 1 } suppress() { @@ -107,29 +107,29 @@ disable_rw_mount() { } shrink_partitions() { - local shim="$1" - fdisk "$shim" < "$ROOT_MNT"/DATE_COMPILED - suppress umount "$ROOT_MNT" + log "Injecting ROOT-A Partition" + detect_arch + + echo "Mounting root.." + suppress enable_rw_mount "$LOOPDEV"p3 + suppress mount "$LOOPDEV"p3 "$ROOT_MNT" + echo "Copying files.." + cp -r "$SCRIPT_DIR/../build/$TARGET_ARCH/." "$ROOT_MNT" + suppress cp -r "$SCRIPT_DIR/root/factory_install.sh" "$ROOT_MNT/usr/sbin/factory_install.sh" + mkdir -p "$ROOT_MNT"/opt/kvs/bin + mv "$ROOT_MNT"/bin/is_ti50 "$ROOT_MNT"/opt/kvs/bin/is_ti50 + echo 'export PATH=$PATH:/opt/kvs/bin' >> "$ROOT_MNT"/root/.bashrc + + echo "Removing tcsd & trunksd.." + rm -rf "$ROOT_MNT"/etc/init/tcsd.conf + rm -rf "$ROOT_MNT"/etc/init/trunksd.conf + + echo "$(date +'%m-%d-%Y %I:%M%p %Z')" > "$ROOT_MNT"/DATE_COMPILED + suppress umount "$ROOT_MNT" } get_parts_physical_order() { @@ -225,5 +253,5 @@ squash_partitions() { } umount_all(){ - suppress umount -R "$LOOPDEV"* + suppress umount -R "$LOOPDEV"* } \ No newline at end of file diff --git a/shim-builder/root/factory_install.sh b/shim-builder/root/factory_install.sh new file mode 100755 index 0000000..a3e51cc --- /dev/null +++ b/shim-builder/root/factory_install.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +setterm -cursor on + +chmod +rx /bin/kvs +chmod +rx /bin/kvg + +/bin/kvs + +reboot now +sleep 1d \ No newline at end of file