diff options
Diffstat (limited to 'resources/scripts')
| -rwxr-xr-x | resources/scripts/helpers/build/config/dcmodify | 24 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/config/dcreplace | 18 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/config/dcupdate | 24 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/config/grubmodify | 24 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/config/grubreplace | 18 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/config/grubupdate | 24 |
6 files changed, 110 insertions, 22 deletions
diff --git a/resources/scripts/helpers/build/config/dcmodify b/resources/scripts/helpers/build/config/dcmodify index 90c65783..b8d55d72 100755 --- a/resources/scripts/helpers/build/config/dcmodify +++ b/resources/scripts/helpers/build/config/dcmodify @@ -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 "Modifying config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 if [ ! -d "../../../${configpath}/${board}/" ]; then printf "build/config/dcmodify 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 menuconfig mv ".config" "../../../${configpath}/${board}/config" - cd "../../../" + git checkout master + ( + cd "3rdparty/vboot/" + git checkout master + ) +) } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/dcreplace b/resources/scripts/helpers/build/config/dcreplace index 13511fcc..b4b05ffb 100755 --- a/resources/scripts/helpers/build/config/dcreplace +++ b/resources/scripts/helpers/build/config/dcreplace @@ -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 diff --git a/resources/scripts/helpers/build/config/dcupdate b/resources/scripts/helpers/build/config/dcupdate index cfea022d..37ac854a 100755 --- a/resources/scripts/helpers/build/config/dcupdate +++ b/resources/scripts/helpers/build/config/dcupdate @@ -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/dcupdate 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 diff --git a/resources/scripts/helpers/build/config/grubmodify b/resources/scripts/helpers/build/config/grubmodify index f05f22e7..a9ccccb0 100755 --- a/resources/scripts/helpers/build/config/grubmodify +++ b/resources/scripts/helpers/build/config/grubmodify @@ -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 "Modifying config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 if [ ! -d "../../../${configpath}/${board}/" ]; then printf "build/config/grubmodify 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 menuconfig mv ".config" "../../../${configpath}/${board}/config" - cd "../../../" + git checkout master + ( + cd "3rdparty/vboot/" + git checkout master + ) +) } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/grubreplace b/resources/scripts/helpers/build/config/grubreplace index 87d89599..2c14eaba 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 diff --git a/resources/scripts/helpers/build/config/grubupdate b/resources/scripts/helpers/build/config/grubupdate index 5bb1a57e..f3db6923 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 |