Import patches-unapplied version 1.117 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 47f73c769a

New changelog entries:
  * Only use tmpfs on amd64, due to space restrictions on the current
    build machines.

.bzr/README

@@ -1,3 +0,0 @@
-This is a Bazaar control directory.
-Do not change any files in this directory.
-See http://bazaar-vcs.org/ for more information about Bazaar.

.bzr/branch-format

@@ -1 +0,0 @@
-Bazaar-NG meta directory, format 1

.bzr/branch/branch.conf

@@ -1,3 +0,0 @@
-parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
-push_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
-submit_branch = bzr+ssh://bazaar.launchpad.net/~mcasadevall/livecd-rootfs/ext-image-generation/

.bzr/branch/format

@@ -1 +0,0 @@
-Bazaar Branch Format 7 (needs bzr 1.6)

.bzr/branch/last-revision

@@ -1 +0,0 @@
-330 ogra@ubuntu.com-20100603164932-3l3vnbiyce4gwb3l

.bzr/branch/tags

@@ -1 +0,0 @@
-d5:0.10045:lool@dooz.org-20091022120946-ude4k00wrup5zi1u5:0.10158:evan.dandrea@canonical.com-20091118182236-wjse47vyhq4331c34:0.6854:cjwatson@canonical.com-20080922105353-5g6nbd3z6auod9o84:0.6947:ogra@ubuntu.com-20080923105752-3is4oq7h0rvr7m1t4:0.7050:stevenk@ubuntu.com-20080926061032-4cmvys3uwn0urof64:0.7147:ogra@ubuntu.com-20080929212513-932wmh9jhu2254c84:0.7254:cjwatson@canonical.com-20081009012107-bcithv5mtfr13wdr4:0.7350:superm1@ubuntu.com-20081105013351-lgows8lwl8gynab14:0.7450:superm1@ubuntu.com-20081108155125-k9hgpa9dpccasza14:0.7550:stevenk@ubuntu.com-20090110000926-kti0aa3w3gm87tl64:0.7654:cjwatson@canonical.com-20090120234103-0oedx9z8fwfgebmg4:0.7754:cjwatson@canonical.com-20090129172302-12n6za4eg8ti5iqs4:0.7850:stevenk@ubuntu.com-20090323105302-bzrig75pk422ae8o4:0.7954:cjwatson@canonical.com-20090403000814-c0f4i899uyvq3le14:0.8050:stevenk@ubuntu.com-20090416104708-ytmlukba1r2qbok24:0.8154:cjwatson@canonical.com-20090508233530-xqdymqe6ii8eanbt4:0.8254:cjwatson@canonical.com-20090529072059-0303r4t3a2terv5u4:0.8354:cjwatson@canonical.com-20090529093922-h2qylvtfqgwqocs24:0.8460:steve.langasek@canonical.com-20090610202236-hzpkmw79nuly34iu4:0.8554:cjwatson@canonical.com-20090623163248-2e75g8ph1wr63bck4:0.8650:stevenk@ubuntu.com-20090630021433-f32fyu1qvauh1y5y4:0.8754:cjwatson@canonical.com-20090707120821-n7o4gmu5cgvs76314:0.8850:superm1@ubuntu.com-20090723080906-su6zimlrtqy6bmdj4:0.8950:stevenk@ubuntu.com-20090805132344-m6jy87gv6cmus3384:0.9047:ogra@ubuntu.com-20090811090144-eek0pgpf01i0zjim4:0.9150:superm1@ubuntu.com-20090814032033-i87zsm015fivhf494:0.9247:ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs394:0.9347:ogra@ubuntu.com-20090825163952-pxo05zcb6icy931e4:0.9445:lool@dooz.org-20090827103704-ces9mmhqskcdzxgm4:0.9550:stevenk@ubuntu.com-20090901073549-hyto6dxcpijmyb1u4:0.9654:cjwatson@canonical.com-20090915121422-j8ycjw2o2xsk2fim4:0.9745:lool@dooz.org-20090915225223-bkp0tzqk3dllogno4:0.9840:lool@bee-20090923074648-95yic2eel4ietxl34:0.9945:lool@dooz.org-20091004115344-a657lipup0e45we65:1.10258:evan.dandrea@canonical.com-20091119211317-msuqwz83h8lrtnf45:1.10347:ogra@ubuntu.com-20091207104326-192mmbzylr7gz8bk5:1.10450:stevenk@ubuntu.com-20091218032148-0127dc53ulzxt15h5:1.10560:steve.langasek@canonical.com-20100127011800-utoua1rehbsdyiqi5:1.10654:jriddell@canonical.com-20100308114808-2z6cywa7itr3u46m5:1.10949:lamont@debian.org-20100324133047-5k5cb0qkr4w4r41m5:1.11050:stevenk@ubuntu.com-20100324135015-zok8spw9m0ykcvk95:1.11149:lamont@debian.org-20100327011013-1azh4ef9byudkdml5:1.11447:ogra@ubuntu.com-20100420112048-i4da4bomagsbw0jh5:1.11545:lamont@rover3-20100505204008-7uox9fm2e1frkg7r5:1.11647:ogra@ubuntu.com-20100603164611-o4x2l2q8k15saiz0e

.bzr/checkout/conflicts

@@ -1 +0,0 @@
-BZR conflict list format 1

.bzr/checkout/format

@@ -1 +0,0 @@
-Bazaar Working Tree Format 6 (bzr 1.14)

.bzr/checkout/merge-hashes

@@ -1,9 +0,0 @@
-BZR merge-modified list format 1
-file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
-hash: 6750fdf6aa74c42b711c688757b4ce53c6b43f3b
-
-file_id: buildlivecd-20070710110713-33hamwwudgc153n3-1
-hash: ca26a1be824ff51a7faf11512c07a44e1aebac92
-
-file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
-hash: 8fa5582a6f993a5c1fcd10ece80fd0f592e2eddf

.bzr/repository/format

@@ -1 +0,0 @@
-Bazaar repository format 2a (needs bzr 1.16 or later)

.bzr/repository/indices/21640c86ad584e00e30f37d83e6b8f83.cix

@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=1
-row_lengths=1
-xœÁÁ
€ PÎLÁ´–VMæm<x0Ñ‹ÛûÞûÝ~\ŽÈÏ	Ú§H„2bø‚-Ü ¶VÀf¯aÖd(Íž’²bâR‹<52>Zþ
>ºÎ

.bzr/repository/indices/21640c86ad584e00e30f37d83e6b8f83.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/21640c86ad584e00e30f37d83e6b8f83.tix

@@ -1,7 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=2
-len=2
-row_lengths=1
-xœÅ<EFBFBD>ËjÃ0D½ÎWølîÕòCZ¼í®û‹äÊÊÃ’‚bµîß×i6]uèf`†gþºØ§Éêq³Ð‹~<7E>a¦}öJ»IûµÕ§[ëb8zª‡èŸéí<C3A9>i¯QCŒon™  	±E¨±¸Ÿû?lâ\G<>@[©—nôÌâ˜ÎN¥â¡èè’î³ÉaηÇ.ÖÄßVGñ®…‰^»«ù„Ó¡À–7%ª†óJΤ<12>T!ÿO…üCv²«–‹?O
-ŒwÎ`bæ·Š¥l8ÂæIª¾

.bzr/repository/indices/22588380cad2550d53613776d99520a7.cix

@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=1
-row_lengths=1
-xœÁÁ
€ PÎLÁôW(˜8L¡%<˜èÅí}ïýn?.ןSi_¬ÎÊÆUÐ<55><C390>ª4ëV¦›.
†ÎQ{”K“D`¤œ6jˆ?MaÖ

.bzr/repository/indices/22588380cad2550d53613776d99520a7.iix

@@ -1,7 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=1
-len=1
-row_lengths=1
-xœ}ÊK@0Pc«è*ï¾R$¶RÒŠ(õkRVoÎøÜÏn;o<>ËÃtš>q»c1†U2<55>H“‚.5 C™ØóÑ,¨.3¿”ýü
-­ôaz“{ŽžœÚl4h«Z<C2AB>`­òK_$

.bzr/repository/indices/22588380cad2550d53613776d99520a7.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/2eeb95d1fc1ff9686126decf7e797b97.cix

@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=1
-row_lengths=1
-xœ
Ç1€ @j^ÁØ;r&>†pmü½N7Ï{Íýœ}ÅûèØšW1CUïdÉ&:LþΡՄÄWÈÊ– b)§"~º6

.bzr/repository/indices/2eeb95d1fc1ff9686126decf7e797b97.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/965aee66064c675df762106799de8b6e.cix

@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=1
-row_lengths=1
-xœÁ±
€0@êL‘ü&o$†1$4lÏÝûÝ}»zŒôœ<C3B4>µ[ЬЈC<1A>¦â%ê€K«¾4<C2BE>#¦	b´<0C>5K. ¦&òÃ

.bzr/repository/indices/965aee66064c675df762106799de8b6e.rix

@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=1
-len=1
-row_lengths=1
-xœ}ÊMƒ Pמ‚ÐÌ7ƒÄ.Lz0Ô˜¢X…úszoз~ù\Bƒ{×iXÝ«ø2çòèÓ¤™@dI`ÍSXK”ßìdzfؽÄêÏ·€NæàÈßöƒfsãE˜Q(Rm}XÆ#´

.bzr/repository/indices/965aee66064c675df762106799de8b6e.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/9ca24942477dbbf1f5d3fd9addcd906f.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/ca86fb608123743b10b1a11fda8ab3c6.cix

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/ca86fb608123743b10b1a11fda8ab3c6.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

.bzr/repository/indices/ca86fb608123743b10b1a11fda8ab3c6.tix

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=2
-len=0
-row_lengths=

.bzr/repository/indices/d8420d93bd54d1d5b43c3353486dacf2.cix

@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=1
-row_lengths=1
-xœÁ±
€0@êL‘ü&±-$†ùXAHа=wïwÏýš<Ês›&Sha³IÓ˜p%Tbúp`X´Õ¸,ô^¡Ð*µÁQ~JöU

.bzr/repository/indices/d8420d93bd54d1d5b43c3353486dacf2.six

@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (1.117) maverick; urgency=low
+
+  * Only use tmpfs on amd64, due to space restrictions on the current
+    build machines.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sat, 05 Jun 2010 06:50:24 -0600
+
 livecd-rootfs (1.116) maverick; urgency=low
 
   [Michael Casadevall]

livecd.sh

@@ -203,8 +203,8 @@ for FS in "$@"; do
     umount ${ROOT} || true
     rm -rf ${ROOT}
     mkdir ${ROOT}
-    # if we have > 1GB of RAM, use a tmpfs
-    if  awk '/^MemTotal:/ { exit !(int($2/1024) > 1024)}' /proc/meminfo; then
+    # if we are on amd64 and have > 1GB of RAM, use a tmpfs
+    if  test $(uname -m) = x86_64 && awk '/^MemTotal:/ { exit !(int($2/1024) > 1024)}' /proc/meminfo; then
         mount -t tmpfs -o size=8192M tmpfs ${ROOT} && echo using tmpfs
     fi