g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefile: make sure SHELL is invoked with set -o pipefail

Browse Source
This commit is contained in:
Austin English 2020-05-24 18:49:52 -05:00
parent 9a38a9943e
commit 845bde8d94
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefile
View File

@ -23,6 +23,8 @@ endif
OUTNAME=PrawnOS-$(PRAWNOS_SUITE)-c201.img OUTNAME=PrawnOS-$(PRAWNOS_SUITE)-c201.img
BASE=$(OUTNAME)-BASE BASE=$(OUTNAME)-BASE
# Otherwise errors are ignored when output is piped to tee:
SHELL=/bin/bash -o pipefail
#Usage: #Usage:
#run make image #run make image
@ -82,20 +84,20 @@ build_dirs:
kernel: kernel:
$(MAKE) build_dirs $(MAKE) build_dirs
rm -rf build/logs/kernel-log.txt rm -rf build/logs/kernel-log.txt
bash -x scripts/buildKernel.sh $(KVER) 2>&1 | tee build/logs/kernel-log.txt ./scripts/buildKernel.sh $(KVER) 2>&1 | tee build/logs/kernel-log.txt
.PHONY: initramfs .PHONY: initramfs
initramfs: initramfs:
$(MAKE) build_dirs $(MAKE) build_dirs
rm -rf build/logs/kernel-log.txt rm -rf build/logs/kernel-log.txt
bash -x scripts/buildInitramFs.sh $(BASE) 2>&1 | tee build/logs/initramfs-log.txt ./scripts/buildInitramFs.sh $(BASE) 2>&1 | tee build/logs/initramfs-log.txt
#makes the base filesystem image, no kernel only if the base image isnt present #makes the base filesystem image, no kernel only if the base image isnt present
.PHONY: filesystem .PHONY: filesystem
filesystem: filesystem:
$(MAKE) build_dirs $(MAKE) build_dirs
rm -rf build/logs/kernel-log.txt rm -rf build/logs/kernel-log.txt
[ -f $(BASE) ] || bash -x scripts/buildFilesystem.sh $(KVER) $(DEBIAN_SUITE) $(BASE) 2>&1 | tee build/logs/fs-log.txt [ -f $(BASE) ] || ./scripts/buildFilesystem.sh $(KVER) $(DEBIAN_SUITE) $(BASE) 2>&1 | tee build/logs/fs-log.txt
.PHONY: kernel_inject .PHONY: kernel_inject
kernel_inject: #Targets an already built .img and swaps the old kernel with the newly compiled kernel kernel_inject: #Targets an already built .img and swaps the old kernel with the newly compiled kernel