Compare commits

...
3 Commits
Author SHA1 Message Date
klemek e9d9344796 fix: better rasp reset 2026-11-05 21:40:02 +01:00
klemek dc55878d94 fix: start not in correct directory 2026-11-05 21:38:24 +01:00
klemek ff4a59808a fix: remove "login: automatic login" text 2026-11-05 21:37:12 +01:00
5 changed files with 29 additions and 23 deletions
+7 -10
View File
@@ -11,6 +11,8 @@ UV ?= uv
RUFF ?= $(UV) run --active ruff
TY ?= $(UV) run --active ty
MAKE := $(MAKE) --no-print-directory
RASP_USER ?= forge
RASP_BOOTFS ?= /run/media/$(shell whoami)/bootfs
RASP_ROOTFS ?= /run/media/$(shell whoami)/rootfs
@@ -60,10 +62,10 @@ rasp-install: rasp-install-pal ## setup raspberry
.PHONY: rasp-install-%
rasp-install-%: ## setup raspberry (PAL/NTSC/HDMI)
make git-submodule-update rasp-rsync rasp-setup-config-$* rasp-setup-cmdline-$* rasp-setup-start-$* rasp-unmount
$(MAKE) git-submodule-update rasp-rsync rasp-setup-config-$* rasp-setup-cmdline-$* rasp-setup-start-$* rasp-unmount
.PHONY: rasp-reset
rasp-reset: rasp-reset-config rasp-reset-cmdline rasp-reset-start rasp-unmount ## reset raspberry to console mode
rasp-reset: rasp-rsync rasp-setup-config-hdmi rasp-reset-cmdline rasp-reset-start rasp-unmount ## reset raspberry to console mode
# TOOLS
@@ -123,7 +125,7 @@ rasp-reset-config: ## remove include in remote config.txt
.PHONY: rasp-setup-config-%
rasp-setup-config-%: ## setup include in remote config.txt
make rasp-setup-custom-$* rasp-reset-config
$(MAKE) rasp-setup-custom-$* rasp-reset-config
echo "include custom.txt" >> $(RASP_BOOTFS)/config.txt
.PHONY: rasp-reset-cmdline
@@ -140,13 +142,8 @@ rasp-setup-cmdline-%: rasp-reset-cmdline ## add custom line to remove cmdline.tx
rasp-reset-start: ## remove custom .bashrc start
rm -f $(RASP_ROOTFS)/home/$(RASP_USER)/.bash_aliases
.PHONY: rasp-setup-start
rasp-setup-start: rasp-reset-start ## install custom .bashrc start
echo "touch $(RELATIVE_PROJECT_PATH)/*" >> $(RASP_ROOTFS)/home/$(RASP_USER)/.bash_aliases
echo "make -C $(RELATIVE_PROJECT_PATH) --silent --no-print-directory start" >> $(RASP_ROOTFS)/home/$(RASP_USER)/.bash_aliases
.PHONY: rasp-setup-start-hmdi
rasp-setup-start-%: rasp-reset-start ## install custom .bashrc start
.PHONY: rasp-setup-start-%
rasp-setup-start-%: ## install custom .bashrc start
cp -f $(PROJECT_DIR)/system/$*/start.sh $(RASP_ROOTFS)/home/$(RASP_USER)/.bash_aliases
.PHONY: rasp-unmount
+1 -1
View File
@@ -21,7 +21,7 @@ Before=rescue.service
ConditionPathExists=/dev/tty0
[Service]
ExecStart=-/sbin/agetty --autologin forge --noissue --nohints --nohostname --noreset --noclear %I ${TERM}
ExecStart=-/sbin/agetty --skip-login --autologin forge --noissue --nohints --nohostname --noreset --noclear %I ${TERM}
Type=idle
Restart=always
RestartSec=0
+7 -4
View File
@@ -1,10 +1,13 @@
#!/bin/sh
export PROJECT_DIR=/opt/forge-invar
export WESTON_MOD=hdmi
export SCREEN_HEIGHT=480
rm -rf $PROJECT_DIR/*.log
touch $PROJECT_DIR/*
cd $PROJECT_DIR
weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/hdmi/weston.ini --log=$PROJECT_DIR/weston.log \
-- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
rm -rf *.log
touch *
weston --shell=kiosk-shell.so --xwayland --config=${PROJECT_DIR}/system/${WESTON_MOD}/weston.ini --log=${PROJECT_DIR}/weston.log \
-- make --silent start 2>&1 > /dev/null
+7 -4
View File
@@ -1,10 +1,13 @@
#!/bin/sh
export PROJECT_DIR=/opt/forge-invar
export WESTON_MOD=ntsc
export SCREEN_HEIGHT=480
rm -rf $PROJECT_DIR/*.log
touch $PROJECT_DIR/*
cd $PROJECT_DIR
weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/nstc/weston.ini --log=$PROJECT_DIR/weston.log \
-- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
rm -rf *.log
touch *
weston --shell=kiosk-shell.so --xwayland --config=${PROJECT_DIR}/system/${WESTON_MOD}/weston.ini --log=${PROJECT_DIR}/weston.log \
-- make --silent start 2>&1 > /dev/null
+7 -4
View File
@@ -1,10 +1,13 @@
#!/bin/sh
export PROJECT_DIR=/opt/forge-invar
export WESTON_MOD=pal
export SCREEN_HEIGHT=576
rm -rf $PROJECT_DIR/*.log
touch $PROJECT_DIR/*
cd $PROJECT_DIR
weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/pal/weston.ini --log=$PROJECT_DIR/weston.log \
-- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
rm -rf *.log
touch *
weston --shell=kiosk-shell.so --xwayland --config=${PROJECT_DIR}/system/${WESTON_MOD}/weston.ini --log=${PROJECT_DIR}/weston.log \
-- make --silent start 2>&1 > /dev/null