diff options
author | Francis Rowe <info@gluglug.org.uk> | 2016-01-02 22:10:32 +0000 |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2016-01-04 20:28:39 +0000 |
commit | d1f408f3725aa02bc1d76c4c6aadb4697bd073c0 (patch) | |
tree | 7eed036543ae1f8c57b56825880a722a8efbedf1 /resources/scripts/helpers/build/config | |
parent | 91aec7e72005dcda72d19f2d024a02d8c0f86590 (diff) | |
download | librebootfr-d1f408f3725aa02bc1d76c4c6aadb4697bd073c0.tar.gz librebootfr-d1f408f3725aa02bc1d76c4c6aadb4697bd073c0.zip |
Use different coreboot revisions and patches per board
The release archives will be bigger, but this is a necessary change
that makes libreboot development easier.
At present, there are boards maintained in libreboot by different
people. By doing it this way, that becomes much easier. This is in
contrast to the present situation, where a change to one board
potentially affects all other boards, especially when updating to
a new version of coreboot.
Coreboot-libre scripts, download scripts, build scripts - everything.
The entire build system has been modified to reflect this change
of development.
For reasons of consistency, cbfstool and nvramtool are no longer
included in the util archives.
Diffstat (limited to 'resources/scripts/helpers/build/config')
-rwxr-xr-x | resources/scripts/helpers/build/config/dcmodify | 23 | ||||
-rwxr-xr-x | resources/scripts/helpers/build/config/dcreplace | 17 | ||||
-rwxr-xr-x | resources/scripts/helpers/build/config/dcupdate | 23 | ||||
-rwxr-xr-x | resources/scripts/helpers/build/config/grubmodify | 23 | ||||
-rwxr-xr-x | resources/scripts/helpers/build/config/grubreplace | 17 | ||||
-rwxr-xr-x | resources/scripts/helpers/build/config/grubupdate | 23 |
6 files changed, 72 insertions, 54 deletions
diff --git a/resources/scripts/helpers/build/config/dcmodify b/resources/scripts/helpers/build/config/dcmodify index e71af260..90c65783 100755 --- a/resources/scripts/helpers/build/config/dcmodify +++ b/resources/scripts/helpers/build/config/dcmodify @@ -3,7 +3,7 @@ # # helper script: run "make menuconfig" on config(s) to modify them # -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015, 2016 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,25 +25,28 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -configpath="resources/libreboot/config/depthcharge" +payload="depthcharge" +configpath="resources/libreboot/config/${payload}" hackconfig () { - cd "coreboot/" + board="${1}" - printf "Modifying config for %s\n" "${1}" + cd "coreboot/${payload}/${board}/" + + printf "Modifying config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 - if [ ! -d "../${configpath}/${1}/" ]; then - printf "build/config/corebootmodify WARNING: config '%s' does not exist. Skipping.\n" "${1}" - cd "../" + if [ ! -d "../../../${configpath}/${board}/" ]; then + printf "build/config/dcmodify WARNING: config '%s' does not exist. Skipping.\n" "${board}" + cd "../../../" return fi - mv "../${configpath}/${1}/config" ".config" + mv "../../../${configpath}/${board}/config" ".config" make menuconfig - mv ".config" "../${configpath}/${1}/config" + mv ".config" "../../../${configpath}/${board}/config" - cd "../" + cd "../../../" } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/dcreplace b/resources/scripts/helpers/build/config/dcreplace index 85b765c2..13511fcc 100755 --- a/resources/scripts/helpers/build/config/dcreplace +++ b/resources/scripts/helpers/build/config/dcreplace @@ -3,7 +3,7 @@ # # helper script: run "make menuconfig" on config(s) to replace them # -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015, 2016 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,20 +25,23 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -configpath="resources/libreboot/config/depthcharge" +payload="depthcharge" +configpath="resources/libreboot/config/${payload}" hackconfig () { - cd "coreboot/" + board="${1}" - printf "Replacing or creating new config for %s\n" "${1}" + cd "coreboot/${payload}/${board}/" + + printf "Replacing or creating new config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 make menuconfig - [ ! -d "../${configpath}/${1}/" ] && mkdir -p "../${configpath}/${1}/" - mv ".config" "../${configpath}/${1}/config" + [ ! -d "../../../${configpath}/${board}/" ] && mkdir -p "../../../${configpath}/${board}/" + mv ".config" "../../../${configpath}/${board}/config" - cd "../" + cd "../../../" } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/dcupdate b/resources/scripts/helpers/build/config/dcupdate index fd3a99c5..cfea022d 100755 --- a/resources/scripts/helpers/build/config/dcupdate +++ b/resources/scripts/helpers/build/config/dcupdate @@ -3,7 +3,7 @@ # # helper script: run "make oldconfig" on all coreboot config files # -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015, 2016 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,25 +25,28 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -configpath="resources/libreboot/config/depthcharge" +payload="depthcharge" +configpath="resources/libreboot/config/${payload}" hackconfig () { - cd "coreboot/" + board="${1}" - printf "Updating config for %s\n" "${1}" + cd "coreboot/${payload}/${board}/" + + printf "Updating config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 - if [ ! -d "../${configpath}/${1}/" ]; then - printf "build/config/corebootupdate WARNING: config '%s' does not exist. Skipping.\n" "${1}" - cd "../" + if [ ! -d "../../../${configpath}/${board}/" ]; then + printf "build/config/dcupdate WARNING: config '%s' does not exist. Skipping.\n" "${board}" + cd "../../../" return fi - mv "../${configpath}/${1}/config" ".config" + mv "../../../${configpath}/${board}/config" ".config" make oldconfig - mv ".config" "../${configpath}/${1}/config" + mv ".config" "../../../${configpath}/${board}/config" - cd "../" + cd "../../../" } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/grubmodify b/resources/scripts/helpers/build/config/grubmodify index dc866532..f05f22e7 100755 --- a/resources/scripts/helpers/build/config/grubmodify +++ b/resources/scripts/helpers/build/config/grubmodify @@ -3,7 +3,7 @@ # # helper script: run "make menuconfig" on config(s) to modify them # -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015, 2016 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,25 +25,28 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -configpath="resources/libreboot/config/grub" +payload="grub" +configpath="resources/libreboot/config/${payload}" hackconfig () { - cd "coreboot/" + board="${1}" - printf "Modifying config for %s\n" "${1}" + cd "coreboot/${payload}/${board}/" + + printf "Modifying config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 - if [ ! -d "../${configpath}/${1}/" ]; then - printf "build/config/corebootmodify WARNING: config '%s' does not exist. Skipping.\n" "${1}" - cd "../" + if [ ! -d "../../../${configpath}/${board}/" ]; then + printf "build/config/grubmodify WARNING: config '%s' does not exist. Skipping.\n" "${board}" + cd "../../../" return fi - mv "../${configpath}/${1}/config" ".config" + mv "../../../${configpath}/${board}/config" ".config" make menuconfig - mv ".config" "../${configpath}/${1}/config" + mv ".config" "../../../${configpath}/${board}/config" - cd "../" + cd "../../../" } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/grubreplace b/resources/scripts/helpers/build/config/grubreplace index 36d45584..87d89599 100755 --- a/resources/scripts/helpers/build/config/grubreplace +++ b/resources/scripts/helpers/build/config/grubreplace @@ -3,7 +3,7 @@ # # helper script: run "make menuconfig" on config(s) to replace them # -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015, 2016 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,20 +25,23 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -configpath="resources/libreboot/config/grub" +payload="grub" +configpath="resources/libreboot/config/${payload}" hackconfig () { - cd "coreboot/" + board="${1}" - printf "Replacing or creating new config for %s\n" "${1}" + cd "coreboot/${payload}/${board}/" + + printf "Replacing or creating new config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 make menuconfig - [ ! -d "../${configpath}/${1}/" ] && mkdir -p "../${configpath}/${1}/" - mv ".config" "../${configpath}/${1}/config" + [ ! -d "../../../${configpath}/${board}/" ] && mkdir -p "../../../${configpath}/${board}/" + mv ".config" "../../../${configpath}/${board}/config" - cd "../" + cd "../../../" } if [ $# -lt 1 ]; then diff --git a/resources/scripts/helpers/build/config/grubupdate b/resources/scripts/helpers/build/config/grubupdate index 63902534..5bb1a57e 100755 --- a/resources/scripts/helpers/build/config/grubupdate +++ b/resources/scripts/helpers/build/config/grubupdate @@ -3,7 +3,7 @@ # # helper script: run "make oldconfig" on all coreboot config files # -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> +# Copyright (C) 2014, 2015, 2016 Francis Rowe <info@gluglug.org.uk> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,25 +25,28 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -configpath="resources/libreboot/config/grub" +payload="grub" +configpath="resources/libreboot/config/${payload}" hackconfig () { - cd "coreboot/" + board="${1}" - printf "Updating config for %s\n" "${1}" + cd "coreboot/${payload}/${board}/" + + printf "Updating config for %s (%s payload)\n" "${board}" "${payload}" sleep 2 - if [ ! -d "../${configpath}/${1}/" ]; then - printf "build/config/corebootupdate WARNING: config '%s' does not exist. Skipping.\n" "${1}" - cd "../" + if [ ! -d "../../../${configpath}/${board}/" ]; then + printf "build/config/grubupdate WARNING: config '%s' does not exist. Skipping.\n" "${board}" + cd "../../../" return fi - mv "../${configpath}/${1}/config" ".config" + mv "../../../${configpath}/${board}/config" ".config" make oldconfig - mv ".config" "../${configpath}/${1}/config" + mv ".config" "../../../${configpath}/${board}/config" - cd "../" + cd "../../../" } if [ $# -lt 1 ]; then |