Config option for keyboard layout

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index 1614fbd2d8a4a2c35a15d27c0e7e29f0907c58af..0dfe4505208411c22ba08eeb1595143fe39ae249 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -2,7 +2,7 @@ ifdef imagesize
   ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))")
 endif
 
-PACKAGES += btrfs-tools bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES += btrfs-progs bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
 
 ifdef packages
   PACKAGES += $(subst ${comma_},${space_},${packages})
@@ -10,24 +10,33 @@ endif
 
 export DEBCONF RPICONFIG
 
+ifndef keyboard
+keyboard := English (US) - English (Macintosh)
+endif
+
 define DEBCONF :=
 ${DEBCONF}
 
 keyboard-configuration keyboard-configuration/model    select  Generic 105-key (Intl) PC
-keyboard-configuration keyboard-configuration/variant  select  English (US) - English (Macintosh)
+keyboard-configuration keyboard-configuration/variant  select  ${keyboard}
 endef
 
 define RPICONFIG :=
 ${RPICONFIG}
 
-dtoverlay=vc4-fkms-v3d,cma-128
+dtoverlay=vc4-fkms-v3d,cma-256
 endef
 
-.PHONY: _debconf_selections _raspberry_config
+.PHONY: _debconf_selections _raspberry_config _keyboard
 _install: _debconf_selections
 _debconf_selections: ${SYSROOT}
        printf '%s\n' "$${DEBCONF}" |chroot "$${SYSROOT}" debconf-set-selections
 
+_config: _keyboard
+_keyboard: ${CFGROOT} _debconf_selections
+       rm "$${CFGROOT}/etc/default/keyboard"
+       chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u keyboard-configuration
+
 ifdef raspi
   _config: _raspberry_config
 endif
@@ -83,7 +92,7 @@ _rootpass: ${CFGROOT}
        chroot "$${CFGROOT}" usermod -p "$$(openssl passwd "$${rootpass}")" root
 
 ${rootkey}.pub:
-       ssh-keygen -N '' -f "$${rootkey}"
+       [ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}"
 
 _rootkey: ${CFGROOT} ${rootkey}.pub
        mkdir -m 700 "$${CFGROOT}/root/.ssh/"