summaryrefslogtreecommitdiffstats
path: root/resources/scripts/helpers/build
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-03-08 00:51:47 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-03-08 00:51:47 (EST)
commit2e5e505da125f9d90dd63c1cbcb08bf5316b21ae (patch)
tree63507200881a2c50e55124c80411673b8f2e4ee8 /resources/scripts/helpers/build
parent5b29f719ac3b226ca17937c4c9e82abca39675fc (diff)
downloadlibreboot-2e5e505da125f9d90dd63c1cbcb08bf5316b21ae.zip
libreboot-2e5e505da125f9d90dd63c1cbcb08bf5316b21ae.tar.gz
libreboot-2e5e505da125f9d90dd63c1cbcb08bf5316b21ae.tar.bz2
build/config/*: Update to work with new build system
Diffstat (limited to 'resources/scripts/helpers/build')
-rwxr-xr-xresources/scripts/helpers/build/config/dcmodify24
-rwxr-xr-xresources/scripts/helpers/build/config/dcreplace18
-rwxr-xr-xresources/scripts/helpers/build/config/dcupdate24
-rwxr-xr-xresources/scripts/helpers/build/config/grubmodify24
-rwxr-xr-xresources/scripts/helpers/build/config/grubreplace18
-rwxr-xr-xresources/scripts/helpers/build/config/grubupdate24
6 files changed, 110 insertions, 22 deletions
diff --git a/resources/scripts/helpers/build/config/dcmodify b/resources/scripts/helpers/build/config/dcmodify
index 90c6578..b8d55d7 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 13511fc..b4b05ff 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 cfea022..37ac854 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 f05f22e..a9ccccb 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 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
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