X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=dc7dd52806e1aeccf2fbaef3484fd6e6d6591691;hb=218e2ce73d4d5a9a0b9ef554be77c93a3b66895d;hp=fb0db2b294daf13a1dad2592c508f7cd22032343;hpb=2181bdf8b56e870fa56fb5cccc1287ef6860250a;p=blast diff --git a/Makefile b/Makefile index fb0db2b..dc7dd52 100644 --- a/Makefile +++ b/Makefile @@ -7,27 +7,37 @@ space_:= ${nul_} ${nul_} .PHONY: clean .FORCE _target .PHONY: _bootloader_raspi _bootloader_pc _partition_gpt _partition_raspi .PHONY: _squash_modules -.PHONY: _qemu _bootstrap _install _copy _config _bootloader _squash -.PHONY: _partition _format _mount _sparse _umount _partcopy _mbr +.PHONY: _qemu _bootstrap _install _copy _config _squash +.PHONY: _format _mount _sparse _umount _partcopy _mbr ARCH := amd64 KEYRING := keys/debian-archive-stretch-stable.gpg BOOTSTRAP := http://cdn.debian.net/debian +PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd # Partition Table (2M) + Boot Partition (126M)+ Root Partition + Slack Space (1M) = 2048M BOOT_MB := 62 ROOT_MB := 959 -define SOURCES = -deb http://cdn.debian.net/debian stretch main -endef - -PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd - -include config.mk config.mk: cp "config.example" "$@" +ifndef config + include config.mk +else + include ${config} +endif + +ifndef release + release := stretch +endif + +define SOURCES := +deb http://cdn.debian.net/debian stretch main +deb http://cdn.debian.net/debian buster main +deb http://cdn.debian.net/debian ${release} main +endef + ifdef disk VOLUME := ${disk} PBOOT := ${disk}1 @@ -35,85 +45,87 @@ ifdef disk SYSROOT := hdd_mount/ CFGROOT := hdd_mount/ - _target: _mbr _umount _config _install _partition + _target: _mbr _umount _config _install _partition_gpt - _partition: _partition_gpt - _format: _partition + _partition_gpt: + _format: _partition_gpt _mount: _format _bootstrap: _mount _install: _bootstrap _mount _config: _install _mount - _bootloader: _mount _bootloader_pc - _umount: _mount _config _bootloader - _mbr: _umount _bootloader + _bootloader_pc: _mount + _umount: _mount _config _bootloader_pc + _mbr: _umount _bootloader_pc else ifdef image VOLUME := ${image} PBOOT := part_boot.img PROOT := part_root.img - SYSROOT := sys_root/ + SYSROOT := sys_root_${release}/ CFGROOT := img_mount/ - _target: _mbr _umount _partcopy _config _install + _target: _mbr _umount _config _install _bootstrap: _install: _bootstrap _sparse: _format: _sparse - _mount: _format - _copy: _install _mount - _config: _copy _mount - _bootloader: _mount _bootloader_pc - _umount: _mount _config _bootloader - _partition: _partition_gpt - _partcopy: _partition _umount - _mbr: _partcopy _bootloader + _partition_gpt: _sparse + _partcopy: _partition_gpt _format + _img_mount: _partcopy + _copy: _install _img_mount + _config: _copy _img_mount + _bootloader_pc: _img_mount + _umount: _img_mount _config _bootloader_pc + _mbr: _partcopy _bootloader_pc else ifdef squash SQUASH := ${squash} - SYSROOT := sys_root/ + SYSROOT := sys_root_${release}/ CFGROOT := cfg_root/ + + PACKAGES += squashfs-tools nbd-client _target: _squash _install _config _bootstrap: _install: _bootstrap _copy: _install - _config: _copy - _squash: _config _squash_modules + _config: _copy _squash_modules + _squash: _config else ifdef raspi VOLUME := ${raspi} PBOOT := rpi_boot.img PROOT := rpi_root.img - SYSROOT := rpi_root/ + SYSROOT := rpi_root_${release}/ CFGROOT := img_mount/ ARCH := armhf KEYRING := keys/raspbian-archive-keyring.gpg BOOTSTRAP := http://raspbian.raspberrypi.org/raspbian - define SOURCES = - deb http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi - deb http://archive.raspberrypi.org/debian stretch main + define SOURCES := + deb http://raspbian.raspberrypi.org/raspbian ${release} main non-free firmware rpi + deb http://archive.raspberrypi.org/debian ${release} main endef -PACKAGES := ${PACKAGES} firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel + PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel - _target: _umount _partcopy _config _install + _target: _umount _config _qemu: _bootstrap: _qemu _install: _bootstrap _sparse: _format: _sparse - _mount: _format - _copy: _install _mount - _config: _copy _mount - _bootloader: _mount _bootloader_raspi - _umount: _mount _config _bootloader - _partition: _partition_raspi - _partcopy: _partition _umount + _partition_raspi: _sparse + _partcopy: _partition_raspi _format + _img_mount: _partcopy + _copy: _install _img_mount + _config: _copy _img_mount + _bootloader_raspi: _img_mount + _umount: _img_mount _config _bootloader_raspi else _target: @@ -134,16 +146,17 @@ endif export SOURCES SYSROOT CFGROOT VOLUME PBOOT PROOT SQUASH ARCH KEYRING BOOTSTRAP -sys_root/: - btrfs subvol create "$@" || mkdir -p "$@" +sys_root_${release}/: + btrfs subvol create "$@" || mkdir "$@" chmod 755 "$@" -cfg_root/: sys_root/ _install - btrfs sub snap "$<" "$@" || mkdir -p "$@" +cfg_root/: sys_root_${release}/ _install + -btrfs sub del "$@" || rm -r "$@" + btrfs sub snap "$<" "$@" || mkdir "$@" chmod 755 "$@" -rpi_root/: - btrfs subvol create "$@" || mkdir -p "$@" +rpi_root_${release}/: + btrfs subvol create "$@" || mkdir "$@" chmod 755 "$@" img_mount/: @@ -163,7 +176,9 @@ _bootstrap: ${SYSROOT}/bin/sh ${SYSROOT}/bin/sh: | ${SYSROOT} debootstrap --variant=minbase --arch="$${ARCH}" \ --keyring="$${KEYRING}" \ - stretch "$${SYSROOT}" "$${BOOTSTRAP}" + "${release}" "$${SYSROOT}" "$${BOOTSTRAP}" + printf 'APT::Default-Release "%s";' "${release}" >"$${SYSROOT}/etc/apt/apt.conf.d/10release" + .PHONY: _aptkeys _norecommends _aptkeys: ${SYSROOT}/etc/apt/trusted.gpg.d/ @@ -179,7 +194,7 @@ ${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT} cp keys/*.gpg "$@" _install: ${SYSROOT} _aptkeys _norecommends - printf '%s\n' "$${SOURCES}" >"$${SYSROOT}/etc/apt/sources.list" + printf '%s\n' "$${SOURCES}" |sort -u >"$${SYSROOT}/etc/apt/sources.list" -cp /etc/resolv.conf "$${SYSROOT}/etc/" -chroot "$${SYSROOT}" sh -c 'apt-mark showmanual |xargs apt-mark auto' -chroot "$${SYSROOT}" apt-get update @@ -193,14 +208,14 @@ _install: ${SYSROOT} _aptkeys _norecommends _copy: ${SYSROOT} ${CFGROOT} cp -au "$${SYSROOT}/." "$${CFGROOT}/" -.PHONY: _common_config -_config: _common_config -_common_config: ${CFGROOT} +_config: ${CFGROOT} ln -sf /dev/null "$${CFGROOT}/etc/systemd/network/99-default.link" + printf '\nsession optional pam_mkhomedir.so umask=0027\n' >>"$${CFGROOT}/etc/pam.d/common-session" printf 'LABEL=FSROOT / ext4 auto,nofail,rw 0 0\nLABEL=BOOT /boot vfat auto,nofail,ro 0 0\n' \ >"$${CFGROOT}/etc/fstab" + chroot "$${CFGROOT}" update-initramfs -u -${SQUASH}: ${CFGROOT} +${SQUASH}: ${CFGROOT} .FORCE -rm "$${SQUASH}" mksquashfs "$${CFGROOT}" "$${SQUASH}" -comp xz @@ -312,6 +327,14 @@ _mount: ${PBOOT} ${PROOT} ${CFG_ROOT} mkdir -p -m 755 "$${CFGROOT}/boot" mount -t vfat "$${PBOOT}" "$${CFGROOT}/boot" +_img_mount: + mount -o loop,offset="$$((${BOOT_MB} + 2))"M,sizelimit=${ROOT_MB}M \ + -t ext4 "$${VOLUME}" "$${CFGROOT}" + chmod 755 "$${CFGROOT}" + mkdir -p -m 755 "$${CFGROOT}/boot" + mount -o loop,offset=2M,sizelimit=${BOOT_MB}M \ + -t vfat "$${VOLUME}" "$${CFGROOT}/boot" + _umount: ${CFGROOT} -umount "$${CFGROOT}/boot" umount "$${CFGROOT}" && rmdir "$${CFGROOT}" @@ -324,9 +347,9 @@ clean: -umount hdd_mount/boot -umount hdd_mount -rmdir hdd_mount - if [ -d "sys_root/" ]; then btrfs sub del "sys_root/" || echo rm -r "sys_root/"; fi + if [ -d "sys_root_${release}/" ]; then btrfs sub del "sys_root_${release}/" || echo rm -r "sys_root_${release}/"; fi if [ -d "cfg_root/" ]; then btrfs sub del "cfg_root/" || echo rm -r "cfg_root/"; fi - if [ -d "rpi_root/" ]; then btrfs sub del "rpi_root/" || echo rm -r "rpi_root/"; fi + if [ -d "rpi_root_${release}/" ]; then btrfs sub del "rpi_root_${release}/" || echo rm -r "rpi_root_${release}/"; fi -rm part_boot.img -rm part_root.img -rm rpi_boot.img