unified bootloader targets, root key setup, webui mode, modules for live boot (lokfs...

[blast] / modules / display_ws5inch.mk

diff --git a/modules/display_ws5inch.mk b/modules/display_ws5inch.mk
index d948c5d45040763bb518b0bc3613bf2a15a87ec0..49b27b753907153b9e8283f6b6c9f6a34a392ef0 100644 (file)
--- a/modules/display_ws5inch.mk
+++ b/modules/display_ws5inch.mk
@@ -1,4 +1,4 @@
-define display_ws5inch_boot =
+define display_ws5inch_boot :=
 
 # Waveshare 5 Inch Display
 hdmi_group=2
@@ -11,7 +11,7 @@ enable_uart=1
 dtoverlay=ads7846,cs=1,penirq=25,penirq_pull=2,speed=50000,keep_vref_on=0,swapxy=0,pmax=255,xohms=150,xmin=200,xmax=3900,ymin=200,ymax=3900
 endef
 
-define display_ws5inch_cfg =
+define display_ws5inch_cfg :=
 Section "InputClass"
        Identifier "evdev touchscreen catchall"
        MatchIsTouchscreen "on"
@@ -23,7 +23,7 @@ endef
 
 export display_ws5inch_boot display_ws5inch_cfg
 
-PACKAGES := ${PACKAGES} xserver-xorg-input-evdev xinput xinput-calibrator
+PACKAGES += xserver-xorg-input-evdev xinput xinput-calibrator
 
 .PHONY: _display_ws5inch
 _config: _display_ws5inch
@@ -31,4 +31,3 @@ _display_ws5inch: ${CFGROOT} _copy _mount
        printf %s "$${display_ws5inch_boot}" >>"$${CFGROOT}/boot/config.txt"
        mkdir -p "$${CFGROOT}/usr/share/X11/xorg.conf.d/"
        printf %s "$${display_ws5inch_cfg}" >"$${CFGROOT}/usr/share/X11/xorg.conf.d/45-evdev.conf"
-       #-chroot "$${CFGROOT}" adduser local input