From 3c57f8e0ab832a65fb243c3ac85f8f58bba1a88c Mon Sep 17 00:00:00 2001 From: Austin English Date: Sat, 9 May 2020 04:00:02 -0500 Subject: [PATCH 1/4] scripts: move sets out of shebang The makefile calls the scripts with `bash -x ...`, which overrides the shebang, so the -e is dropped. --- scripts/buildFilesystem.sh | 5 ++++- scripts/buildInitramFs.sh | 5 ++++- scripts/buildKernel.sh | 5 ++++- scripts/crossmenuconfig.sh | 5 ++++- scripts/injectKernelIntoFS.sh | 5 ++++- scripts/patchKernel.sh | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index b81605f..2e4c2ae 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -1,4 +1,7 @@ -#!/bin/bash -xe +#!/bin/bash + +set -x +set -e # Build fs, image diff --git a/scripts/buildInitramFs.sh b/scripts/buildInitramFs.sh index 5bd2dc6..75a80d1 100755 --- a/scripts/buildInitramFs.sh +++ b/scripts/buildInitramFs.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e #Build initramfs image diff --git a/scripts/buildKernel.sh b/scripts/buildKernel.sh index 150f06f..281ddd0 100755 --- a/scripts/buildKernel.sh +++ b/scripts/buildKernel.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e #Build kenerl, wifi firmware diff --git a/scripts/crossmenuconfig.sh b/scripts/crossmenuconfig.sh index efc9eed..c6c6deb 100755 --- a/scripts/crossmenuconfig.sh +++ b/scripts/crossmenuconfig.sh @@ -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 #Grabs the file named config in resources/BuildResources directory, and updates it diff --git a/scripts/injectKernelIntoFS.sh b/scripts/injectKernelIntoFS.sh index fa19720..2491464 100755 --- a/scripts/injectKernelIntoFS.sh +++ b/scripts/injectKernelIntoFS.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e # This file is part of PrawnOS (http://www.prawnos.com) # Copyright (c) 2018 Hal Emmerich diff --git a/scripts/patchKernel.sh b/scripts/patchKernel.sh index 6a435b6..8850daa 100755 --- a/scripts/patchKernel.sh +++ b/scripts/patchKernel.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e if [ -z "$1" ] then From 913ee4d44252bc78884cf39c17809ab9f52cd5dd Mon Sep 17 00:00:00 2001 From: Austin English Date: Sun, 10 May 2020 03:01:52 -0500 Subject: [PATCH 2/4] makefile: use $(MAKE) instead of make --- makefile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/makefile b/makefile index 170e4fd..e436454 100644 --- a/makefile +++ b/makefile @@ -68,11 +68,11 @@ clean_initramfs: .PHONY: clean_all clean_all: - make clean_kernel - make clean_ath - make clean_img - make clean_basefs - make clean_initramfs + $(MAKE) clean_kernel + $(MAKE) clean_ath + $(MAKE) clean_img + $(MAKE) clean_basefs + $(MAKE) clean_initramfs .PHONY: build_dirs build_dirs: @@ -80,20 +80,20 @@ build_dirs: .PHONY: kernel kernel: - make build_dirs + $(MAKE) build_dirs rm -rf build/logs/kernel-log.txt bash -x scripts/buildKernel.sh $(KVER) 2>&1 | tee build/logs/kernel-log.txt .PHONY: initramfs initramfs: - make build_dirs + $(MAKE) build_dirs rm -rf build/logs/kernel-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 .PHONY: filesystem filesystem: - make build_dirs + $(MAKE) build_dirs 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 @@ -103,25 +103,25 @@ kernel_inject: #Targets an already built .img and swaps the old kernel with the .PHONY: kernel_update kernel_update: - make initramfs - make kernel - make kernel_inject + $(MAKE) initramfs + $(MAKE) kernel + $(MAKE) kernel_inject .PHONY: injected_image injected_image: #makes a copy of the base image with a new injected kernel - make kernel + $(MAKE) kernel cp $(BASE) $(OUTNAME) - make kernel_inject + $(MAKE) kernel_inject .PHONY: image image: - make clean_img - make filesystem - make initramfs - make kernel + $(MAKE) clean_img + $(MAKE) filesystem + $(MAKE) initramfs + $(MAKE) kernel #Make a new copy of the filesystem image cp $(BASE) $(OUTNAME) - make kernel_inject + $MAKE) kernel_inject .PHONY: live_image live_image: From 1a5f93e3fb2d60cc65e23d9ad331f011af60e420 Mon Sep 17 00:00:00 2001 From: Austin English Date: Wed, 13 May 2020 03:45:26 -0500 Subject: [PATCH 3/4] typo --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index e436454..ccf5ee9 100644 --- a/makefile +++ b/makefile @@ -121,7 +121,7 @@ image: $(MAKE) kernel #Make a new copy of the filesystem image cp $(BASE) $(OUTNAME) - $MAKE) kernel_inject + $(MAKE) kernel_inject .PHONY: live_image live_image: From c6f459e52565c0b1a1be0fbc64da54581a6572c0 Mon Sep 17 00:00:00 2001 From: Austin English Date: Thu, 14 May 2020 09:43:52 -0500 Subject: [PATCH 4/4] .gitmodules: add missing file --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b488dcd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "resources/InstallResources/fonts/source-code-pro"] + path = resources/InstallResources/fonts/source-code-pro + url = https://github.com/adobe-fonts/source-code-pro/