X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdisplay_ws5inch.mk;h=c34ea702376a8d051241785a81b26ce2a90caf18;hb=e521876a3c21ed169f5ffc14b0f4827f25b724e5;hp=d948c5d45040763bb518b0bc3613bf2a15a87ec0;hpb=d32c1d496394986056e98c0786828a0307626964;p=blast

diff --git a/modules/display_ws5inch.mk b/modules/display_ws5inch.mk
index d948c5d..c34ea70 100644
--- 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,12 +23,11 @@ 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
 _display_ws5inch: ${CFGROOT} _copy _mount
-	printf %s "$${display_ws5inch_boot}" >>"$${CFGROOT}/boot/config.txt"
+	printf '%s\n' "$${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
+	printf '%s\n' "$${display_ws5inch_cfg}" >"$${CFGROOT}/usr/share/X11/xorg.conf.d/45-evdev.conf"