From 2e5e505da125f9d90dd63c1cbcb08bf5316b21ae Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Tue, 08 Mar 2016 00:51:47 -0500 Subject: build/config/*: Update to work with new build system --- (limited to 'resources/scripts/helpers/build/config/grubupdate') diff --git a/resources/scripts/helpers/build/config/grubupdate b/resources/scripts/helpers/build/config/grubupdate index 5bb1a57..f3db692 100755 --- a/resources/scripts/helpers/build/config/grubupdate +++ b/resources/scripts/helpers/build/config/grubupdate @@ -30,15 +30,26 @@ configpath="resources/libreboot/config/${payload}" hackconfig () { board="${1}" - - cd "coreboot/${payload}/${board}/" + cbrevision="$(cat ${configpath}/${board}/cbrevision)" + vbootrevision="$(cat ${configpath}/${board}/vbootrevision)" +( + cd "coreboot/${cbrevision}/${cbrevision}/" + git checkout ${payload}_${board} + ( + cd "3rdparty/vboot/" + git checkout ${payload}_${board} + ) printf "Updating config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 if [ ! -d "../../../${configpath}/${board}/" ]; then printf "build/config/grubupdate WARNING: config '%s' does not exist. Skipping.\n" "${board}" - cd "../../../" + git checkout master + ( + cd "3rdparty/vboot/" + git checkout master + ) return fi @@ -46,7 +57,12 @@ hackconfig () { make oldconfig mv ".config" "../../../${configpath}/${board}/config" - cd "../../../" + git checkout master + ( + cd "3rdparty/vboot/" + git checkout master + ) +) } if [ $# -lt 1 ]; then -- cgit v0.9.1