Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arm64/rpi4 support #27

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

arm64/rpi4 support #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 66 additions & 6 deletions share/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@ DEBIAN = $(shell [ $(DISTRO) = 'debian' ] && echo 'y')
FAB_ARCH = $(shell dpkg --print-architecture)
I386 = $(shell [ $(FAB_ARCH) = 'i386' ] && echo 'y')
AMD64 = $(shell [ $(FAB_ARCH) = 'amd64' ] && echo 'y')
ARM64 = $(shell [ $(FAB_ARCH) = 'arm64' ] && echo 'y')

ifeq ($(I386),y)
ARCH_FAMILY=x86
endif
ifeq ($(AMD64),y)
ARCH_FAMILY=x86
endif
ifeq ($(ARM64),y)
ARCH_FAMILY=arm
# NONFREE is used to get raspi-firmware and firmware-brcm80211
NONFREE=1
endif
ifndef ARCH_FAMILY
$(error unsupported architecture)
endif

ifdef FAB_POOL
FAB_POOL_PATH=$(FAB_PATH)/pools/$(CODENAME)
Expand All @@ -45,7 +61,7 @@ endif

COMMON_PATCHES := turnkey.d $(COMMON_PATCHES)

CONF_VARS_BUILTIN ?= FAB_ARCH FAB_HTTP_PROXY I386 AMD64 RELEASE DISTRO CODENAME DEBIAN UBUNTU KERNEL DEBUG CHROOT_ONLY
CONF_VARS_BUILTIN ?= FAB_ARCH FAB_HTTP_PROXY I386 AMD64 ARM64 RELEASE DISTRO CODENAME DEBIAN UBUNTU KERNEL DEBUG CHROOT_ONLY

define filter-undefined-vars
$(foreach var,$1,$(if $($(var)), $(var)))
Expand Down Expand Up @@ -136,8 +152,12 @@ endef
ifdef CHROOT_ONLY
all: root.sandbox
else
ifeq ($(ARCH_FAMILY),arm)
all: $O/product.img
else
all: $O/product.iso
endif
endif

define mount-deck
@(deck $1 > /dev/null 2>&1) && echo deck $1 || true
Expand Down Expand Up @@ -173,6 +193,7 @@ define help/body
@echo ' CONF_VARS $(value CONF_VARS)'
@echo
@echo ' FAB_ARCH $(value FAB_ARCH)'
@echo ' ARCH_FAMILY $(value ARCH_FAMILY)'
@echo ' FAB_POOL $(value FAB_POOL)'
@echo ' FAB_POOL_PATH $(value FAB_POOL_PATH)'
@echo ' FAB_PLAN_INCLUDE_PATH $(value FAB_PLAN_INCLUDE_PATH)/'
Expand Down Expand Up @@ -222,7 +243,12 @@ define help/body
@echo '# remake target and the targets that depend on it'
@echo '$$ rm $(value STAMPS_DIR)/<target>; make <target>'
@echo
@echo '# build a target (default: product.iso)'
@if [ "$(ARCH_FAMILY)" = "arm" ]; \
then \
echo '# build a target (default: product.img)'; \
else \
echo '# build a target (default: product.iso)'; \
fi
@echo '$$ make [target] [O=path/to/build/dir]'
@echo ' redeck # deck unmounted input/output decks (e.g., after reboot)'
@echo
Expand All @@ -231,19 +257,24 @@ define help/body
@echo ' root.spec # the spec from which root.build is built (I.e., resolved plan)'
@echo ' root.build # created by applying the root.spec to the bootstrap'
@echo ' root.patched # deck root.build and apply the root overlay and removelist'
@echo
@echo
@echo ' root.sandbox # changes (e.g., manual prototyping) inside the copy-on-write sandbox'
@echo ' # saved as a separate, temporary cdroot squashfs overlay'
@echo
endef

ifndef CHROOT_ONLY
ifeq ($(ARCH_FAMILY),arm)
help/body += ;\
echo ' product.img \# product img for raspberry pi 4';
else
help/body += ;\
echo ' cdroot \# created by squashing root.patched into cdroot template + overlay'; \
echo ' product.iso \# product ISO created from the cdroot'; \
echo; \
echo ' updated-initramfs \# rebuild product with updated initramfs'
endif
endif

help:
$(help/pre)
Expand All @@ -255,7 +286,7 @@ define clean/body
$(call remove-deck, $O/root.patched)
$(call remove-deck, $O/root.build)
$(call remove-deck, $O/bootstrap)
-rm -rf $O/root.spec $O/cdroot $O/product.iso $O/log $O/screens $(STAMPS_DIR)
-rm -rf $O/root.spec $O/cdroot $O/product.iso $O/log $O/screens $O/sdroot $O/product.img $O/product.img.xz $(STAMPS_DIR)
endef

clean:
Expand Down Expand Up @@ -303,7 +334,7 @@ define run-conf-scripts
if [ -n "$(wildcard $1/*)" ]; then \
echo "\$$(call $0,$1)"; \
fi; \
for script in $1/*; do \
for script in $1/* $1/$(ARCH_FAMILY).d/*; do \
[ -f "$$script" ] && [ -x "$$script" ] || continue; \
args_path=$(strip $1)/args/$$(echo $$(basename $$script) | sed 's/^[^a-zA-Z]*//'); \
args="$$([ -f $$args_path ] && (cat $$args_path | sed 's/#.*//'))"; \
Expand Down Expand Up @@ -337,7 +368,8 @@ define root.patched/body
# apply the common overlays
$(foreach overlay,$(_COMMON_OVERLAYS),
@if echo $(overlay) | grep -q '\.d$$'; then \
for d in $(overlay)/*; do \
for d in $(overlay)/* $(overlay)/$(ARCH_FAMILY).d/*; do \
if echo $$d | grep -q '\.d$$'; then continue; fi; \
echo fab-apply-overlay $$d $O/root.patched; \
fab-apply-overlay $$d $O/root.patched; \
done; \
Expand Down Expand Up @@ -494,6 +526,26 @@ define product.iso/body
$(run-isohybrid)
endef

# target: product.img
define product.img/body
qemu-img create -f raw $O/product.img 2G
parted -s $O/product.img mklabel msdos
parted -s $O/product.img -- mkpart primary fat32 4MiB 400MiB
parted -s $O/product.img -- mkpart primary ext2 400MiB 100%
kpartx -asv $O/product.img
mkfs -t vfat -n RASPIFIRM /dev/mapper/loop0p1
mkfs -t ext4 -L RASPIROOT /dev/mapper/loop0p2
mkdir -p $O/sdroot
mount /dev/mapper/loop0p2 $O/sdroot
mkdir -p $O/sdroot/boot/firmware
mount /dev/mapper/loop0p1 $O/sdroot/boot/firmware
cp -ax $O/root.sandbox/* $O/sdroot
umount $O/sdroot/boot/firmware
umount $O/sdroot
kpartx -dsv $O/product.img
xz -8 -f $O/product.img
endef

cdroot-dynamic: $(STAMPS_DIR)/root.sandbox
$(cdroot-dynamic/pre)
$(cdroot-dynamic/body)
Expand Down Expand Up @@ -530,6 +582,14 @@ $O/product.iso: $(product.iso/deps) $(product.iso/deps/extra)

product.iso: $O/product.iso

product.img/deps ?= $(STAMPS_DIR)/root.sandbox
$O/product.img: $(product.img/deps) $(product.img/deps/extra)
$(product.img/pre)
$(product.img/body)
$(product.img/post)

product.img: $O/product.img

# target: updated-initramfs
define updated-initramfs/body
rm -rf $O/product.iso
Expand Down