diff options
Diffstat (limited to 'resources/scripts/helpers')
24 files changed, 132 insertions, 32 deletions
diff --git a/resources/scripts/helpers/build/clean/bucts b/resources/scripts/helpers/build/clean/bucts index f84cd58..80fe3a8 100755 --- a/resources/scripts/helpers/build/clean/bucts +++ b/resources/scripts/helpers/build/clean/bucts @@ -27,9 +27,13 @@ set -u -e # clean bucts # -------------------------------------------------------- +printf "Cleaning the previous build of bucts\n" + cd bucts/ make clean +printf "\n\n" + # done. go back to main directory. cd ../ diff --git a/resources/scripts/helpers/build/clean/coreboot b/resources/scripts/helpers/build/clean/coreboot index 4af7391..d657aa3 100755 --- a/resources/scripts/helpers/build/clean/coreboot +++ b/resources/scripts/helpers/build/clean/coreboot @@ -27,6 +27,8 @@ set -u -e # clean coreboot utilities (dependencies for 'build'): # ------------------------------------------------------- +printf "Cleaning the previous build of the utilities in coreboot\n" + cd coreboot/ # ---------------------- @@ -59,4 +61,6 @@ make crossgcc-clean # done. go back to main directory cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/clean/flashrom b/resources/scripts/helpers/build/clean/flashrom index 483ce4f..41f5d28 100755 --- a/resources/scripts/helpers/build/clean/flashrom +++ b/resources/scripts/helpers/build/clean/flashrom @@ -27,6 +27,8 @@ set -u -e # clean flashrom # -------------------------------------------------------- +printf "Cleaning the previous build of flashrom\n" + cd flashrom/ make clean @@ -37,4 +39,6 @@ rm -f flashrom_lenovobios_macronix # done. go back to main directory cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/clean/grub b/resources/scripts/helpers/build/clean/grub index b6e4f13..d59410a 100755 --- a/resources/scripts/helpers/build/clean/grub +++ b/resources/scripts/helpers/build/clean/grub @@ -29,9 +29,12 @@ set -u -e cd grub/ +printf "Cleaning the previous build of GRUB\n" [[ -f Makefile ]] && make clean # done. go back to main directoy cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/clean/i945pwm b/resources/scripts/helpers/build/clean/i945pwm index fa9aecf..ff383e8 100755 --- a/resources/scripts/helpers/build/clean/i945pwm +++ b/resources/scripts/helpers/build/clean/i945pwm @@ -27,8 +27,10 @@ set -u -e # clean i945-pwm utility # -------------------------------------------------------------------- +printf "Cleaning the previous build of i945-pwm\n" cd resources/utilities/i945-pwm make clean cd ../../../ +printf "\n\n" # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/clean/ich9deblob b/resources/scripts/helpers/build/clean/ich9deblob index f3ee46a..04d971a 100755 --- a/resources/scripts/helpers/build/clean/ich9deblob +++ b/resources/scripts/helpers/build/clean/ich9deblob @@ -27,8 +27,10 @@ set -u -e # clean ich9deblob utility # -------------------------------------------------------------------- +printf "Cleaning the previous build of ich9deblob\n" cd resources/utilities/ich9deblob/ make clean cd ../../../ +printf "\n\n" # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/clean/memtest86plus b/resources/scripts/helpers/build/clean/memtest86plus index 8d4ede6..3ad8130 100755 --- a/resources/scripts/helpers/build/clean/memtest86plus +++ b/resources/scripts/helpers/build/clean/memtest86plus @@ -27,6 +27,8 @@ set -u -e # clean memtest86+ # -------------------------------------------------------- +printf "Cleaning the previous build of MemTest86+\n" + cd "memtest86+-5.01"/ make clean @@ -34,4 +36,6 @@ make clean # done. go back to main directory cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/clean/rom_images b/resources/scripts/helpers/build/clean/rom_images index 592b111..02833c3 100755 --- a/resources/scripts/helpers/build/clean/rom_images +++ b/resources/scripts/helpers/build/clean/rom_images @@ -30,4 +30,6 @@ set -u -e # delete the bin/ directory rm -rf bin/ +printf "Deleted the bin/ directory containing the ROM images.\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/external/source b/resources/scripts/helpers/build/external/source index 74cfdb3..520a004 100755 --- a/resources/scripts/helpers/build/external/source +++ b/resources/scripts/helpers/build/external/source @@ -23,6 +23,8 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +printf "Creating source archive for flashrom and bucts\n" + # delete the old data rm -rf tobuild rm -f tobuild.tar.xz @@ -67,3 +69,5 @@ tar -c tobuild | xz -9e >tobuild.tar.xz # and delete the directory rm -rf tobuild/ + +printf "\n\n" diff --git a/resources/scripts/helpers/build/module/bucts b/resources/scripts/helpers/build/module/bucts index 6c596dd..34e1a37 100755 --- a/resources/scripts/helpers/build/module/bucts +++ b/resources/scripts/helpers/build/module/bucts @@ -27,6 +27,8 @@ set -u -e # Build BUC.TS utility (needed for flashing ROM's on X60/T60 while Lenovo BIOS is running) # -------------------------------------------------------------------- +printf "Building bucts\n" + cd bucts/ buildtype="unknown" @@ -50,4 +52,6 @@ fi # done. go back to main directory cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot index 3060e58..d9083a7 100755 --- a/resources/scripts/helpers/build/module/coreboot +++ b/resources/scripts/helpers/build/module/coreboot @@ -27,6 +27,8 @@ set -u -e # Build utilities needed in coreboot directory # -------------------------------------------------------------------- +printf "Building the utilities in coreboot\n" + cd coreboot # ----------------------------------------- @@ -54,4 +56,6 @@ make crossgcc-i386 # done. go back to main libreboot_src directory cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/module/flashrom b/resources/scripts/helpers/build/module/flashrom index 7fe0fa7..a6cf612 100755 --- a/resources/scripts/helpers/build/module/flashrom +++ b/resources/scripts/helpers/build/module/flashrom @@ -27,6 +27,8 @@ set -u -e # Build "flashrom" (utility for flashing/dumping ROM's) # -------------------------------------------------------------------- +printf "Building flashrom\n" + cd flashrom/ make clean @@ -78,5 +80,7 @@ mv flashrom_normal flashrom cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/module/grub b/resources/scripts/helpers/build/module/grub index 5138b47..73f36e7 100755 --- a/resources/scripts/helpers/build/module/grub +++ b/resources/scripts/helpers/build/module/grub @@ -27,6 +27,8 @@ set -u -e # Build utilies needed for building GRUB payloads # --------------------------------------------------------------------- +printf "Building GRUB\n" + cd grub/ # clean it first @@ -37,6 +39,8 @@ cd grub/ ./configure --with-platform=coreboot make +printf "\n\n" + # done. go back to main directory cd ../ diff --git a/resources/scripts/helpers/build/module/i945pwm b/resources/scripts/helpers/build/module/i945pwm index c70c37e..657a7b4 100755 --- a/resources/scripts/helpers/build/module/i945pwm +++ b/resources/scripts/helpers/build/module/i945pwm @@ -27,6 +27,8 @@ set -u -e # Build i945-pwm utility # -------------------------------------------------------------------- +printf "Building i945-pwm\n" + cd resources/utilities/i945-pwm/ make clean @@ -36,4 +38,6 @@ make # done. go back to main directory cd ../../../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/module/ich9deblob b/resources/scripts/helpers/build/module/ich9deblob index c0941ee..25cf97b 100755 --- a/resources/scripts/helpers/build/module/ich9deblob +++ b/resources/scripts/helpers/build/module/ich9deblob @@ -27,6 +27,8 @@ set -u -e # Build ich9deblob utility # -------------------------------------------------------------------- +printf "Building ich9deblob\n" + cd resources/utilities/ich9deblob # clean it first @@ -38,4 +40,6 @@ make # done. go back to main directory cd ../../../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/module/memtest86plus b/resources/scripts/helpers/build/module/memtest86plus index 0b7686e..d6f52ef 100755 --- a/resources/scripts/helpers/build/module/memtest86plus +++ b/resources/scripts/helpers/build/module/memtest86plus @@ -27,6 +27,8 @@ set -u -e # Build MemTest86+ payload (for GRUB) # -------------------------------------------------------------------- +printf "Building MemTest86+\n" + cd "memtest86+-5.01"/ # clean it first @@ -38,4 +40,6 @@ make # done. go back to main directory cd ../ +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives index 8b4bfce..ae49b9e 100755 --- a/resources/scripts/helpers/build/release/archives +++ b/resources/scripts/helpers/build/release/archives @@ -25,6 +25,8 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +printf "Generating the release archives\n" + arch="unknown" if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ] then @@ -50,8 +52,7 @@ cat .git/refs/heads/master > commitid # ### Delete old archives before continuing # ---------------------------------------------------------------------------------------------------------------------------- -echo "Deleting old release archives" - +printf "Deleting the old release archives\n" rm -f libreboot_*.tar.xz rm -f tobuild.tar.xz rm -rf release/ @@ -63,9 +64,12 @@ rm -rf libreboot_doc # Get manifest which will be used to copy everything find -maxdepth 1 > releasefilelist +printf "\n\n" + # ### Prepare libreboot_src archive ready for release # ---------------------------------------------------------------------------------------------------------------------------- +printf "Copying libreboot sources to libreboot_src/\n" mkdir libreboot_src for resource in $(cat releasefilelist) @@ -83,6 +87,8 @@ cd libreboot_src/ # back to main checkout directory cd ../ +printf "\n\n" + # ### Create the release/ directory where the archives will go # ---------------------------------------------------------------------------------------------------------------------------- @@ -93,6 +99,8 @@ mkdir release/rom/ # ### Prepare libreboot_docs archive ready for release # ---------------------------------------------------------------------------------------------------------------------------- +printf "Creating libreboot_docs.tar.xz\n" + cd release/ mkdir libreboot_docs/ @@ -108,11 +116,15 @@ rm -rf libreboot_docs/ cd ../ +printf "\n\n" + # ### Further work in libreboot_src: delete *.git and *.svn # ### To save space since they are not useful in the release archives # ### Changes to these projects should be submitted upstream # ---------------------------------------------------------------------------------------------------------------------------- +echo "Deleting .git* and .svn* in the modules of libreboot_src/\n" + cd libreboot_src/ # These instructions will also work even if .git or .svn are already deleted @@ -144,14 +156,20 @@ rm -rf .git rm -f .gitignore cd ../ +printf "\n\n" + cd ../ # ### Prepare ROM archives ready for release # ---------------------------------------------------------------------------------------------------------------------------- +printf "Generating ROM image archives for...\n" + cd bin/ for board in $(ls) do + printf "...$board" + # show the libreboot commit ID in the archive cat ../commitid > "$board"/commitid @@ -163,12 +181,18 @@ do # move the ROM images to the release/ directory mv ../libreboot_"$board".tar.xz ../release/rom/ + + printf " OK\n" done cd ../ +printf "\n\n" + # ### Prepare libreboot_util archive ready for release # ---------------------------------------------------------------------------------------------------------------------------- +printf "Generating libreboot_util.tar.xz\n" + mkdir libreboot_util # -------------- @@ -351,6 +375,8 @@ cp resources/scripts/misc/ich9macchange libreboot_util/ # for changing the GRUB background cp resources/scripts/misc/grub-background libreboot_util/ +printf "\n\n" + # ### Create the release tarballs # ---------------------------------------------------------------------------------------------------------------------------- @@ -399,8 +425,10 @@ cat commitid > libreboot_src/commitid cat commitid > libreboot_util/commitid # create lzma compressed src archive +printf "Compressing libreboot_src/ into libreboot_src.tar.xz\n" tar -c libreboot_src | xz -9e >libreboot_src.tar.xz +printf "Compressing libreboot_util/ into libreboot_util.tar.xz\n" # create lzma compressed util archive tar -c libreboot_util | xz -9e >libreboot_util.tar.xz @@ -411,6 +439,8 @@ mv libreboot_util.tar.xz release/ # Create a symlink to the commitid file, in release/ cat commitid > release/commitid +printf "\n\n" + # ### Delete the uncompressed release directories # ---------------------------------------------------------------------------------------------------------------------------- @@ -424,9 +454,11 @@ rm -rf libreboot_util # Move the archive to the release directory mv tobuild.tar.xz release/ -# DONE. See libreboot_src.tar.xz and libreboot_util.tar.xz -# NOTE FOR FCHMMR: don't forget to add ARM binaries for flashrom -# NOTE FOR FCHMMR: don't forget to add i386 binaries for flashrom/bucts -# The tarball tobuild.tar.xz has been created with everything needed to build these utilities +printf "Tar archives are stored in release/.\n" +printf "NOTE: don't forget to add ARM binaries for flashrom.\n" +printf "NOTE: don't forget to add i386 binaries for flashrom/bucts.\n" +printf "The archive tobuild.tar.xz has been created with everything needed to build these utilities.\n" + +printf "\n\n" # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper index d63598d..983be3d 100755 --- a/resources/scripts/helpers/build/roms/helper +++ b/resources/scripts/helpers/build/roms/helper @@ -31,7 +31,9 @@ if (( $# != 1 )); then exit 1 fi -cd coreboot +printf "Helper script: build ROM images for '$1'\n" + +cd coreboot/ # Build ROM images with text-mode and corebootfb modes. # --------------------------------------------------------------------------------------------------------------- @@ -113,3 +115,5 @@ mv "$1" ../bin # go back to main source directory cd ../ +printf "\n\n" + diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub index 18cf62e..9e1ff42 100755 --- a/resources/scripts/helpers/build/roms/withgrub +++ b/resources/scripts/helpers/build/roms/withgrub @@ -25,7 +25,7 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -# Build the ROM images +printf "Building ROM images with the GRUB payload\n" if [ ! -d "bin" ] then @@ -103,5 +103,7 @@ rm -f coreboot/grub_txtmode.elf # The GRUB configs are no longer needed rm -f coreboot/grub*cfg +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/download/bucts b/resources/scripts/helpers/download/bucts index 7e3f72d..ac12d1c 100755 --- a/resources/scripts/helpers/download/bucts +++ b/resources/scripts/helpers/download/bucts @@ -29,7 +29,7 @@ set -u -e # Remove the old version that may exist # ----------------------------------------------------------- -echo "DOWNLOADING BUCTS" +printf "Downloading bucts\n" rm -rf bucts @@ -45,12 +45,13 @@ cd bucts # Reset to the last commit that was tested # ----------------------------------------------------------- +printf "Patching bucts to not require git for building\n" git reset --hard dc27919d7a66a6e8685ce07c71aefa4f03ef7c07 git am "../resources/bucts/patch/0001-Makefile-don-t-use-git.patch" # we're done cd ../ -echo "BUCTS DOWNLOAD COMPLETE" +printf "\n\n" # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot index 281d72c..445c793 100755 --- a/resources/scripts/helpers/download/coreboot +++ b/resources/scripts/helpers/download/coreboot @@ -24,6 +24,8 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +printf "Downloading coreboot, patching coreboot and deblobbing coreboot\n" + # This grabs current base used, and applies patches # This is also used to run the deblob scripts. @@ -47,39 +49,39 @@ git reset --hard 6532676f9328ca3bd197b714db4f1de23544cbde # Get patches from review.coreboot.org # ---------------------------------------------------------------------------------- -# Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit) +printf "Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)\n" git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cherry-pick FETCH_HEAD -# lenovo/x60: Enable legacy brightness controls (native graphics) +printf "lenovo/x60: Enable legacy brightness controls (native graphics)\n" git fetch http://review.coreboot.org/coreboot refs/changes/48/7048/4 && git cherry-pick FETCH_HEAD -# Enable T60 native graphics +printf "Enable T60 native graphics\n" git fetch http://review.coreboot.org/coreboot refs/changes/45/5345/9 && git cherry-pick FETCH_HEAD -# Enable text-mode graphics for T60 +printf "Enable text-mode graphics for T60\n" git fetch http://review.coreboot.org/coreboot refs/changes/50/7050/2 && git cherry-pick FETCH_HEAD -# lenovo/t60: Enable legacy brightness controls (native graphics) +printf "lenovo/t60: Enable legacy brightness controls (native graphics)\n" git fetch http://review.coreboot.org/coreboot refs/changes/51/7051/1 && git cherry-pick FETCH_HEAD -# Enable cstates 1 and 2 on macbook21. This reduces heat / power usage when the system is idle +printf "Enable cstates 1 and 2 on macbook21. This reduces heat / power usage when the system is idle\n" git fetch http://review.coreboot.org/coreboot refs/changes/23/7923/2 && git cherry-pick FETCH_HEAD -# ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan +printf "ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan\n" git fetch http://review.coreboot.org/coreboot refs/changes/58/7058/7 && git cherry-pick FETCH_HEAD -# i945: permanently set tft_brightness to 0xff. this fixes the issue with X60 and "scrolling" backlight +printf "i945: permanently set tft_brightness to 0xff. this fixes the issue with X60 and 'scrolling' backlight\n" git fetch http://review.coreboot.org/coreboot refs/changes/61/7561/2 && git cherry-pick FETCH_HEAD -# northbridge/gm45/raminit.c: enable GS45 high-perf (i.e. add X200S support to libreboot) +printf "northbridge/gm45/raminit.c: enable GS45 high-perf (i.e. add X200S support to libreboot)\n" git fetch http://review.coreboot.org/coreboot refs/changes/86/7786/1 && git cherry-pick FETCH_HEAD -# fix uneven backlight on X200 (when setting brightness low) +printf "fix uneven backlight on X200 (when setting brightness low)\n" git fetch http://review.coreboot.org/coreboot refs/changes/79/7979/1 && git cherry-pick FETCH_HEAD -# ThinkPad R400 support. Based on http://review.coreboot.org/#/c/8393/ +printf "ThinkPad R400 support. Based on http://review.coreboot.org/#/c/8393/\n" # This diff will be deleted later, and instead the patch will be fetched from coreboot gerrit # (and later, it won't even do that, once the R400 support is merged in coreboot) git am ../resources/libreboot/patch/r400.diff -# Fix build issue when building coreboot without .git +printf "Fix build issue when building coreboot without .git\n" git fetch http://review.coreboot.org/coreboot refs/changes/23/8423/1 && git cherry-pick FETCH_HEAD # TODO: delete the above line, test these commits: # http://review.coreboot.org/#/c/8427/ @@ -88,9 +90,7 @@ git fetch http://review.coreboot.org/coreboot refs/changes/23/8423/1 && git cher # Run coreboot-libre deblob scripts # --------------------------------------------------------------------------------- -# The git history (git diff command) shows what blobs were deleted -# along with the contents of those blobs. This needs to be deleted -# for libreboot's purposes. +printf "Deleting .git* in coreboot/ (history inside .git contains the blobs that were deleted)\n" rm -rf .git rm -f .gitreview rm -f .gitmodules @@ -98,9 +98,11 @@ rm -f .gitignore cd ../ -# Deblob coreboot +printf "Deblobbing coreboot\n" ./resources/utilities/coreboot-libre/deblob +printf "\n\n" + # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom index 81e8cae..80a1436 100755 --- a/resources/scripts/helpers/download/flashrom +++ b/resources/scripts/helpers/download/flashrom @@ -29,7 +29,7 @@ set -u -e # Remove the old version that may still exist: # --------------------------------------------------------------------- -echo "DOWNLOADING FLASHROM" +printf "Downloading flashrom\n" rm -rf flashrom @@ -44,15 +44,17 @@ svn co -r 1858 svn://flashrom.org/flashrom/trunk flashrom cd flashrom/ # Add whitelist for X200: +printf "Patching board_enable.c for X200 whitelist\n" patch board_enable.c < ../resources/flashrom/patch/x200whitelist.diff # Remove redundant definitions for the flash chips that # supported libreboot machines use. This removes the need # for the user to run with the "-c" argument on these machines +printf "Patching flashchips.c to remove the redundant entries\n" patch flashchips.c < ../resources/flashrom/patch/purged_chips.diff cd ../ -echo "FINISHED DOWNLOADING FLASHROM" +printf "\n\n" # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub index 6145293..231dd32 100755 --- a/resources/scripts/helpers/download/grub +++ b/resources/scripts/helpers/download/grub @@ -29,7 +29,7 @@ set -u -e # Remove the old version that may still exist # ------------------------------------------------------------------------------- -echo "DOWNLOADING GRUB" +printf "Downloading GRUB\n" rm -rf grub @@ -72,7 +72,7 @@ git am "../resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN- # git am "../resources/grub/patch/0003-syslinux_parse-keep-initrd-in-kernel-the-command-lin.patch" cd ../ -echo "FINISHED DOWNLOADING GRUB" +printf "\n\n" # ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus index c04c311..8b649b4 100755 --- a/resources/scripts/helpers/download/memtest86plus +++ b/resources/scripts/helpers/download/memtest86plus @@ -29,7 +29,7 @@ set -u -e # Remove the old version that may exist # ---------------------------------------------------------------------------------- -echo "DOWNLOADING MEMTEST86+" +printf "Downloading MemTest86+\n" rm -rf "memtest86+-5.01" @@ -64,7 +64,7 @@ cp ../resources/memtest86/patch/Makefile . # we're done cd ../ -echo "FINISHED DOWNLOADING MEMTEST86+" +printf "\n\n" # ------------------- DONE ---------------------- |