From 9a321884379a71b5f0986fdfb97a2b6c5bdccd8a Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Wed, 3 Sep 2014 18:13:00 +0000 Subject: Libreboot release 6 beta 6. - Added modified builddeb* scripts for Parabola GNU/Linux-libre: buildpac, buildpac-flashrom, buildpac-bucts (courtesy of Noah Vesely) - Documentation: updated all relevant areas to mention use of buildpac* scripts for Parabola users. - Documentation: added information showing how to enable or disable bluetooth on the X60 - MacBook1,1 tested! See ../docs/index.html#macbook11" - Documentation: fixed typo in ../docs/index.html#get_edid_panelname (get-edit changed to get-edid) - Documentation: added ../docs/howtos/x60_lcd_change/ (pics only for now) - Added gcry_serpent and gcry_whirlpool to the GRUB module list in the 'build' script (for luks users) - Libreboot is now based on a new coreboot version from August 23rd, 2014: Merged commits (relates to boards that were already supported in libreboot): - http://review.coreboot.org/#/c/6697/ - http://review.coreboot.org/#/c/6698/ (merged already) - http://review.coreboot.org/#/c/6699/ (merged already) - http://review.coreboot.org/#/c/6696/ (merged already) - http://review.coreboot.org/#/c/6695/ (merged already) - http://review.coreboot.org/#/c/5927/ (merged already) - http://review.coreboot.org/#/c/6717/ (merged already) - http://review.coreboot.org/#/c/6718/ (merged already) - http://review.coreboot.org/#/c/6723/ (merged already) (text-mode patch, might enable memtest. macbook21) - http://review.coreboot.org/#/c/6732/ (MERGED) (remove useless ps/2 keyboard delay from macbook21. already merged) - These were also merged in coreboot (relates to boards that libreboot already supported): - http://review.coreboot.org/#/c/5320/ (merged) - http://review.coreboot.org/#/c/5321/ (merged) - http://review.coreboot.org/#/c/5323/ (merged) - http://review.coreboot.org/#/c/6693/ (merged) - http://review.coreboot.org/#/c/6694/ (merged) - http://review.coreboot.org/#/c/5324/ (merged) - Documentation: removed the section about tft_brightness on X60 (new code makes it obsolete) - Removed all patches from resources/libreboot/patch/ and added new patch: 0000_t60_textmode.git.diff - Updated getcb script and DEBLOB script. - Updated configuration files under resources/libreboot/config/ to accomodate new coreboot version. - Removed grub_serial*.cfg and libreboot_serial*.rom, all configs/rom's are now unified (containing same configuration as serial rom's from before). - Documentation: updated ../docs/index.html#rom to reflect the above. - Updated GRUB to new version from August 14th, 2014. - Unified all grub configurations for all machines to a single grub.cfg under resources/grub/config/ - Updated flashrom to new version from August 20th, 2014 - Added getseabios and builddeps-seabios (builddeps and getall were also updated) - Added instructions to 'buildrom-withgrub' to include bios.bin.elf and vgaroms/vgabios.bin from SeaBIOS inside the ROM. - Added seabios (and sgavgabios) to grub as payload option in menu - Disabled serial output in Memtest86+ (no longer needed) to speed up tests. - MemTest86+ now works properly, it can output on the laptop screen (no serial port needed anymore). - Added getgrubinvaders, builddeps-grubinvaders scripts. Added these to getall and builddeps. - Added GRUB Invaders menu entry in resources/grub/config/grub.cfg - Added rules to builddeps-coreboot to build libpayload with TinyCurses. (added appropriate instructions to cleandeps script). - Commented out lines in resources/grub/config/grub.cfg for loading font/background (not useful anymore, now that GRUB is in text-mode). - Commented out lines in buildrom-withgrub that included backgrounds/fonts (not useful anymore, now that GRUB is in text-mode). - Added resources/utilities/i945-pwm/ (from git://git.mtjm.eu/i945-pwm), for debugging acpi brightness on i945 machines. - Added instructions for it in builddeps, builddeps-i945pwm, builddeb and cleandeps - 'build' script: removed the parts that generated sha512sum manifests (not needed, since release tarballs are GPG-signed) - 'build' script: removed the parts that generated libreboot_meta directory (not needed anymore, since _meta will be hosted in git) - Updated ../docs/index.html#build_meta (and other parts of documentation) to accomodate this change. - Documentation: simplified (refactored) the notes in ../docs/index.html#rom - 'build' script: removed the parts that generated libreboot_bin and added them to a new script: 'build-release' - Documentation: ../docs/index.html#build updated to reflect the above. - Removed 'sudo' from builddeb, builddeb-flashrom, powertop.trisquel6 and builddeb-bucts scripts (assuming that the user has it is a really bad idea). - Added all gcry_* modules to grub (luks/cryptomount): gcry_arcfour gcry_camellia gcry_crc gcry_dsa gcry_md4 gcry_rfc2268 gcry_rmd160 gcry_seed gcry_sha1 gcry_sha512 gcry_twofish gcry_blowfish gcry_cast5 gcry_des gcry_idea gcry_md5 gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_tiger gcry_whirlpool - Added GNUtoo's list of GRUB modules (includes all of the gcry_* modules above), cryptomount should be working now. - Removed builddeb-bucts and builddeb-flashrom, merged them with builddeb (../docs/index.html updated accordingly) - Removed buildpac-bucts and buildpac-flashrom, merged them with buildpac (../docs/index.html updated accordingly) - Renamed builddeb to deps-trisquel (../docs/index.html updated accordingly) - Renamed buildpac to deps-parabola (../docs/index.html updated accordingly) - Documentation: removed all parts talking about build dependencies, replaced them with links to ../docs/index.html#build_dependencies - Documentation: emphasized more strongly on the documentation, the need to re-build bucts and/or flashrom before flashing a ROM image. - build-release: flashrom, nvramtool, cbfstool and bucts are no longer provided pre-compiled in binary archives, and are now in source form only. (to maximize distro compatibility). - Documentation: added ../docs/howtos/encrypted_trisquel.html showing how to setup a fully encrypted Trisquel installation (including /boot) and boot it from the GRUB payload. - 'build' script: replaced grub.elf assembly instructons, it's now handled by a utility added under resources/utilities/grub-assemble - Moved resources/grub/keymap to resources/utilities/grub-assemble/keymap, and updated that utility to use it - Documentation: removed useless links to pictures of keyboard layouts and unmodified layouts. - Removed all unused fonts from dejavu-fonts-ttf-2.34/ directory - 'buildrom-withgrub' script: updated it to create 2 sets of ROM's for each machine: one with text-mode, one with coreboot framebuffer. - Documentation: updated ../docs/index.html#rom to reflect the above - Deleted unused README and COPYING file from main directory - Removed some rm -rf .git* instructions from the get* scripts and moved them to build-release script - Split up default grub.cfg into 6 parts: extra/{common.cfg,txtmode.cfg,vesafb.cfg} and menuentries/{common.cfg,txtmode.cfg,vesafb.cfg} - buildrom-withgrub script uses these to generate the correct grub.cfg for each type of configuration. - grub_memdisk.cfg (used inside grub.elf) now only loads grub.cfg from cbfs. It no longer enables serial output or sets prefix. (menuentries/common.cfg does instead) - resources/grub/config/extra/common.cfg, added: - insmod instructions to load those modules: nativedisk, ehci, ohci, uhci, usb, usbserial_pl2303, usbserial_ftdi, usbserial_usbdebug - set prefix=(memdisk)/boot/grub - For native graphics (recommended by coreboot wiki): - gfxpayload=keep - terminal_output --append gfxterm - Play a beep on startup: - play 480 440 1 - Documentation: added note about 'fb=false' workaround for text-mode debian-installer (Trisquel net install) to ../docs/howtos/grub_boot_installer.html - Documentation: updated ../docs/howtos/grub_cbfs.html to make it safer (and easier) to follow. --- build | 185 ++++++++---------------------------------------------------------- 1 file changed, 20 insertions(+), 165 deletions(-) (limited to 'build') diff --git a/build b/build index d4c38d01..b9e78338 100755 --- a/build +++ b/build @@ -1,9 +1,9 @@ #!/bin/bash # -# build script: generates libreboot_bin and libreboot_meta +# build script: builds the ROM images and puts them in ./bin/ # -# Copyright (C) 2014 Francis Rowe +# Copyright (C) 2014 Francis Rowe # # 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 @@ -26,11 +26,15 @@ echo "running 'make clean' in coreboot" -# run "make clean" in coreboot +# prepare coreboot cd coreboot + +# run "make clean" in coreboot (will re-build later) make clean rm -rf grub.elf -cd .. + +# come back to main directory +cd ../ echo "finished running 'make clean' in coreboot" @@ -39,19 +43,19 @@ echo "finished running 'make clean' in coreboot" echo "generating grub.elf payload" -cd grub -mv ../grub_memdisk_keymap . -# Build the GRUB2 payload (grub.elf) -./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o grub.elf --modules='crypto cryptodisk luks lvm cmosdump cmostest ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs minix_be minix minix3_be minix3 minix2_be minix2 zfs ufs2 ufs1_be ufs1 udf squash4 romfs jfs reiserfs procfs odc ntfs nilfs2 newc iso9660 hfsplus cpio exfat cpio_be afs btrfs bfs hfs video_bochs password png jpeg keystatus sleep loopback gfxterm_background' --install-modules='syslinuxcfg bsd ls cat echo linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=../resources/grub/config/grub_memdisk.cfg $(./grub_memdisk_keymap) -mv grub_memdisk_keymap ../ +cd resources/utilities/grub-assemble -# move those into coreboot directory: -mv grub.elf ../coreboot +# Generate grub.elf inside the directory +./gen.sh -# come back into the main directory -cd ../ +# Replace the old one +rm -rf ../../../coreboot/grub.elf +mv grub.elf ../../../coreboot/ + +# come back to main directory +cd ../../../ -echo "finished generating grub.elf payload" +echo "finished generating grub.elf payload (it's now in coreboot/ directory)" # Build the ROM's (for flashing) # ---------------------------------------------------------------------------------------------------------------------- @@ -75,159 +79,10 @@ do cd ../../ done -# macbook21 doesn't need grub_serial, but the buildrom-withgrub script expects it -# (we will delete it later) -cp resources/grub/config/macbook21/grub_usqwerty.cfg resources/grub/config/macbook21/grub_serial_usqwerty.cfg -# build the ROM +# build macbook21 rom ./buildrom-withgrub macbook21 -# delete the useless (nonsensical) files -rm -rf bin/macbook21/libreboot_serial*rom -rm -rf resources/grub/config/macbook21/grub_serial_usqwerty.cfg - -# Now we prepare libreboot_bin archive ready for release -# ---------------------------------------------------------------------------------------------------------------------------- - -echo "generating ../libreboot_bin" - -# delete the old one -rm -rf ../libreboot_bin - -# create new directory -mkdir ../libreboot_bin - -# Include the ROM's in the binary archive -cp -r bin ../libreboot_bin - -# Include flashrom utility in binary archive -cp -r flashrom ../libreboot_bin -# For installing build dependencies -cp builddeb ../libreboot_bin -# For installing flashrom build dependencies -cp builddeb-flashrom ../libreboot_bin -# For installing bucts build dependencies -cp builddeb-bucts ../libreboot_bin - -# Build scripts for flashrom and bucts -cp builddeps-flashrom ../libreboot_bin -cp builddeps-bucts ../libreboot_bin - -# Useful information -cp README ../libreboot_bin -cp COPYING ../libreboot_bin - -# Include the same documentation in binary archive -cp -r docs ../libreboot_bin - -# include X60 cmos.layout file -cp coreboot/src/mainboard/lenovo/x60/cmos.layout ../libreboot_bin/x60cmos.layout -cp coreboot/src/mainboard/lenovo/t60/cmos.layout ../libreboot_bin/t60cmos.layout -cp coreboot/src/mainboard/apple/macbook21/cmos.layout ../libreboot_bin/macbook21cmos.layout - -# X60/T60: BUC.TS utility is needed to flash libreboot while Lenovo BIOS is running -cp -r bucts ../libreboot_bin - -# Include a copy of nvramtool in libreboot_bin -cp -r coreboot/util/nvramtool ../libreboot_bin - -# X60/X60T/T60: Script for setting up powertop (kills high pitched noise) -cp powertop.trisquel6 ../libreboot_bin -cp powertop.trisquel6.init ../libreboot_bin - -cp macbook21_firstflash ../libreboot_bin - -# (lazy hack) to make builddep-flashrom work in libreboot_bin: -cp -r resources ../libreboot_bin - -# X60/T60: so that the user can use libreboot_bin to overwrite lenovo bios with libreboot -cp lenovobios_firstflash ../libreboot_bin -cp lenovobios_secondflash ../libreboot_bin - -# Flashrom script (makes flashing easier: ./flash path/to/libreboot.rom) -cp flash ../libreboot_bin - -# patch the version of cbfstool included in libreboot_bin, -# so that it can be built/executed standalone -# this modification is only suitable for the version included in libreboot_bin -# do not patch the one in libreboot_src with this -cp -r coreboot/util/cbfstool ../libreboot_bin/cbfstool_standalone -cp builddeps-cbfstool ../libreboot_bin -echo "Patching libreboot_bin/cbfstool_standalone to be buildable (and executable) without residing in coreboot source tree" -rm -rf ../libreboot_bin/cbfstool_standalone/rmodule.c -cp resources/cbfstool/patch/rmodule.c ../libreboot_bin/cbfstool_standalone -cp coreboot/src/include/rmodule-defs.h ../libreboot_bin/cbfstool_standalone -cd ../libreboot_bin -./builddeps-cbfstool -cd ../libreboot_src -echo "Done (cbfstool_standalone package created in libreboot_bin)" - -echo "finished generating ../libreboot_bin" - -# Create "libreboot_meta" -# ------------------------------------------------------------------------------------------------------------------------------- - -echo "generating ../libreboot_meta" - -# delete old one -rm -rf ../libreboot_meta - -# make new one -mkdir ../libreboot_meta - -# MOVE unwanted parts to libreboot_meta (we'll move them back later) -mv bucts ../libreboot_meta -mv coreboot ../libreboot_meta -mv flashrom ../libreboot_meta -mv grub ../libreboot_meta -mv "memtest86+-5.01" ../libreboot_meta - -# COPY wanted parts to libreboot_meta -cp -r * ../libreboot_meta -# DELETE unwanted ROM's from libreboot_meta -rm -rf ../libreboot_meta/bin/* - -# MOVE BACK the unwanted (in meta) files back to src -mv ../libreboot_meta/bucts . -mv ../libreboot_meta/coreboot . -mv ../libreboot_meta/flashrom . -mv ../libreboot_meta/grub . -mv ../libreboot_meta/"memtest86+-5.01" . - -echo "finished generating ../libreboot_meta" - -# Create sha512sum manifest for bin, meta and src -# ------------------------------------------------------------------------------------------------------------------------------------ - -echo "creating sha512sum manifest in libreboot_bin" -cd ../libreboot_bin -rm -rf sha512sum.txt ../sha512sum.txt -touch ../sha512sum.txt -for i in $(find -type f); do sha512sum "$i" >> ../sha512sum.txt; done -mv ../sha512sum.txt . -echo "done" -cd ../libreboot_src - -echo "creating sha512sum manifest in libreboot_meta" -cd ../libreboot_meta -rm -rf sha512sum.txt ../sha512sum.txt -touch ../sha512sum.txt -for i in $(find -type f); do sha512sum "$i" >> ../sha512sum.txt; done -mv ../sha512sum.txt . -echo "done" -cd ../libreboot_src - -# # Doing this part is pointless -# # This should be done manually (after running 'cleandeps') before releasing the archive -# echo "creating sha512sum manifest in libreboot_src" -# # cd ../libreboot_bin -# rm -rf sha512sum.txt ../sha512sum.txt -# touch ../sha512sum.txt -# for i in $(find -type f); do sha512sum "$i" >> ../sha512sum.txt; done -# mv ../sha512sum.txt . -# echo "done" -# # cd ../libreboot_src - -echo "BUILD COMPLETE. Check ../libreboot_bin and ../libreboot_meta" +echo "BUILD COMPLETE. ROM IMAGES ARE IN ./bin/" # ------------------- DONE ---------------------- -- cgit v1.2.3-70-g09d2