scjudd
/
airgap
forked from public/airgap
1
0
Fork 0
Code Pull Requests Activity

compatibility fixes with new toolchain version

This commit is contained in:
Lance Vick 2023-02-12 03:00:11 -08:00
parent df06a8f87c
commit a665837795
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
cache/ cache/
out/ out/
release/develop
.* .*

12
Makefile
View File

@ -4,7 +4,7 @@ include $(PWD)/src/toolchain/Makefile
.PHONY: clean .PHONY: clean
clean: toolchain clean: toolchain
rm -f $(OUT_DIR) $(CACHE_DIR)/buildroot-ccache || : rm -rf $(OUT_DIR) $(CACHE_DIR)/buildroot-ccache || :
$(call toolchain,$(USER)," \ $(call toolchain,$(USER)," \
cd $(FETCH_DIR)/buildroot; \ cd $(FETCH_DIR)/buildroot; \
make clean; \ make clean; \
@ -39,11 +39,11 @@ vm: toolchain
qemu-system-i386 \ qemu-system-i386 \
-M pc \ -M pc \
-nographic \ -nographic \
-cdrom "${HOME}/release/${TARGET}/airgap.iso"; \ -cdrom "$(OUT_DIR)/airgap.iso"; \
") ")
.PHONY: release .PHONY: release
release: | \ release: \
$(OUT_DIR)/airgap.iso \ $(OUT_DIR)/airgap.iso \
$(OUT_DIR)/manifest.txt $(OUT_DIR)/manifest.txt
mkdir -p $(DIST_DIR) mkdir -p $(DIST_DIR)
@ -52,13 +52,12 @@ release: | \
cp $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt cp $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt
$(FETCH_DIR)/buildroot: toolchain $(FETCH_DIR)/buildroot: toolchain
$(call git_clone,buildroot,$(BUILDROOT_REPO),$(BUILDROOT_REF)) $(call git_clone,$(FETCH_DIR)/buildroot,$(BUILDROOT_REPO),$(BUILDROOT_REF))
$(OUT_DIR)/airgap.iso: \ $(OUT_DIR)/airgap.iso: \
toolchain \
$(FETCH_DIR)/buildroot \ $(FETCH_DIR)/buildroot \
$(OUT_DIR)/release.env $(OUT_DIR)/release.env
$(call apply_patches,$(FETCH_DIR)/buildroot,$(BR2_EXTERNAL)/patches) $(call apply_patches,$(FETCH_DIR)/buildroot,$(CONFIG_DIR)/buildroot/patches)
$(call toolchain,$(USER)," \ $(call toolchain,$(USER)," \
cd $(FETCH_DIR)/buildroot; \ cd $(FETCH_DIR)/buildroot; \
make "airgap_$(TARGET)_defconfig"; \ make "airgap_$(TARGET)_defconfig"; \
@ -66,6 +65,5 @@ $(OUT_DIR)/airgap.iso: \
make source; \ make source; \
make; \ make; \
") ")
mkdir -p $(OUT_DIR)
cp $(FETCH_DIR)/buildroot/output/images/rootfs.iso9660 \ cp $(FETCH_DIR)/buildroot/output/images/rootfs.iso9660 \
$(OUT_DIR)/airgap.iso $(OUT_DIR)/airgap.iso