pikvm/pi-builder
1
0
Fork 0
mirror of https://github.com/pikvm/pi-builder.git synced 2025-04-19 06:22:16 +03:00
Code

separate disk configs

Browse Source
This commit is contained in:
Maxim Devaev 2023-11-17 02:56:24 +02:00
parent 7b7b92ddd5
commit 94237251d7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -51,6 +51,7 @@ export RPIOS_IMAGES_URL ?= https://downloads.raspberrypi.com
export QEMU_REPO_URL ?= https://ftp.debian.org/debian/pool/main/q/qemu
DISK ?= ./disk/$(OS).conf
CARD ?= /dev/mmcblk0
IMAGE ?= ./$(PROJECT).$(OS)-$(BOARD)-$(ARCH).img
IMAGE_XZ ?=
@ -301,7 +302,7 @@ extract: $(__DEP_TOOLBOX)
install: $(__DEP_TOOLBOX) extract
$(call check_build)
$(call say,"Installing to $(CARD)")
cat disk.conf | $(DOCKER_RUN_INT) \
cat $(DISK) | $(DOCKER_RUN_INT) \
--privileged \
$(_CACHE_VOLUME_OPTS) \
$(_TOOLBOX_IMAGE) \
@ -317,7 +318,7 @@ image: $(__DEP_TOOLBOX) extract
$(call say,"Creating image $(IMAGE)")
$(call remove_image)
touch $(_RESULT_IMAGE)
cat disk.conf | $(DOCKER_RUN_INT) \
cat $(DISK) | $(DOCKER_RUN_INT) \
--volume=/dev:/root/dev \
--privileged \
$(_CACHE_VOLUME_OPTS) \

4
base/Makefile
View File

@ -56,11 +56,11 @@ $(call append,,.tgz,$(_RPIOS_LIST)):
set -Eeuo pipefail \
&& loop=`$(SUDO) losetup -P -f --show $(_base).img` \
&& $(SUDO) mount $${loop}p2 $(_base).mnt \
&& $(SUDO) mount $${loop}p1 $(_base).mnt/boot \
&& $(SUDO) mount $${loop}p1 $(_base).mnt/boot/firmware \
&& $(SUDO) tar -czf $@.tmp -C $(_base).mnt . \
&& $(SUDO) chown `id -u`:`id -g` $@.tmp \
&& $(SUDO) mv $@.tmp $@ \
&& $(SUDO) umount $(_base).mnt/boot \
&& $(SUDO) umount $(_base).mnt/boot/firmware \
&& $(SUDO) umount $(_base).mnt \
&& $(SUDO) losetup -d $$loop
#

0
disk.conf → disk/arch.conf
View File

3
disk/rpios.conf Normal file
View File

@ -0,0 +1,3 @@
mklabel msdos
mkpart primary fat32 0 512MiB # label=PIBOOTFW mount=/boot/firmware
mkpart primary ext4 512MiB 4608MiB # label=PIROOT mount=/