diff --git a/.bzr/README b/.bzr/README new file mode 100644 index 00000000..4f8e767e --- /dev/null +++ b/.bzr/README @@ -0,0 +1,3 @@ +This is a Bazaar control directory. +Do not change any files in this directory. +See http://bazaar-vcs.org/ for more information about Bazaar. diff --git a/.bzr/branch-format b/.bzr/branch-format new file mode 100644 index 00000000..9eb09b73 --- /dev/null +++ b/.bzr/branch-format @@ -0,0 +1 @@ +Bazaar-NG meta directory, format 1 diff --git a/.bzr/branch/branch.conf b/.bzr/branch/branch.conf new file mode 100644 index 00000000..0ff52035 --- /dev/null +++ b/.bzr/branch/branch.conf @@ -0,0 +1,2 @@ +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/ diff --git a/.bzr/branch/format b/.bzr/branch/format new file mode 100644 index 00000000..1fc6b88e --- /dev/null +++ b/.bzr/branch/format @@ -0,0 +1 @@ +Bazaar Branch Format 6 (bzr 0.15) diff --git a/.bzr/branch/last-revision b/.bzr/branch/last-revision new file mode 100644 index 00000000..8a6d559a --- /dev/null +++ b/.bzr/branch/last-revision @@ -0,0 +1 @@ +276 ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs39 diff --git a/.bzr/branch/tags b/.bzr/branch/tags new file mode 100644 index 00000000..9e9092b6 --- /dev/null +++ b/.bzr/branch/tags @@ -0,0 +1 @@ +d4: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-y8ixof4s2zb3vs39e \ No newline at end of file diff --git a/.bzr/checkout/conflicts b/.bzr/checkout/conflicts new file mode 100644 index 00000000..0dc2d3a0 --- /dev/null +++ b/.bzr/checkout/conflicts @@ -0,0 +1 @@ +BZR conflict list format 1 diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate new file mode 100644 index 00000000..8ebbc86f Binary files /dev/null and b/.bzr/checkout/dirstate differ diff --git a/.bzr/checkout/format b/.bzr/checkout/format new file mode 100644 index 00000000..9ffb5e44 --- /dev/null +++ b/.bzr/checkout/format @@ -0,0 +1 @@ +Bazaar Working Tree Format 4 (bzr 0.15) diff --git a/.bzr/checkout/merge-hashes b/.bzr/checkout/merge-hashes new file mode 100644 index 00000000..841a5976 --- /dev/null +++ b/.bzr/checkout/merge-hashes @@ -0,0 +1,6 @@ +BZR merge-modified list format 1 +file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.1 +hash: 64a8ca3d9f969fe6ccff917739be2dbaf85af2d3 + +file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.5 +hash: 723d11f776ba3507bac97fd386d7ffaa8a43de7c diff --git a/.bzr/repository/format b/.bzr/repository/format new file mode 100644 index 00000000..520349da --- /dev/null +++ b/.bzr/repository/format @@ -0,0 +1 @@ +Bazaar pack repository format 1 (needs bzr 0.92) diff --git a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.iix b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.iix new file mode 100644 index 00000000..89e7807b Binary files /dev/null and b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.iix differ diff --git a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.rix b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.rix new file mode 100644 index 00000000..b45f6a48 Binary files /dev/null and b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.rix differ diff --git a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.six b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.tix b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.tix new file mode 100644 index 00000000..0aeca224 Binary files /dev/null and b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.tix differ diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix new file mode 100644 index 00000000..42508863 Binary files /dev/null and b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix differ diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix new file mode 100644 index 00000000..b0681231 Binary files /dev/null and b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix differ diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix new file mode 100644 index 00000000..b19da696 Binary files /dev/null and b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix differ diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.iix b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.iix new file mode 100644 index 00000000..80f0b18e Binary files /dev/null and b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.iix differ diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.rix b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.rix new file mode 100644 index 00000000..edca13de Binary files /dev/null and b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.rix differ diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.tix b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.tix new file mode 100644 index 00000000..9054e0a3 Binary files /dev/null and b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.tix differ diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.iix b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.iix new file mode 100644 index 00000000..56291fd1 Binary files /dev/null and b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.iix differ diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.rix b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.rix new file mode 100644 index 00000000..000b1aca Binary files /dev/null and b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.rix differ diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.tix b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.tix new file mode 100644 index 00000000..349ec794 Binary files /dev/null and b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.tix differ diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.iix b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.iix new file mode 100644 index 00000000..25fd7b83 Binary files /dev/null and b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.iix differ diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.rix b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.rix new file mode 100644 index 00000000..53436570 Binary files /dev/null and b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.rix differ diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.tix b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.tix new file mode 100644 index 00000000..25406fe9 Binary files /dev/null and b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.tix differ diff --git a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.iix b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.iix new file mode 100644 index 00000000..c6b1c479 Binary files /dev/null and b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.iix differ diff --git a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.rix b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.rix new file mode 100644 index 00000000..aa8916e2 Binary files /dev/null and b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.rix differ diff --git a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.six b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.tix b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.tix new file mode 100644 index 00000000..12d097cb Binary files /dev/null and b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.tix differ diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.iix b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.iix new file mode 100644 index 00000000..23729e8b Binary files /dev/null and b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.iix differ diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.rix b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.rix new file mode 100644 index 00000000..f7c8861f Binary files /dev/null and b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.rix differ diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.six b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.tix b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.tix new file mode 100644 index 00000000..97e17999 Binary files /dev/null and b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.tix differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix new file mode 100644 index 00000000..0ac9f859 Binary files /dev/null and b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix new file mode 100644 index 00000000..9d4797a6 Binary files /dev/null and b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six new file mode 100644 index 00000000..957bd400 Binary files /dev/null and b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix new file mode 100644 index 00000000..6fa31ef2 Binary files /dev/null and b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix differ diff --git a/.bzr/repository/pack-names b/.bzr/repository/pack-names new file mode 100644 index 00000000..7f78828d Binary files /dev/null and b/.bzr/repository/pack-names differ diff --git a/.bzr/repository/packs/41a419b6a2c89cdad0fa3a8a69e40810.pack b/.bzr/repository/packs/41a419b6a2c89cdad0fa3a8a69e40810.pack new file mode 100644 index 00000000..71fc5b4f Binary files /dev/null and b/.bzr/repository/packs/41a419b6a2c89cdad0fa3a8a69e40810.pack differ diff --git a/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack b/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack new file mode 100644 index 00000000..4657950e Binary files /dev/null and b/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack differ diff --git a/.bzr/repository/packs/826cb7622cd5715bc0efed9618a21810.pack b/.bzr/repository/packs/826cb7622cd5715bc0efed9618a21810.pack new file mode 100644 index 00000000..c11800a0 Binary files /dev/null and b/.bzr/repository/packs/826cb7622cd5715bc0efed9618a21810.pack differ diff --git a/.bzr/repository/packs/a61e6e5a2a28b476892ff5601e954c22.pack b/.bzr/repository/packs/a61e6e5a2a28b476892ff5601e954c22.pack new file mode 100644 index 00000000..5899558c Binary files /dev/null and b/.bzr/repository/packs/a61e6e5a2a28b476892ff5601e954c22.pack differ diff --git a/.bzr/repository/packs/c2bce168d3ce0969c0a31c7914f73f7e.pack b/.bzr/repository/packs/c2bce168d3ce0969c0a31c7914f73f7e.pack new file mode 100644 index 00000000..fe2fed20 Binary files /dev/null and b/.bzr/repository/packs/c2bce168d3ce0969c0a31c7914f73f7e.pack differ diff --git a/.bzr/repository/packs/d6a03141bdc37b53e6da33b0c62f3eee.pack b/.bzr/repository/packs/d6a03141bdc37b53e6da33b0c62f3eee.pack new file mode 100644 index 00000000..e9b0b3d5 Binary files /dev/null and b/.bzr/repository/packs/d6a03141bdc37b53e6da33b0c62f3eee.pack differ diff --git a/.bzr/repository/packs/e8bdb3981e054376d3ff1496e3e55f00.pack b/.bzr/repository/packs/e8bdb3981e054376d3ff1496e3e55f00.pack new file mode 100644 index 00000000..ec9d269d Binary files /dev/null and b/.bzr/repository/packs/e8bdb3981e054376d3ff1496e3e55f00.pack differ diff --git a/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack b/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack new file mode 100644 index 00000000..f20adbb3 Binary files /dev/null and b/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack differ diff --git a/debian/changelog b/debian/changelog index ed764638..17eacc50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (0.92) karmic; urgency=low + + * change armel+imx51 back to the proper metapackage name + * enable universe for armel+dove build + * drop armel fallback, we want to fail officially if no armel subarch is set + * clean some trailing whitespace in the armel subarch case statement + + -- Oliver Grawert Fri, 21 Aug 2009 19:33:15 +0200 + livecd-rootfs (0.91) karmic; urgency=low [ Steve Kowalik ] diff --git a/livecd.sh b/livecd.sh index be441658..62fe22f4 100755 --- a/livecd.sh +++ b/livecd.sh @@ -325,15 +325,18 @@ link_in_boot = $link_in_boot hppa) LIST="$LIST linux-hppa32 linux-hppa64";; powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";; sparc*) LIST="$LIST linux-sparc64";; - armel) - case "$SUBARCH" in + armel) + case "$SUBARCH" in imx51) - LIST="$LIST linux-babbage" + LIST="$LIST linux-imx51" + # temporarily enable universe until kernel is in main + COMP="main restricted universe" + ;; + dove) + LIST="$LIST linux-dove" # temporarily enable universe until kernel is in main COMP="main restricted universe" ;; - dove) LIST="$LIST linux-dove";; - *) LIST="$LIST linux-babbage";; esac;; *) echo "Unknown architecture: no kernel."; exit 1;; esac