canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor code cleanup in the build system 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-06-09 18:48:58 +01:00 committed by Leah Rowe
parent 070aee6728
commit 4f6fbfde81
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build
View File

@ -123,8 +123,7 @@ fetch_trees()
fail() fail()
{ {
tmp_cleanup || printf "WARNING: can't rm tmp files: %s\n" "$tmpdir" \ tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$tmpdir" 1>&2
1>&2
err_ "${1}" err_ "${1}"
} }

2
config/u-boot/default/nuke.list
View File

@ -1,4 +1,4 @@
doc/ doc
Licenses/r8a779x_usb3.txt Licenses/r8a779x_usb3.txt
drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
arch/mips/mach-octeon/include/mach/cvmx-pki-cluster.h arch/mips/mach-octeon/include/mach/cvmx-pki-cluster.h

3
include/git.sh
View File

@ -11,8 +11,7 @@ fetch_project_trees()
[ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \ [ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \
&& fetch_project_repo "$project" && fetch_project_repo "$project"
fetch_config fetch_config
e "src/$project/$tree" d && return 0 e "src/$project/$tree" d || prepare_new_tree; return 0
prepare_new_tree
} }
fetch_config() fetch_config()

7
script/roms
View File

@ -152,10 +152,9 @@ configure_target()
[ -n "$_scandisk" ] && grub_scan_disk="$_scandisk" [ -n "$_scandisk" ] && grub_scan_disk="$_scandisk"
[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata"
_ata=""
_ahci="" eval "$(setvars "" _ata _ahci _nvme _grub_scan_disk)"
_nvme=""
_grub_scan_disk=""
for _disk in $grub_scan_disk; do for _disk in $grub_scan_disk; do
[ "$_disk" != "nvme" ] && [ "$_disk" != "ahci" ] && \ [ "$_disk" != "nvme" ] && [ "$_disk" != "ahci" ] && \
[ "$_disk" != "ata" ] && _grub_scan_disk="nvme ahci ata" \ [ "$_disk" != "ata" ] && _grub_scan_disk="nvme ahci ata" \