From: Paul Hänsch Date: Mon, 13 Apr 2026 19:57:44 +0000 (+0200) Subject: slightly tidier code X-Git-Url: http://git.plutz.net/?a=commitdiff_plain;h=d46bdb3bcc7e5565614e6f3fec68b3f92f6524a8;p=blast slightly tidier code --- diff --git a/Makefile b/Makefile index e4c93ff..4908104 100644 --- a/Makefile +++ b/Makefile @@ -15,18 +15,16 @@ _target: _config ARCH := amd64 BOOTSTRAP := http://deb.debian.org/debian -PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd CFGROOT := cfg_root SYSROOT = sys_root_${release}_${ARCH} +PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd + config.mk: cp "config.example" "$@" -ifndef config - include config.mk -else - include ${config} -endif +config ?= config.mk +include ${config} ifndef release release := trixie diff --git a/targets/raspberrypi.mk b/targets/raspberrypi.mk index cdd2049..14e4194 100644 --- a/targets/raspberrypi.mk +++ b/targets/raspberrypi.mk @@ -81,7 +81,7 @@ ${PROOT}: .FORCE dd bs=1M count=0 seek=${ROOT_MB} of="$${PROOT}" _partition_raspi: ${VOLUME} .FORCE - printf "$${PARTLAYOUT}" |sfdisk "$${VOLUME}" + printf '%s\n' "$${PARTLAYOUT}" | sfdisk "$${VOLUME}" _format_root: ${PROOT} mkfs.${fstype} -L FSROOT "$${PROOT}"