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

Merge pull request #154 from austin987/fail-sooner

Browse Source 
Improve error handling when building
This commit is contained in:
SolidHal 2020-05-11 16:42:49 -07:00 committed by GitHub
commit 25d53118d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
makefile
View File

@ -68,11 +68,11 @@ clean_initramfs:
.PHONY: clean_all .PHONY: clean_all
clean_all: clean_all:
make clean_kernel $(MAKE) clean_kernel
make clean_ath $(MAKE) clean_ath
make clean_img $(MAKE) clean_img
make clean_basefs $(MAKE) clean_basefs
make clean_initramfs $(MAKE) clean_initramfs
.PHONY: build_dirs .PHONY: build_dirs
build_dirs: build_dirs:
@ -80,20 +80,20 @@ build_dirs:
.PHONY: kernel .PHONY: kernel
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 bash -x 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 bash -x 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) ] || bash -x scripts/buildFilesystem.sh $(KVER) $(DEBIAN_SUITE) $(BASE) 2>&1 | tee build/logs/fs-log.txt
@ -103,25 +103,25 @@ kernel_inject: #Targets an already built .img and swaps the old kernel with the
.PHONY: kernel_update .PHONY: kernel_update
kernel_update: kernel_update:
make initramfs $(MAKE) initramfs
make kernel $(MAKE) kernel
make kernel_inject $(MAKE) kernel_inject
.PHONY: injected_image .PHONY: injected_image
injected_image: #makes a copy of the base image with a new injected kernel injected_image: #makes a copy of the base image with a new injected kernel
make kernel $(MAKE) kernel
cp $(BASE) $(OUTNAME) cp $(BASE) $(OUTNAME)
make kernel_inject $(MAKE) kernel_inject
.PHONY: image .PHONY: image
image: image:
make clean_img $(MAKE) clean_img
make filesystem $(MAKE) filesystem
make initramfs $(MAKE) initramfs
make kernel $(MAKE) kernel
#Make a new copy of the filesystem image #Make a new copy of the filesystem image
cp $(BASE) $(OUTNAME) cp $(BASE) $(OUTNAME)
make kernel_inject $MAKE) kernel_inject
.PHONY: live_image .PHONY: live_image
live_image: live_image:

5
scripts/buildFilesystem.sh
View File

@ -1,4 +1,7 @@
#!/bin/bash -xe #!/bin/bash
set -x
set -e
# Build fs, image # Build fs, image

5
scripts/buildInitramFs.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh -xe #!/bin/bash
set -x
set -e
#Build initramfs image #Build initramfs image

5
scripts/buildKernel.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh -xe #!/bin/bash
set -x
set -e
#Build kenerl, wifi firmware #Build kenerl, wifi firmware

5
scripts/crossmenuconfig.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh -xe #!/bin/bash
set -x
set -e
#Runs Make menuconfig with the proper enviroment vars for cross compiling arm #Runs Make menuconfig with the proper enviroment vars for cross compiling arm
#Grabs the file named config in resources/BuildResources directory, and updates it #Grabs the file named config in resources/BuildResources directory, and updates it

5
scripts/injectKernelIntoFS.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh -xe #!/bin/bash
set -x
set -e
# This file is part of PrawnOS (http://www.prawnos.com) # This file is part of PrawnOS (http://www.prawnos.com)
# Copyright (c) 2018 Hal Emmerich <hal@halemmerich.com> # Copyright (c) 2018 Hal Emmerich <hal@halemmerich.com>

5
scripts/patchKernel.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh -xe #!/bin/bash
set -x
set -e
if [ -z "$1" ] if [ -z "$1" ]
then then