aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwift Geek <swiftgeek@gmail.com>2019-11-03 22:55:13 +0000
committerGogs <gogitservice@gmail.com>2019-11-03 22:55:13 +0000
commitcc0ff53ec2ae9e576824dd92ed441e8766f73014 (patch)
treef82621cca0c84a10491c84b1ee8e24f267d40250
parentb7b39afdd822e582140c3767e71efd40fd4875ae (diff)
parent7c58ae4cdf4c31188a581ca7685bda889132dda9 (diff)
downloadlibrebootfr-cc0ff53ec2ae9e576824dd92ed441e8766f73014.tar.gz
librebootfr-cc0ff53ec2ae9e576824dd92ed441e8766f73014.zip
Merge branch 'bugs' of and_who/libreboot into master
-rwxr-xr-xlibs/project2
-rwxr-xr-xprojects/grub/grub30
-rwxr-xr-xprojects/ich9gen/ich9gen17
3 files changed, 22 insertions, 27 deletions
diff --git a/libs/project b/libs/project
index 673689ee..d884556d 100755
--- a/libs/project
+++ b/libs/project
@@ -217,6 +217,8 @@ project_action() {
printf '%s\n' "Project $project $action (with ${arguments:-no argument})"
(
+ set -e
+
"$action" "$@"
)
diff --git a/projects/grub/grub b/projects/grub/grub
index 75d29380..ada5c338 100755
--- a/projects/grub/grub
+++ b/projects/grub/grub
@@ -75,28 +75,24 @@ build() {
local build_path="$(project_build_path "$project" "$@")"
local raw_keymap_path="$project_path/$CONFIGS/keymaps"
- (
- set -e
+ mkdir -p "$build_path"
- mkdir -p "$build_path"
+ grub_build_utils
- grub_build_utils
-
- if [[ "$target" == 'bios' ]]; then
- grub_build_floppy_image
- else
- grub_build_standalone_image
- fi
+ if [[ "$target" == 'bios' ]]; then
+ grub_build_floppy_image
+ else
+ grub_build_standalone_image
+ fi
- for raw_keymap in "$raw_keymap_path"/*; do
- grub_build_layout "$raw_keymap"
- done
+ for raw_keymap in "$raw_keymap_path"/*; do
+ grub_build_layout "$raw_keymap"
+ done
- grub_build_font
- grub_copy_modules
+ grub_build_font
+ grub_copy_modules
- make -C "$sources_path" distclean
- )
+ make -C "$sources_path" distclean
}
build_check() {
diff --git a/projects/ich9gen/ich9gen b/projects/ich9gen/ich9gen
index 71567329..5ba9ae2f 100755
--- a/projects/ich9gen/ich9gen
+++ b/projects/ich9gen/ich9gen
@@ -58,23 +58,20 @@ build() {
fi
local sources_path="$(project_sources_path "$project" "$repository" "$@")"
-
local build_path="$(project_build_path "$project" "$@")"
mkdir -p "$build_path"
make -C "$sources_path" -j"$TASKS" ich9gen
- (
- local macaddress="$(ich9gen_macaddress)"
+ local macaddress="$(ich9gen_macaddress)"
- cd "$build_path"
+ cd "$build_path"
- if [[ -n $macaddress ]]; then
- "$sources_path"/ich9gen --macaddress "$macaddress"
- else
- "$sources_path"/ich9gen
- fi
- )
+ if [[ -n $macaddress ]]; then
+ "$sources_path"/ich9gen --macaddress "$macaddress"
+ else
+ "$sources_path"/ich9gen
+ fi
cp "$sources_path/ich9gen" "$build_path"
make -C "$sources_path" clean