use bashrc for start

This commit is contained in:
2026-08-28 17:44:04 +02:00
parent 2a4d25b1fc
commit 241bb704ef
4 changed files with 21 additions and 31 deletions
+6 -3
View File
@@ -47,9 +47,9 @@ setup-weston:
.PHONY: setup-rasp-config .PHONY: setup-rasp-config
setup-rasp-config: setup-rasp-config:
if [ -z $(shell grep "include forge-invar.txt" "/boot/firmware/config.txt") ]; then sudo sh -c 'echo "include forge-invar.txt" >> /boot/firmware/config.txt'; fi sudo $(PROJECT_DIR)/line_in_file.sh "include forge-invar.txt" "/boot/firmware/config.txt"
sudo $(PROJECT_DIR)/line_in_file.sh "vc4.tv_norm=PAL" "/boot/firmware/config.txt" "vc4.tv_norm"
sudo cp -f $(PROJECT_DIR)/system/config.ini /boot/firmware/forge-invar.txt sudo cp -f $(PROJECT_DIR)/system/config.ini /boot/firmware/forge-invar.txt
if [ -z $(shell grep "vc4.tv_norm" "/boot/firmware/cmdline.txt") ]; then sudo sh -c 'echo "vc4.tv_norm=PAL" >> /boot/firmware/cmdline.txt'; fi
.PHONY: setup-services .PHONY: setup-services
setup-services: setup-services:
@@ -64,9 +64,12 @@ setup-user-services:
systemctl --user daemon-reload systemctl --user daemon-reload
systemctl --user enable weston systemctl --user enable weston
.PHONY: setup-bashrc
setup-bashrc:
$(PROJECT_DIR)/line_in_file.sh "make -C $(PROJECT_DIR) start-weston" "$(HOME)/.bashrc"
.PHONY: install .PHONY: install
install: remove-passwd setup-rasp-config apt-install setup-weston setup-rasp-config setup-services setup-user-services install: remove-passwd setup-rasp-config apt-install setup-weston setup-rasp-config setup-services setup-bashrc
.PHONY: clean .PHONY: clean
clean: clean:
+15
View File
@@ -0,0 +1,15 @@
#!/bin/bash
set -v
set -e
LINE=$1
FILE=$2
DETECT=${3:-$LINE}
if [[ -z $(grep "$DETECT" "$FILE") ]]; then
echo "Line not found in $FILE"
echo "$LINE" >> "$FILE"
else
echo "Line already exists in $FILE"
fi
-23
View File
@@ -1,23 +0,0 @@
[Unit]
Description=Weston, a Wayland compositor, as a user service
# Activate using a systemd socket
Requires=weston.socket
After=weston.socket
# Since we are part of the graphical session, make sure we are started before
Before=graphical-session.target
[Service]
Type=notify
TimeoutStartSec=60
WatchdogSec=20
# Defaults to journal
#StandardOutput=journal
StandardError=journal
# add a ~/.config/weston.ini and weston will pick-it up
ExecStart=/usr/bin/weston --modules=systemd-notify.so --shell=kiosk-shell.so --xwayland -- kitty --hold make -C /opt/forge-invar run
[Install]
WantedBy=graphical-session.target
-5
View File
@@ -1,5 +0,0 @@
[Unit]
Description=Weston, a Wayland compositor
[Socket]
ListenStream=%t/wayland-0