[coreboot-gerrit] Change in coreboot[master]: util/abuild: Allow use of payloads when not providing a configfile

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/23676


Change subject: util/abuild: Allow use of payloads when not providing a configfile
......................................................................

util/abuild: Allow use of payloads when not providing a configfile

This only worked if a configfile is provided.

Change-Id: I4368d9609bceb4cf7edb76c10bc0af0cdeb76958
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M util/abuild/abuild
1 file changed, 3 insertions(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/23676/1

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 91c5bf9..e2cad28 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -292,13 +292,15 @@
 
 	if [ -z "$config_file" ]; then
 		create_config "$BUILD_NAME" "$build_dir"
+		local new_config_file="${build_dir}/config.build"
 	else
 		local new_config_file="${build_dir}/config.build"
 		cp "$config_file" "$new_config_file"
-		update_config "$BUILD_NAME" "$build_dir" "$new_config_file"
 	fi
 	local ret=$?
 
+	update_config "$BUILD_NAME" "$build_dir" "$new_config_file"
+
 	# Allow simple "make" in the target directory
 	local MAKEFILE=$TARGET/${BUILD_NAME}/Makefile
 	echo "# autogenerated" > "$MAKEFILE"

-- 
To view, visit https://review.coreboot.org/23676
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4368d9609bceb4cf7edb76c10bc0af0cdeb76958
Gerrit-Change-Number: 23676
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180209/c788bada/attachment-0001.html>