From 4d3f081f061fd9e3de08ed7f2516cff2b5f2a0df Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Thu, 1 Feb 2024 23:08:03 +0100
Subject: cleanup makefile + add missing dependency in containerfile

---
 Containerfile |  1 +
 makefile      | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Containerfile b/Containerfile
index 5b98b10..000e1a2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -12,6 +12,7 @@ run xbps-install -Sy git
 run xbps-install -Sy gcc
 run xbps-install -Sy flex
 run xbps-install -Sy openssl-devel
+run xbps-install -Sy bc
 
 # container directory on which the working directory on host is mounted
 workdir /workdir
diff --git a/makefile b/makefile
index 3bfd896..c667590 100644
--- a/makefile
+++ b/makefile
@@ -9,7 +9,13 @@ CP := sudo -n cp
 GIT := git
 
 CTR_IMG_TAG := avans-linux
-CTRIZE := $(CTR) run --rm --interactive --tty --volume .:/workdir:rw --user $(shell id -u):$(shell id -g) --env-file ./env $(CTR_IMG_TAG)
+
+CTRIZE := $(CTR) run --rm --interactive --tty
+CTRIZE += --volume .:/workdir:rw
+# CTRIZE += --volume /tmp:/tmp:rw
+CTRIZE += --user $(shell id -u):$(shell id -g)
+CTRIZE += --env-file ./env
+CTRIZE += $(CTR_IMG_TAG)
 
 .PHONY: all
 all: os_bootloader
@@ -25,12 +31,10 @@ $(SUBMODULE_INIT):
 	$(GIT) submodule init
 	$(GIT) submodule update
 
-MKFLAGS += -j $(shell nproc)
-
 .PHONY: os_bootloader
 os_bootloader: container_img $(SUBMODULE_INIT)
-	$(CTRIZE) make -C u-boot $(MKFLAGS) am335x_evm_config
-	$(CTRIZE) make -C u-boot $(MKFLAGS)
+	$(CTRIZE) $(MAKE) -$(MAKEFLAGS) -C u-boot am335x_evm_config
+	$(CTRIZE) $(MAKE) -$(MAKEFLAGS) -C u-boot
 
 # sd card block device (assumed partition numbers, see readme.md)
 SDCARD_BD := $(shell realpath /dev/disk/by-id/usb-Generic-_Multi-Card_20071114173400000-0:0)
-- 
cgit v1.2.3