kxtzownsu/KVS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shim builder (works on grunt)

Browse Source
This commit is contained in:
kxtz smith 2024-12-29 07:31:19 +00:00
parent 692add0021
commit 01350f0001
5 changed files with 138 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -6,6 +6,7 @@
// this setting isn't "unknown", its just for troubleshooting, // this setting isn't "unknown", its just for troubleshooting,
// but it fixes the vscode.dev cursor on ChromeOS. // but it fixes the vscode.dev cursor on ChromeOS.
"editor.disableMonospaceOptimizations": true "editor.disableMonospaceOptimizations": true,
"makefile.configureOnOpen": false
} }

23
Makefile
View File

@ -10,8 +10,14 @@ KVSFLIST := \
src/KVS/hex_utils.c src/KVS/hex_utils.c
TOOLS := \ TOOLS := \
is_ti50
TOOL_SRC := \
src/tools/is_ti50.c 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 := \ CFLAGS := \
-Iinclude \ -Iinclude \
-g \ -g \
@ -30,15 +36,24 @@ endif
TARGET = ${ARCH}-unknown-linux-${TOOLCHAIN} TARGET = ${ARCH}-unknown-linux-${TOOLCHAIN}
all: clean build kvs kvg all: clean build kvs kvg tools
kvs: build build/$(ARCH)/bin/kvs kvs: build build/$(ARCH)/bin/kvs
kvg: build build/$(ARCH)/bin/kvg 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: 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 build/$(ARCH)/bin/kvs: src/KVS/main.c
$(CC) $(KVSFLIST) -o build/$(ARCH)/bin/kvs $(CFLAGS) $(CC) $(KVSFLIST) -o build/$(ARCH)/bin/kvs $(CFLAGS)

26
shim-builder/builder.sh
View File

@ -1,17 +1,17 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
VERSION=1 VERSION=2.0.0
HOST_ARCH=$(lscpu | grep Architecture | awk '{print $2}') HOST_ARCH=$(lscpu | grep Architecture | awk '{print $2}')
if [ $HOST_ARCH == "x86_64" ]; then if [ $HOST_ARCH == "x86_64" ]; then
CGPT="$SCRIPT_DIR/bins/cgpt.x86-64" CGPT="$SCRIPT_DIR/bins/cgpt.x86-64"
SFDISK="$SCRIPT_DIR/bins/sfdisk.x86-64" SFDISK="$SCRIPT_DIR/bins/sfdisk.x86-64"
else else
echo "Building on an ARM system is not supported currently" echo "Building on an ARM system is not supported currently"
exit exit
# CGPT="$SCRIPT_DIR/bins/cgpt.aarch64" # CGPT="$SCRIPT_DIR/bins/cgpt.aarch64"
# SFDISK="$SCRIPT_DIR/bins/sfdisk.aarch64" # SFDISK="$SCRIPT_DIR/bins/sfdisk.aarch64"
fi fi
source $SCRIPT_DIR/functions.sh source $SCRIPT_DIR/functions.sh
@ -68,13 +68,13 @@ safesync
log "Checking for anti-skid lock..." log "Checking for anti-skid lock..."
if [ "$2" == "--antiskid" ]; then if [ "$2" == "--antiskid" ]; then
echo "Skid lock found!" echo "Skid lock found!"
echo "Disabling RW mount.." echo "Disabling RW mount.."
disable_rw_mount "${LOOPDEV}p3" disable_rw_mount "${LOOPDEV}p3"
else else
echo "Skid lock disabled.." echo "Skid lock disabled.."
echo "Enabling RW Mount.." echo "Enabling RW Mount.."
enable_rw_mount "${LOOPDEV}p3" enable_rw_mount "${LOOPDEV}p3"
fi fi
cleanup cleanup

150
shim-builder/functions.sh
View File

@ -18,32 +18,32 @@ COLOR_CYAN_B="\033[1;36m"
readlink /proc/$$/exe | grep -q bash || error "You MUST execute this with Bash!" readlink /proc/$$/exe | grep -q bash || error "You MUST execute this with Bash!"
safesync(){ safesync(){
sync sync
sleep 0.2 sleep 0.2
} }
log() { log() {
printf "%b\n" "${COLOR_BLUE_B}Info: $*${COLOR_RESET}" printf "%b\n" "${COLOR_BLUE_B}Info: $*${COLOR_RESET}"
} }
cleanup(){ cleanup(){
suppress umount "$ROOT_MNT" suppress umount "$ROOT_MNT"
rm -rf "$ROOT_MNT" rm -rf "$ROOT_MNT"
suppress umount "$STATE_MNT" suppress umount "$STATE_MNT"
rm -rf "$STATE_MNT" rm -rf "$STATE_MNT"
suppress umount -R "$LOOPDEV"* suppress umount -R "$LOOPDEV"*
losetup -d "$LOOPDEV" losetup -d "$LOOPDEV"
losetup -D #in case of cmd above failing losetup -D #in case of cmd above failing
} }
error(){ error(){
printf "${COLOR_RED_B}ERR: %b${COLOR_RESET}\n" "$*" >&2 || : printf "${COLOR_RED_B}ERR: %b${COLOR_RESET}\n" "$*" >&2 || :
printf "${COLOR_RED}Exiting... ${COLOR_RESET}\n" >&2 || : printf "${COLOR_RED}Exiting... ${COLOR_RESET}\n" >&2 || :
exit 1 exit 1
} }
suppress() { suppress() {
@ -107,29 +107,29 @@ disable_rw_mount() {
} }
shrink_partitions() { shrink_partitions() {
local shim="$1" local shim="$1"
fdisk "$shim" <<EOF fdisk "$shim" <<EOF
d d
12 12
d d
11 11
d d
10 10
d d
9 9
d d
8 8
d d
7 7
d d
6 6
d d
5 5
d d
4 4
d d
1 1
w w
EOF EOF
} }
@ -152,28 +152,28 @@ format_bytes() {
create_stateful(){ create_stateful(){
log "Creating KVS/Stateful Partition" log "Creating KVS/Stateful Partition"
local final_sector=$(get_final_sector "$LOOPDEV") local final_sector=$(get_final_sector "$LOOPDEV")
local sector_size=$(get_sector_size "$LOOPDEV") local sector_size=$(get_sector_size "$LOOPDEV")
# special UUID is from grunt shim, dunno if this is different on other shims "$CGPT" add "$LOOPDEV" -i 1 -b $((final_sector + 1)) -s $((STATE_SIZE / sector_size)) -t data
"$CGPT" add "$LOOPDEV" -i 1 -b $((final_sector + 1)) -s $((STATE_SIZE / sector_size)) -t "9CC433E4-52DB-1F45-A951-316373C30605" partx -u -n 1 "$LOOPDEV"
partx -u -n 1 "$LOOPDEV" suppress mkfs.ext4 -F -L KVS "$LOOPDEV"p1
suppress mkfs.ext4 -F -L KVS "$LOOPDEV"p1 safesync
safesync
} }
inject_stateful(){ inject_stateful(){
log "Injecting KVS/Stateful Partition" log "Injecting KVS/Stateful Partition"
echo "Mounting stateful.." echo "Mounting stateful.."
mount "$LOOPDEV"p1 "$STATE_MNT" mount "$LOOPDEV"p1 "$STATE_MNT"
echo "Copying files.." echo "Copying files.."
cp -r $SCRIPT_DIR/stateful/* "$STATE_MNT" mkdir -p "${STATE_MNT}/dev_image/etc"
umount "$STATE_MNT" touch "${STATE_MNT}/dev_image/etc/lsb-factory"
umount "$STATE_MNT"
} }
shrink_root() { shrink_root() {
log "Shrinking ROOT-A Partition" log "Shrinking ROOT-A Partition"
enable_rw_mount "${LOOPDEV}p3" enable_rw_mount "${LOOPDEV}p3"
suppress e2fsck -fy "${LOOPDEV}p3" suppress e2fsck -fy "${LOOPDEV}p3"
@ -195,16 +195,44 @@ shrink_root() {
partx -u -n 3 "$LOOPDEV" partx -u -n 3 "$LOOPDEV"
} }
inject_root(){ detect_arch() {
log "Injecting ROOT-A Partition" MNT_ROOT=$(mktemp -d)
mount -o ro "${LOOPDEV}p3" "$MNT_ROOT"
echo "Mounting root.." TARGET_ARCH=x86_64
suppress enable_rw_mount "$LOOPDEV"p3 if [ -f "$MNT_ROOT/bin/bash" ]; then
suppress mount "$LOOPDEV"p3 "$ROOT_MNT" case "$(file -b "$MNT_ROOT/bin/bash" | awk -F ', ' '{print $2}' | tr '[:upper:]' '[:lower:]')" in
echo "Copying files.." # for now assume arm has aarch64 kernel
suppress cp -r "$SCRIPT_DIR"/root/* "$ROOT_MNT" # this only assumes since theres no armv7 (arm32) shims leaked
echo "$(date +'%m-%d-%Y %I:%M%p %Z')" > "$ROOT_MNT"/DATE_COMPILED *aarch64* | *armv8* | *arm*) TARGET_ARCH=aarch64 ;;
suppress umount "$ROOT_MNT" esac
fi
echo "Detected architecture: $TARGET_ARCH"
umount "$MNT_ROOT"
rmdir "$MNT_ROOT"
}
inject_root(){
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() { get_parts_physical_order() {
@ -225,5 +253,5 @@ squash_partitions() {
} }
umount_all(){ umount_all(){
suppress umount -R "$LOOPDEV"* suppress umount -R "$LOOPDEV"*
} }

11
shim-builder/root/factory_install.sh Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
setterm -cursor on
chmod +rx /bin/kvs
chmod +rx /bin/kvg
/bin/kvs
reboot now
sleep 1d