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.

1 files changed, 152 insertions, 8 deletions

diff --git a/docs/howtos/grub_cbfs.html b/docs/howtos/grub_cbfs.html
index d95904d..b82a12a 100644
--- a/docs/howtos/grub_cbfs.html
+++ b/docs/howtos/grub_cbfs.html
@@ -11,6 +11,9 @@
 			font-family:sans-serif;
 			font-size:1em;
 		}
+		div.important {
+			background-color:#ccc;
+		}
 	</style>
 
 	<title>Libreboot documentation: GRUB menu</title>
@@ -42,12 +45,11 @@
 
 	<p>
 	Download libreboot_src.tar.gz or libreboot_bin.tar.gz from <a href="http://libreboot.org/" target="_blank">http://libreboot.org/</a>
-	<br/><b>If you downloaded libreboot_meta.tar.gz, refer to <a href="../index.html#build_meta">../index.html#build_meta</a> before continuing.</b>
+	<br/><b>If you downloaded libreboot from git, refer to <a href="../index.html#build_meta">../index.html#build_meta</a> before continuing.</b>
 	</p>
 
 	<p>
-		On apt-get distributions such as Trisquel you can install the build dependency (GCC) by running:<br/>
-		<b>$ sudo apt-get install build-essential</b>
+		First, <a href="../index.html#build_dependencies">install the build dependencies</a>.
 	</p>
 
 	<p>
@@ -74,21 +76,152 @@
 	</p>
 
 	<p>
+		If you currently have flashed a ROM image from an older version, it is recommended to update first: basically, modify one of the latest ROM's
+		and then flash it.
+	</p>
+
+	<p>
 		Display contents of ROM:<br/>
 		<b>$ ./cbfstool libreboot_usqwerty.rom print</b>
 	</p>
 
 	<p>
-		The libreboot_usqwerty.rom file contains your grub.cfg.
+		The libreboot_usqwerty.rom file contains your grub.cfg, along with a copy called grubtest.cfg. 
+		You should extract, modify and re-insert the copy first. grub.cfg will load first, but it has a menu entry for switching to the copy (grubtest.cfg).
+		This reduces your chance of making a mistake that could make your machine unbootable (or very hard to boot).
 	</p>
 
 	<p>
 		Extract grub.cfg from the ROM:<br/>
-		<b>$ ./cbfstool libreboot_usqwerty.rom extract -n grub.cfg -f grub.cfg</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom extract -n grubtest.cfg -f grubtest.cfg</b>
 	</p>
 
 	<p>
-		Now you have a grub.cfg in cbfstool directory. Edit it however you wish.
+		Now you have a grubtest.cfg in cbfstool directory. Edit it however you wish.
+	</p>
+
+	<div class="important">
+
+		<h2>Example modification (Trisquel GNU/Linux, can also be adapted, or copied, for other apt-get distros)</h2>
+
+			<p>
+				Look at the 3 lines under the menu entry 'Load Operating System'; these are all you need to change.
+			</p>
+
+			<p>
+				As an example, on my test system in /boot/grub/grub.cfg I see for the main menu entry:
+				<b>linux	/boot/vmlinuz-3.15.1-gnu.nonpae root=UUID=3a008e14-4871-497b-95e5-fb180f277951 ro   crashkernel=384M-2G:64M,2G-:128M quiet splash $vt_handoff</b>
+				<b>initrd	/boot/initrd.img-3.15.1-gnu.nonpae</b>
+			</p>
+
+			<p>
+				crashkernel=384M-2G:64M,2G-:128M and $vt_handoff can be safely ignored.
+			</p>
+
+			<p>
+				I use this to get my partition layout:<br/>
+				$ <b>lsblk</b>
+			</p>
+
+			<p>
+				In my case, I have no /boot partition, instead /boot is on the same partition as / on sda1. Yours might be different.
+				In GRUB terms, sda means ahci0. 1 means msdos1, or gpt1, depending on whether I am using MBR or GPT partitioning.
+				Thus, /dev/sda1 is GRUB is (ahci0,msdos1) or (ahci0,gpt1). In my case, I use MBR partitioning so it's (ahci0,msdos1).
+				'msdos' is GRUB's name simply because this partitioning type is traditionally used by MS-DOS. It doesn't mean you have a 
+				proprietary OS.
+			</p>
+
+			<p>
+				Trisquel doesn't keep the filenames of kernels consistent, instead it keeps old kernels and new kernel updates are provided
+				with the version in the filename. This can make GRUB payload a bit tricky. Fortunately, there are symlinks /vmlinuz and /initrd.img
+				so if your /boot and / are on the same partition, you can set GRUB to boot from that. These are also updated automatically when
+				installing kernel updates from your distributions apt-get repositories.
+				NOte: when using jxself.org/linux-libre kernels, these are not updated at all and you have to update them manually.
+			</p>
+
+			<p>
+				For the GRUB payload's grub.cfg (in 'Load Operating System' menu entry), we therefore have (in this example):<br/>
+				<b>set root='ahci0,msdos1'</b><br/>
+				<b>linux /vmlinuz root=UUID=3a008e14-4871-497b-95e5-fb180f277951 ro quiet splash</b><br/>
+				<b>initrd /initrd.img</b>
+			</p>
+
+			<p>
+				Optionally, you can convert the UUID to it's real device name, for example /dev/sda1 in this case.
+				sdX naming isn't very reliable, though, which is why UUID is used for most distributions.
+			</p>
+
+			<p>
+				Alternatively, if your /boot is on a separate partition then you cannot rely on the /vmlinuz and /initrd.img symlinks.
+				Instead, go into /boot and create your own symlinks (update them manually when you install a new kernel update).<br/>
+				$ <b>sudo -s</b><br/>
+				# <b>cd /boot/</b><br/>
+				# <b>rm -rf vmlinuz initrd.img</b><br/>
+				# <b>ln -s <u>kernel</u> ksym</b><br/>
+				# <b>ln -s <u>initrd</u> isym</b><br/>
+				# <b>exit</b>
+			</p>
+
+			<p>
+				Replace the underlined <b>kernel</b> and <b>initrd</b> filenames above with the actual filenames, of course.
+			</p>
+
+			<p>
+				Then your grub.cfg menu entry (for payload) becomes like that, for example if / was on sda2 and /boot was on sda1:<br/>
+				<b>set root='ahci0,msdos1'</b><br/>
+				<b>linux /ksym root=/dev/sda2 ro quiet splash</b><br/>
+				<b>initrd /isym</b>
+			</p>
+
+			<p>
+				There are lots of possible variations so please try to adapt.
+			</p>
+
+		<h2>Parabola GNU/Linux-libre</h2>
+
+			<p>
+				You can basically adapt the above. Note however that Parabola does not keep old kernels still installed, and the file names 
+				are always consistent, so you don't need to boot from symlinks, you can just use the real thing directly.
+			</p>
+
+	</div>
+
+	<p>
+		Now you have your modified grub.cfg. (right?)
+	</p>
+
+	<p>
+		Delete the grubtest.cfg that remained inside the ROM:<br/>
+		<b>$ ./cbfstool libreboot_usqwerty.rom remove -n grubtest.cfg</b>
+	</p>
+
+	<p>
+		Display ROM contents and now you see grubtest.cfg no longer exists there:<br/>
+		<b>$ ./cbfstool libreboot_usqwerty.rom print</b>
+	</p>
+
+	<p>
+		Add the modified version that you just made:<br/>
+		<b>$ ./cbfstool libreboot_usqwerty.rom add -n grubtest.cfg -f grubtest.cfg -t raw</b>
+	</p>
+
+	<p>
+		Now display ROM contents again and see that it exists again:<br/>
+		<b>$ ./cbfstool libreboot_usqwerty.rom print</b>
+	</p>
+
+	<p>
+		Now you have a modified ROM. Refer back to <a href="../index.html#flashrom">../index.html#flashrom</a> for information
+		on how to flash it.
+	</p>
+
+	<p>
+		Choose (in GRUB) the menu entry that switches to grubtest.cfg. If it works, then your config is safe and you can continue below.
+	</p>
+
+	<p>
+		Rename (just reduce confusion):<br/>
+		$ <b>mv grubtest.cfg grub.cfg</b>
 	</p>
 
 	<p>
@@ -117,14 +250,25 @@
 	</p>
 
 	<p>
+		If all went well, GRUB should now boot your system the way you intended.
+	</p>
+
+	<p>
 		<b>Anecdotally, a user reported that segmentation faults occur with cbfstool when using this procedure depending on the size of the grub.cfg being re-insterted. In his case, a minimum size of 857 bytes was required. This could (at the time of this release) be a bug in cbfstool that should be investigated with the coreboot community. If cbfstool segfaults, then keep this in mind. 'strace' (or gdb? clang?) could be used for debugging. This was in libreboot 5th release (based on coreboot from late 2013). Not sure if the issue perists in the 6th release (based on coreboot from June 1st, 2014 at the time of writing); I have never personally encountered the bug. strace (from that user) is here: <a href="cbfstool_libreboot5_strace">cbfstool_libreboot5_strace</a>. The issue has been reported by a few users, so does not happen all the time: this bug (if it still exists) could (should) be reproduced.</b>
 	</p>
 
 <hr/>
 
 	<p>
-		Copyright &copy; 2014 Francis Rowe, All Rights Reserved.<br/>
-		See <a href="../license.html">../license.html</a> for license conditions.
+		Copyright &copy; 2014 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
+		This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
+		A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
+	</p>
+
+	<p>
+		This document is distributed in the hope that it will be useful,
+		but WITHOUT ANY WARRANTY; without even the implied warranty of
+		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information.
 	</p>
 
 </body>