dependency fix for _config receipes

diff --git a/modules/default.mk b/modules/default.mk
index 92c9ff9f53ed8962543a29fc1556697a9b8ad2d5..35c5195eb5e87f75251f53935e6544ec19852ded 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -27,7 +27,7 @@ endif
 define RPICONFIG :=
 ${RPICONFIG}
 
-dtoverlay=vc4-fkms-v3d,cma-${rpivmem}
+# dtoverlay=vc4-fkms-v3d,cma-${rpivmem}
 endef
 
 .PHONY: _debconf_selections _raspberry_config _keyboard
@@ -38,17 +38,17 @@ _debconf_selections: ${SYSROOT}
 ifdef keyboard
   _config: _keyboard
 endif
-_keyboard: ${CFGROOT}
+_keyboard: _copy
        -sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="${keyboard}";;' "$${CFGROOT}/etc/default/keyboard"
 
 ifdef raspi
   _config: _raspberry_config _raspberry_initrd
 endif
 
-_raspberry_config: ${CFGROOT}
+_raspberry_config: _copy
        printf '%s\n' "$${RPICONFIG}" >>"$${CFGROOT}/boot/config.txt"
 
-_raspberry_initrd: ${CFGROOT}
+_raspberry_initrd: _copy
        printf '${fstype}\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
        k="$$(printf '%s\n' "$${CFGROOT}"/lib/modules/* |sed 's;^.*/;;;')"; \
        [ "${kernel}" ] && k="${kernel}"; \
@@ -68,11 +68,11 @@ ifdef locales
   _config: _locales
 endif
 
-_timezone: ${CFGROOT}
+_timezone: _copy
        printf '%s\n' "$${timezone}" >"$${CFGROOT}/etc/timezone"
        ln -sf /usr/share/zoneinfo/"$${timezone}" "$${CFGROOT}/etc/localtime"
 
-_locales: ${CFGROOT}
+_locales: _copy
        for l in $(subst ${comma_},${space_},${locales}); do \
                printf '%s %s\n' "$${l}" "$${l#*.}"; \
        done >"$${CFGROOT}/etc/locale.gen"
@@ -101,35 +101,35 @@ ifdef hostname
 endif
 
 
-_rootpass: ${CFGROOT}
+_rootpass: _copy
        chroot "$${CFGROOT}" usermod -p "$$(openssl passwd "$${rootpass}")" root
 
 ${rootkey}.pub:
        [ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}"
 
-_rootkey: ${CFGROOT} ${rootkey}.pub
+_rootkey: _copy ${rootkey}.pub
        mkdir -pm 700 "$${CFGROOT}/root/.ssh/"
        cp "$${rootkey}.pub" "$${CFGROOT}/root/.ssh/authorized_keys"
 
-_users: ${CFGROOT}
+_users: _copy
        for u in $(subst ${comma_},${space_},${users}); do \
                chroot "$${CFGROOT}" useradd -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
        done
 
-_hostname: ${CFGROOT}
+_hostname: _copy
        printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
        sed -Ei "s;^127\.0\.0\.1.*$$;&  $${hostname};" "$${CFGROOT}/etc/hosts"
 
 .PHONY: _systemd_timeout _pingcap _files_default
 _config: _systemd_timeout _pingcap _files_default
-_systemd_timeout: ${CFGROOT}
+_systemd_timeout: _copy
        mkdir -p "$${CFGROOT}/etc/systemd"
        printf 'DefaultTimeout%sSec=%s\n' Start 10s Stop 10s >>"$${CFGROOT}/etc/systemd/system.conf"
 
-_pingcap: ${CFGROOT}
+_pingcap: _copy
        chroot "$${CFGROOT}" setcap cap_net_raw+p /usr/bin/ping
 
-_files_default: ${CFGROOT} modules/default/
+_files_default: _copy modules/default/
        cp -a modules/default/. "$${CFGROOT}"