do not set up homedirs during image assembly (use pam instead)

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index 326344006abffc2bdd6497bdd9b3ed7f5cef2c42..1614fbd2d8a4a2c35a15d27c0e7e29f0907c58af 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -8,19 +8,32 @@ ifdef packages
   PACKAGES += $(subst ${comma_},${space_},${packages})
 endif
 
-export DEBCONF
+export DEBCONF RPICONFIG
 
 define DEBCONF :=
+${DEBCONF}
 
 keyboard-configuration keyboard-configuration/model    select  Generic 105-key (Intl) PC
 keyboard-configuration keyboard-configuration/variant  select  English (US) - English (Macintosh)
 endef
 
-.PHONY: _debconf_selections
+define RPICONFIG :=
+${RPICONFIG}
+
+dtoverlay=vc4-fkms-v3d,cma-128
+endef
+
+.PHONY: _debconf_selections _raspberry_config
 _install: _debconf_selections
 _debconf_selections: ${SYSROOT}
        printf '%s\n' "$${DEBCONF}" |chroot "$${SYSROOT}" debconf-set-selections
 
+ifdef raspi
+  _config: _raspberry_config
+endif
+_raspberry_config: ${CFGROOT}
+       printf '%s\n' "$${RPICONFIG}" >>"$${CFGROOT}/boot/config.txt"
+
 .PHONY: _timezone _locales
 
 ifdef timezone
@@ -78,11 +91,11 @@ _rootkey: ${CFGROOT} ${rootkey}.pub
 
 _users: ${CFGROOT}
        for u in $(subst ${comma_},${space_},${users}); do \
-               chroot "$${CFGROOT}" useradd -m -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
+               chroot "$${CFGROOT}" useradd -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
        done
 
 _hostname: ${CFGROOT}
-       printf '%s\n' "$${hostname}" "$${CFGROOT}/etc/hostname"
+       printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
 
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi