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/grubreplace') diff --git a/resources/scripts/helpers/build/config/grubreplace b/resources/scripts/helpers/build/config/grubreplace index 87d8959..2c14eab 100755 --- a/resources/scripts/helpers/build/config/grubreplace +++ b/resources/scripts/helpers/build/config/grubreplace @@ -30,8 +30,15 @@ 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 "Replacing or creating new config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 @@ -41,7 +48,12 @@ hackconfig () { [ ! -d "../../../${configpath}/${board}/" ] && mkdir -p "../../../${configpath}/${board}/" mv ".config" "../../../${configpath}/${board}/config" - cd "../../../" + git checkout master + ( + cd "3rdparty/vboot/" + git checkout master + ) +) } if [ $# -lt 1 ]; then -- cgit v0.9.1