X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=a0e88a2e1b52b99f352edbe3a59048e22d2e206c;hb=7bceaf33e56a24fe214f13582cf352244e1e5d0b;hp=2f5364b57d0546e1abe9bf60481dd70717923936;hpb=92dfcb2f828b2bb5eaa5b127ffa1a4bf15432335;p=blast diff --git a/modules/default.mk b/modules/default.mk index 2f5364b..a0e88a2 100644 --- 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 + +define RPICONFIG := +${RPICONFIG} +dtoverlay=vc4-fkms-v3d,cma-256 endef -.PHONY: _debconf_selections +.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