isa/citadel
1
0
Fork 0
forked from brl/citadel
Code Pull Requests Activity

Make realmfs not appimg

Browse Source
This commit is contained in:
Bruce Leidl 2019-04-02 15:55:56 -04:00
parent bb36825661
commit fd7aad9f3b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -1,4 +1,4 @@
.PHONY: help docker-image docker-shell citadel-image citadel-kernel user-rootfs update-submodules build-appimg install-build-deps installer .PHONY: help docker-image docker-shell citadel-image citadel-kernel user-rootfs update-submodules realmfs install-build-deps installer
BASE_DIR = $(shell pwd) BASE_DIR = $(shell pwd)
BASE_BINDMOUNT = type=bind,source=$(BASE_DIR),target=/home/builder/citadel BASE_BINDMOUNT = type=bind,source=$(BASE_DIR),target=/home/builder/citadel
@ -10,7 +10,7 @@ undefine DOCKER_RUN
undefine DOCKER_RUN_PRIV undefine DOCKER_RUN_PRIV
endif endif
APPIMG_TARFILE = build/appimg/appimg-rootfs.tar.xz REALMFS_IMAGE = build/realmfs/citadel-realmfs.ext4
INSTALLER_IMAGE = build/images/citadel-installer.img INSTALLER_IMAGE = build/images/citadel-installer.img
# #
@ -20,7 +20,7 @@ help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
installer: ${APPIMG_TARFILE} ## Build citadel installer image (This will build everything) installer: ${REALMFS_IMAGE} ## Build citadel installer image (This will build everything)
$(DOCKER_RUN) bash -c "source setup-build-env && bitbake --continue citadel-installer-image" $(DOCKER_RUN) bash -c "source setup-build-env && bitbake --continue citadel-installer-image"
@echo "Installer image:" @echo "Installer image:"
@ls -l $(INSTALLER_IMAGE) @ls -l $(INSTALLER_IMAGE)
@ -31,8 +31,8 @@ rootfs: ## Build only citadel rootfs image
kernel: ## Build only citadel kernel kernel: ## Build only citadel kernel
$(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-kernel" $(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-kernel"
appimg: ## Build only application image realmfs: ## Build only base realmfs image
$(DOCKER_RUN_PRIV) bash -c 'sudo APPIMG_BUILDER_BASE=$${PWD}/appimg-builder appimg-builder/stage-one.sh --no-confirm -z -d build/appimg' $(DOCKER_RUN_PRIV) bash -c 'sudo REALMFS_BUILDER_BASE=$${PWD}/realmfs-builder realmfs-builder/stage-one.sh --no-confirm -i -d build/realmfs'
docker-image: ## Create docker builder image. You need to run this one time before running anything else. docker-image: ## Create docker builder image. You need to run this one time before running anything else.
docker build -t citadel-builder scripts/docker docker build -t citadel-builder scripts/docker
@ -55,11 +55,11 @@ kernel-test: ## Boot kernel with Qemu ('ctrl-a x' to exit qemu)
@scripts/qemu-boot kernel @scripts/qemu-boot kernel
install-build-deps: install-build-deps:
sudo apt install --no-install-recommends build-essential python bzip2 cpio chrpath diffstat file texinfo inkscape libgmp-dev libmpc-dev libelf-dev gawk sudo apt install --no-install-recommends build-essential python bzip2 cpio chrpath diffstat file texinfo inkscape libgmp-dev libmpc-dev libelf-dev gawk wget
$(APPIMG_TARFILE): $(REALMFS_IMAGE):
@mkdir -p build/appimg @mkdir -p build/realmfs
$(DOCKER_RUN_PRIV) bash -c 'sudo APPIMG_BUILDER_BASE=$${PWD}/appimg-builder appimg-builder/stage-one.sh --no-confirm -z -d build/appimg' $(DOCKER_RUN_PRIV) bash -c 'sudo REALMFS_BUILDER_BASE=$${PWD}/realmfs-builder realmfs-builder/stage-one.sh --no-confirm -i -d build/realmfs'
$(INSTALLER_IMAGE): $(APPIMG_TARFILE) $(INSTALLER_IMAGE): $(REALMFS_IMAGE)
$(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-installer-image" $(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-installer-image"