summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-12-07 16:30:16 +0000
committerTails developers <amnesia@boum.org>2013-12-07 16:30:16 +0000
commit2b48695bd4e91989b9fac00dcde97a47cfde371d (patch)
tree8db1aa283825c0752d543dda3291f055ac5c86d0
parent189392ee3ae3b85592486f6ce434c0355c45a3d1 (diff)
parentbac2ce3749f5c7c11007f6ac53e800fa49fb0f4c (diff)
Merge remote-tracking branch 'origin/master' into testing0.22-rc2
-rw-r--r--wiki/src/blueprint/UEFI.mdwn17
-rw-r--r--wiki/src/contribute/release_process.mdwn26
2 files changed, 21 insertions, 22 deletions
diff --git a/wiki/src/blueprint/UEFI.mdwn b/wiki/src/blueprint/UEFI.mdwn
index 7b937bd..467c42c 100644
--- a/wiki/src/blueprint/UEFI.mdwn
+++ b/wiki/src/blueprint/UEFI.mdwn
@@ -9,7 +9,7 @@ Goals
-----
* devices produced by Tails Installer should boot on most UEFI-only
- hardware (e.g. Mac)
+ hardware (e.g. some relevant set of Macs)
* devices produced by Tails Installer should boot on most hardware
that only supports UEFI boot for GPT devices (e.g. ThinkPad X220)
@@ -17,13 +17,14 @@ Non-goals
---------
* UEFI DVD boot: BIOS boot from DVD works fine on most hardware,
- including Macs; adding the files that would make UEFI DVD boot work
- on some systems is likely to break what currently works for others.
+ including Macs; adding the files needed to have UEFI DVD boot work
+ on some systems will break what currently works for others.
* UEFI boot from hybrid ISO cat'd on a USB device: given BIOS DVD boot
- works generally fine, it's OK to require users to use this to create
- their UEFI-capable Tails USB stick.
+ works generally fine, it's OK to require users to go this way and
+ install their UEFI-capable Tails USB stick from DVD.
* Secure Boot support is not part of this plan. Picking technical
- solutions that leave room for Secure Boot would be great, though.
+ solutions that leave room for Secure Boot would be a great
+ bonus, though.
Resources
=========
@@ -117,8 +118,8 @@ There is then two big area that needs work to support EFI:
* ISO images need to support EFI, both for DVD and when [[dumped on USB
sticks|contribute/design/hybrid_ISO]]. A work similar to the one done by
- Matthew Garrett on Fedora 17 should probably be done [[!taglink
- todo/upstream]] in [live-build](http://live.debian.net/).
+ Matthew Garrett on Fedora 17 should probably be done upstream
+ in [live-build](http://live.debian.net/).
* The [[USB installer|contribute/design/installation]] needs to
setup the partition table and system partition in a way that can boot
on both BIOS and UEFI systems. Proper Mac support would be a nice bonus.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 1f88af1..559c0ed 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -23,6 +23,8 @@ the scripts snippets found on this page:
* `TAILS_SIGNATURE_KEY=0D24B36AA9A2A651787876451202821CBE2CD9C1`
* `IUK_CHECKOUT`: a checkout of the relevant tag of the `iuk`
Git repository.
+* `PERL5LIB_CHECKOUT`: a checkout of the relevant tag of the
+ `perl5lib` Git repository.
Pre-freeze
==========
@@ -264,23 +266,19 @@ Build the Incremental Upgrade Kits
Skip this step when preparing a major release.
Use `tails-create-iuk` to build an IUK for the previous stable release
-and (if applicable) the last RC for the version being released.
-Example (point `PERL5LIB` to a checkout of the relevant tag of Tails'
-perl5lib):
+and (if applicable) the last RC for the version being released. Example:
- # cd $IUK_CHECKOUT && \
- PERL5LIB=/home/user/tails/perl5lib/lib \
- ./bin/tails-create-iuk --squashfs-diff-name "$VERSION.squashfs" \
- --old-iso tails-i386-0.13.iso \
- --new-iso tails-i386-0.14.iso \
- --outfile Tails_i386_0.13_to_0.14.iuk
-
-Save the generated IUK to
-`$ISOS/Tails_i386_${PREVIOUS_VERSION}_to_${VERSION}.iuk`.
+ sudo su -c "cd $IUK_CHECKOUT && \
+ PERL5LIB=\"$PERL5LIB_CHECKOUT/lib\" \
+ ./bin/tails-create-iuk \
+ --squashfs-diff-name \"$VERSION.squashfs\" \
+ --old-iso \"$ISOS/tails-i386-$PREVIOUS_VERSION/tails-i386-$PREVIOUS_VERSION.iso\" \
+ --new-iso \"$ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso\" \
+ --outfile \"$ISOS/Tails_i386_${PREVIOUS_VERSION}_to_${VERSION}.iuk\""
Note that developer tools for creating IUK and upgrade-description
-files were only tested on sid. They should hopefully work well on
-Wheezy, but I would not try to make them work on Squeeze.
+files were only tested on Debian sid. It should hopefully work well on
+Wheezy too, but I would not even try to use it on Squeeze.
<a id="prepare-upgrade-description-files"></a>