diff -Nru ubuntu-release-upgrader-0.180/.bzr-builddeb/default.conf ubuntu-release-upgrader-0.181/.bzr-builddeb/default.conf --- ubuntu-release-upgrader-0.180/.bzr-builddeb/default.conf 1970-01-01 00:00:00.000000000 +0000 +++ ubuntu-release-upgrader-0.181/.bzr-builddeb/default.conf 2012-07-03 20:58:44.000000000 +0000 @@ -0,0 +1,5 @@ +[BUILDDEB] +native = true + +[HOOKS] +pre-build = ./pre-build.sh diff -Nru ubuntu-release-upgrader-0.180/.bzrignore ubuntu-release-upgrader-0.181/.bzrignore --- ubuntu-release-upgrader-0.180/.bzrignore 1970-01-01 00:00:00.000000000 +0000 +++ ubuntu-release-upgrader-0.181/.bzrignore 2012-07-03 20:58:44.000000000 +0000 @@ -0,0 +1,11 @@ +__pycache__ +debian/*.debhelper* +debian/*.substvars +debian/files +debian/python-update-manager +debian/python3-update-manager +debian/tmp +debian/update-manager +debian/update-manager-core +debian/update-manager-kde +debian/update-manager-text diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/DistUpgradeApport.py ubuntu-release-upgrader-0.181/DistUpgrade/DistUpgradeApport.py --- ubuntu-release-upgrader-0.180/DistUpgrade/DistUpgradeApport.py 2012-08-08 14:39:07.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/DistUpgradeApport.py 2012-09-27 15:48:58.000000000 +0000 @@ -7,6 +7,8 @@ import gettext import errno +from apport.hookutils import root_command_output + APPORT_WHITELIST = [ "apt.log", "apt-term.log", @@ -25,7 +27,12 @@ f = os.path.join(logdir, fname) if not os.path.isfile(f) or os.path.getsize(f) == 0: continue - report[f.replace(".","").replace("-","")] = (open(f), ) + ident = f.replace(".", "").replace("-", "") + if os.access(f, os.R_OK): + report[ident] = (open(f), ) + elif os.path.exists(f): + report[ident] = root_command_output(["cat", '%s' % f], + decode_utf8=False) def apport_crash(type, value, tb): diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/DistUpgradeController.py ubuntu-release-upgrader-0.181/DistUpgrade/DistUpgradeController.py --- ubuntu-release-upgrader-0.180/DistUpgrade/DistUpgradeController.py 2012-08-08 14:39:07.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/DistUpgradeController.py 2012-09-27 16:26:05.000000000 +0000 @@ -683,7 +683,11 @@ # disable anything that is not from a official mirror or a whitelisted third party if entry.dist == self.fromDist: entry.dist = self.toDist - entry.comment += " " + _("disabled on upgrade to %s") % self.toDist + disable_comment = " " + _("disabled on upgrade to %s") % self.toDist + if isinstance(entry.comment, bytes): + entry.comment += disable_comment.encode('UTF-8') + else: + entry.comment += disable_comment entry.disabled = True self.sources_disabled = True logging.debug("entry '%s' was disabled (unknown mirror)" % get_string_with_no_auth_from_source_entry(entry)) @@ -987,6 +991,7 @@ # no apt-get update can run outside from the release # upgrader user_canceled = False + e = None while currentRetry < maxRetries: try: pm = apt_pkg.PackageManager(self.cache._depcache) diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-0.181/DistUpgrade/DistUpgradeVersion.py --- ubuntu-release-upgrader-0.180/DistUpgrade/DistUpgradeVersion.py 2012-09-04 08:03:26.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/DistUpgradeVersion.py 2012-09-12 22:01:37.000000000 +0000 @@ -1 +1 @@ -VERSION='0.180' +VERSION='0.175' diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/apt_btrfs_snapshot.py ubuntu-release-upgrader-0.181/DistUpgrade/apt_btrfs_snapshot.py --- ubuntu-release-upgrader-0.180/DistUpgrade/apt_btrfs_snapshot.py 2012-09-04 08:02:59.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/apt_btrfs_snapshot.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,264 +0,0 @@ -# Copyright (C) 2011 Canonical -# -# Author: -# Michael Vogt -# -# 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 the Free Software -# Foundation; version 3. -# -# This program 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 the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -from __future__ import print_function, unicode_literals - -import datetime -import os -import subprocess -import sys -import time -import tempfile - - -class AptBtrfsSnapshotError(Exception): - pass - - -class AptBtrfsNotSupportedError(AptBtrfsSnapshotError): - pass - - -class AptBtrfsRootWithNoatimeError(AptBtrfsSnapshotError): - pass - - -class FstabEntry(object): - """ a single fstab entry line """ - @classmethod - def from_line(cls, line): - # split up - args = line.partition("#")[0].split() - # use only the first 7 args and ignore anything after them, mount - # seems to do the same, see bug #873411 comment #7 - return FstabEntry(*args[0:6]) - - def __init__(self, fs_spec, mountpoint, fstype, options, dump=0, passno=0): - # uuid or device - self.fs_spec = fs_spec - self.mountpoint = mountpoint - self.fstype = fstype - self.options = options - self.dump = dump - self.passno = passno - - def __repr__(self): - return "" % ( - self.fs_spec, self.mountpoint, self.fstype, - self.options, self.dump, self.passno) - - -class Fstab(list): - """ a list of FstabEntry items """ - def __init__(self, fstab="/etc/fstab"): - super(Fstab, self).__init__() - - with open(fstab) as fstab_file: - for line in (l.strip() for l in fstab_file): - if line == "" or line.startswith("#"): - continue - try: - entry = FstabEntry.from_line(line) - except ValueError: - continue - self.append(entry) - - -class LowLevelCommands(object): - """ lowlevel commands invoked to perform various tasks like - interact with mount and btrfs tools - """ - def mount(self, fs_spec, mountpoint): - ret = subprocess.call(["mount", fs_spec, mountpoint]) - return ret == 0 - - def umount(self, mountpoint): - ret = subprocess.call(["umount", mountpoint]) - return ret == 0 - - def btrfs_subvolume_snapshot(self, source, dest): - ret = subprocess.call(["btrfs", "subvolume", "snapshot", - source, dest]) - return ret == 0 - - def btrfs_delete_snapshot(self, snapshot): - ret = subprocess.call(["btrfs", "subvolume", "delete", snapshot]) - return ret == 0 - - -class AptBtrfsSnapshot(object): - """ the high level object that interacts with the snapshot system """ - - # normal snapshot - SNAP_PREFIX = "@apt-snapshot-" - # backname when changing - BACKUP_PREFIX = SNAP_PREFIX + "old-root-" - - def __init__(self, fstab="/etc/fstab"): - self.fstab = Fstab(fstab) - self.commands = LowLevelCommands() - self._btrfs_root_mountpoint = None - - def snapshots_supported(self): - """ verify that the system supports apt btrfs snapshots - by checking if the right fs layout is used etc - """ - # check for the helper binary - if not os.path.exists("/sbin/btrfs"): - return False - # check the fstab - entry = self._get_supported_btrfs_root_fstab_entry() - return entry is not None - - def _get_supported_btrfs_root_fstab_entry(self): - """ return the supported btrfs root FstabEntry or None """ - for entry in self.fstab: - if (entry.mountpoint == "/" and - entry.fstype == "btrfs" and - "subvol=@" in entry.options): - return entry - return None - - def _uuid_for_mountpoint(self, mountpoint, fstab="/etc/fstab"): - """ return the device or UUID for the given mountpoint """ - for entry in self.fstab: - if entry.mountpoint == mountpoint: - return entry.fs_spec - return None - - def mount_btrfs_root_volume(self): - uuid = self._uuid_for_mountpoint("/") - mountpoint = tempfile.mkdtemp(prefix="apt-btrfs-snapshot-mp-") - if not self.commands.mount(uuid, mountpoint): - return None - self._btrfs_root_mountpoint = mountpoint - return self._btrfs_root_mountpoint - - def umount_btrfs_root_volume(self): - res = self.commands.umount(self._btrfs_root_mountpoint) - os.rmdir(self._btrfs_root_mountpoint) - self._btrfs_root_mountpoint = None - return res - - def _get_now_str(self): - return datetime.datetime.now().replace(microsecond=0).isoformat( - str('_')) - - def create_btrfs_root_snapshot(self, additional_prefix=""): - mp = self.mount_btrfs_root_volume() - snap_id = self._get_now_str() - res = self.commands.btrfs_subvolume_snapshot( - os.path.join(mp, "@"), - os.path.join(mp, self.SNAP_PREFIX + additional_prefix + snap_id)) - self.umount_btrfs_root_volume() - return res - - def get_btrfs_root_snapshots_list(self, older_than=0): - """ get the list of available snapshot - If "older_then" is given (in unixtime format) it will only include - snapshots that are older then the given date) - """ - l = [] - # if older_than is used, ensure that the rootfs does not use - # "noatime" - if older_than != 0: - entry = self._get_supported_btrfs_root_fstab_entry() - if not entry: - raise AptBtrfsNotSupportedError() - if "noatime" in entry.options: - raise AptBtrfsRootWithNoatimeError() - # if there is no older than, interpret that as "now" - if older_than == 0: - older_than = time.time() - mp = self.mount_btrfs_root_volume() - for e in os.listdir(mp): - if e.startswith(self.SNAP_PREFIX): - # fstab is read when it was booted and when a snapshot is - # created (to check if there is support for btrfs) - atime = os.path.getatime(os.path.join(mp, e, "etc", "fstab")) - if atime < older_than: - l.append(e) - self.umount_btrfs_root_volume() - return l - - def print_btrfs_root_snapshots(self): - print("Available snapshots:") - print(" \n".join(self.get_btrfs_root_snapshots_list())) - return True - - def _parse_older_than_to_unixtime(self, timefmt): - now = time.time() - if not timefmt.endswith("d"): - raise Exception("Please specify time in days (e.g. 10d)") - days = int(timefmt[:-1]) - return now - (days * 24 * 60 * 60) - - def print_btrfs_root_snapshots_older_than(self, timefmt): - older_than_unixtime = self._parse_older_than_to_unixtime(timefmt) - try: - print("Available snapshots older than '%s':" % timefmt) - print(" \n".join(self.get_btrfs_root_snapshots_list( - older_than=older_than_unixtime))) - except AptBtrfsRootWithNoatimeError: - sys.stderr.write("Error: fstab option 'noatime' incompatible " - "with option") - return False - return True - - def clean_btrfs_root_snapshots_older_than(self, timefmt): - res = True - older_than_unixtime = self._parse_older_than_to_unixtime(timefmt) - try: - for snap in self.get_btrfs_root_snapshots_list( - older_than=older_than_unixtime): - res &= self.delete_snapshot(snap) - except AptBtrfsRootWithNoatimeError: - sys.stderr.write("Error: fstab option 'noatime' incompatible with " - "option") - return False - return res - - def command_set_default(self, snapshot_name): - res = self.set_default(snapshot_name) - return res - - def set_default(self, snapshot_name, backup=True): - """ set new default """ - mp = self.mount_btrfs_root_volume() - new_root = os.path.join(mp, snapshot_name) - if (os.path.isdir(new_root) and - snapshot_name.startswith("@") and - snapshot_name != "@"): - default_root = os.path.join(mp, "@") - backup = os.path.join(mp, self.BACKUP_PREFIX + self._get_now_str()) - os.rename(default_root, backup) - os.rename(new_root, default_root) - print("Default changed to %s, please reboot for changes to take " - "effect." % snapshot_name) - else: - print("You have selected an invalid snapshot. Please make sure " - "that it exists, and that it is not \"@\".") - self.umount_btrfs_root_volume() - return True - - def delete_snapshot(self, snapshot_name): - mp = self.mount_btrfs_root_volume() - res = self.commands.btrfs_delete_snapshot( - os.path.join(mp, snapshot_name)) - self.umount_btrfs_root_volume() - return res diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/VERSION ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/VERSION --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/VERSION 2012-09-04 08:02:59.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/VERSION 1970-01-01 00:00:00.000000000 +0000 @@ -1,500 +0,0 @@ -base-installer (1.122ubuntu8) quantal; urgency=low - - * Add highbank support - - -- Michael Casadevall Wed, 16 May 2012 11:25:53 -0400 - -base-installer (1.122ubuntu7) precise; urgency=low - - * Backport from upstream (Joey Hess): - - Add missing semicolon to /etc/apt/apt.conf.d/00CDMountPoint. - - -- Colin Watson Sun, 08 Apr 2012 09:54:41 +0100 - -base-installer (1.122ubuntu6) precise; urgency=low - - * Use -smp for both powerpc and powerpc64 variants in Ubuntu. - - -- Adam Conrad Tue, 20 Mar 2012 11:02:40 -0600 - -base-installer (1.122ubuntu5) precise; urgency=low - - * Correct test-suite to actually pass - - -- Michael Casadevall Fri, 17 Feb 2012 12:53:41 -0800 - -base-installer (1.122ubuntu4) precise; urgency=low - - * Add armadaxp to base-installer (LP: #934451) - - -- Michael Casadevall Fri, 17 Feb 2012 11:49:03 -0800 - -base-installer (1.122ubuntu3) precise; urgency=low - - * "Fix" mx5 test results to pass (we don't actually use this - subarch in Ubuntu's d-i right now, so the test is meaningless). - - -- Adam Conrad Thu, 15 Dec 2011 10:28:43 -0700 - -base-installer (1.122ubuntu2) precise; urgency=low - - * Move kernel/tests/armhf/* to armel/, and symlink armhf to armel. - * Symlink kernel/armhf.sh to kernel/armel.sh, to match above change. - - -- Adam Conrad Thu, 15 Dec 2011 10:08:57 -0700 - -base-installer (1.122ubuntu1) precise; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host and apt-setup/security_path) as - well as the unadorned suite; also -proposed if apt-setup/proposed is - true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, armel/omap, and armel/omap4 - subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - -- Colin Watson Mon, 21 Nov 2011 13:45:55 +0000 - -base-installer (1.122) unstable; urgency=low - - [ Joey Hess ] - * Remove base-installer/kernel/linux/initramfs-generators - and vestigial support for yaird. - - [ Matt Kraai ] - * Use an initrd on mipsel/loongson-2f systems. Closes: #640418 - - [ Milan Kupcevic ] - * Add POWER7 to the powerpc64 family. (Closes: #637519) - - [ Samuel Thibault ] - * Fix kernel name on hurd-any. - - [ Colin Watson ] - * pkgdetails: Use the last of a sequence of stanzas for the same package - name, rather than the first (closes: #649482). - - [ Updated translations ] - * Belarusian (be.po) by Viktar Siarheichyk - * Bulgarian (bg.po) by Damyan Ivanov - * Hebrew (he.po) by Lior Kaplan - * Hindi (hi.po) by Kumar Appaiah - * Kannada (kn.po) by Prabodh C P - * Korean (ko.po) by Changwoo Ryu - * Polish (pl.po) by Marcin Owsiany - * Romanian (ro.po) by Ioan Eugen Stan - * Sinhala (si.po) by Danishka Navin - * Turkish (tr.po) by Mert Dirik - - -- Colin Watson Mon, 21 Nov 2011 13:32:00 +0000 - -base-installer (1.121ubuntu1) precise; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host and apt-setup/security_path) as - well as the unadorned suite; also -proposed if apt-setup/proposed is - true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, armel/omap, and armel/omap4 - subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - -- Colin Watson Tue, 25 Oct 2011 01:19:23 +0100 - -base-installer (1.121) unstable; urgency=low - - [ Colin Watson ] - * Merge from Ubuntu: - - Run dpkg with --force-unsafe-io during installation; syncing is - unnecessary in this context and can slow things down quite a bit - (closes: #605384). - * Consider 3.0 and later kernels as being like 2.6 for the purposes of - debconf template selection. - - [ Samuel Thibault ] - * Propose kernels only of the same kind (closes: Bug#637432) - - [ Joey Hess ] - * Treat 3.x the same as 2.6 in arch_get_kernel. - - [ Updated translations ] - * German (de.po) by Holger Wansing - * Basque (eu.po) - * Italian (it.po) by Milo Casagrande - * Macedonian (mk.po) by Arangel Angov - * Simplified Chinese (zh_CN.po) by YunQiang Su - - -- Joey Hess Wed, 24 Aug 2011 19:11:09 -0400 - -base-installer (1.120) unstable; urgency=low - - [ Samuel Thibault ] - * Redirect hurd-i386 active firmlink to null to avoid letting callers keep - trying reading from it. - - -- Otavio Salvador Sun, 24 Jul 2011 00:20:08 +0200 - -base-installer (1.119ubuntu4) oneiric; urgency=low - - * Honour apt-setup/security_path when constructing initial security - entries in sources.list (LP: #820306). - - -- Colin Watson Tue, 16 Aug 2011 10:53:17 +0100 - -base-installer (1.119ubuntu3) oneiric; urgency=low - - * Adjust for Linux 3.0. - - -- Colin Watson Thu, 16 Jun 2011 20:54:48 +0100 - -base-installer (1.119ubuntu2) oneiric; urgency=low - - * Added omap4 subarchitecture - - -- Michael Casadevall Thu, 16 Jun 2011 19:19:27 +0000 - -base-installer (1.119ubuntu1) oneiric; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host) as well as the unadorned suite; - also -proposed if apt-setup/proposed is true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, and armel/omap subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - Run dpkg with --force-unsafe-io during installation. - * Explicitly drop code supporting -386 kernels, which were dropped from - Ubuntu some time ago. - - -- Colin Watson Thu, 26 May 2011 15:54:12 +0100 - -base-installer (1.119) unstable; urgency=low - - [ Ben Hutchings ] - * Correct i386 kernel package selection tests for Transmeta TM5800 - * Fix i386 kernel package compatibility check: a suffix of '-pae' means - the package is incompatible, just as '-bigmem' does - * Fix i386 feature tests for '686' kernel flavour - * Add VIA C3 'Nehemiah' as 686-class processor without PAE - - -- Christian Perrier Mon, 25 Apr 2011 07:22:47 +0200 - -base-installer (1.118) unstable; urgency=low - - * Team upload - - [ Ben Hutchings ] - * Update i386 kernel selection for new flavours in wheezy. - - -- Christian Perrier Sun, 24 Apr 2011 17:18:41 +0200 - -base-installer (1.117) unstable; urgency=low - - * Team upload - - [ Samuel Thibault ] - * Add hurd-i386 kernel support. - - [ Joey Hess ] - * If archive.gpg is missing for some reason, still pass the keyring - parameter to debootstrap. If you absolutely must run the installer - w/o a keyring and bootstrap from the network, you can preseed - debian-installer/allow_unauthenticated. - * Pass --no-check-gpg to debootstrap when not using http/ftp, - or when allow_unauthenticated is set, since debootstrap has - changed to validating the keyring when present by default. - * Needs debootstrap 1.0.30 - - [ Colin Watson ] - * Support AMD CPU family 18 (thanks, Hsin-Yi, Chen; LP: #760490). - - [ Hector Oron ] - * Add armhf architecture support - - [ Updated translations ] - * Bulgarian (bg.po) by Damyan Ivanov - * Esperanto (eo.po) by Felipe Castro - * Estonian (et.po) by Mattias Põldaru - * Korean (ko.po) by Changwoo Ryu - * Romanian (ro.po) by Eddy Petrișor - * Slovak (sk.po) by Ivan Masár - * Swedish (sv.po) by Daniel Nylander - * Uyghur (ug.po) by Sahran - - -- Christian Perrier Sun, 24 Apr 2011 08:43:29 +0200 - -base-installer (1.116ubuntu2) natty; urgency=low - - [ Hsin-Yi, Chen ] - * Support AMD CPU family 18 (LP: #760490). - - -- Colin Watson Thu, 14 Apr 2011 18:07:46 +0100 - -base-installer (1.116ubuntu1) natty; urgency=low - - * Resynchronise with Debian (LP: #724822). Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host) as well as the unadorned suite; - also -proposed if apt-setup/proposed is true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, and armel/omap subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - Run dpkg with --force-unsafe-io during installation. - - -- Colin Watson Fri, 25 Feb 2011 10:22:02 +0000 - -base-installer (1.116) unstable; urgency=low - - [ Colin Watson ] - * Support AMD CPU family 20 (thanks, Keng-Yü Lin; LP: #676838). - - [ Joey Hess ] - * pkgdetails: Return the value of the field specified by the - DEBOOTSTRAP_CHECKSUM_FIELD environment variable. - - -- Joey Hess Mon, 21 Feb 2011 20:26:59 -0400 - -base-installer (1.115ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host) as well as the unadorned suite; - also -proposed if apt-setup/proposed is true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, and armel/omap subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - Support AMD CPU family 20. - - Run dpkg with --force-unsafe-io during installation. - - -- Colin Watson Mon, 31 Jan 2011 14:38:47 +0000 - -base-installer (1.115) unstable; urgency=low - - [ Miguel Figueiredo ] - * add title to pick_kernel and driver-policy - - [ Otávio Salvador ] - * warn when used with an unknown OS value. - - [ Updated translations ] - * Lao (lo.po) by Anousak Souphavanh - * Northern Sami (se.po) by Børre Gaup - * Sinhala (si.po) by Danishka Navin - * Slovenian (sl.po) by Vanja Cvelbar - * Telugu (te.po) by Arjuna Rao Chavala - - -- Otavio Salvador Fri, 24 Dec 2010 19:08:53 -0200 - -base-installer (1.114ubuntu3) natty; urgency=low - - * Run dpkg with --force-unsafe-io during installation; syncing is - unnecessary in this context and can slow things down quite a bit. - - -- Colin Watson Mon, 10 Jan 2011 12:39:20 -0600 - -base-installer (1.114ubuntu2) natty; urgency=low - - * Support AMD CPU family 20 (thanks, Keng-Yü Lin; LP: #676838). - - -- Colin Watson Thu, 06 Jan 2011 22:24:50 +0000 - -base-installer (1.114ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host) as well as the unadorned suite; - also -proposed if apt-setup/proposed is true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, and armel/omap subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - -- Colin Watson Mon, 15 Nov 2010 10:07:26 +0000 - -base-installer (1.114) unstable; urgency=low - - [ Petter Reinholdtsen ] - * Prefer 686 kernel over 486 kernel for VIA C7-D CPUs, ie family 6 - model 13 (Closes: #517121). - - [ Colin Watson ] - * Unset MACHINE before running tests, to avoid environment pollution. - - [ Otavio Salvador ] - * Avoid using UUID for swap partitions stored at LVM. Closes: #568877. - - [ Updated translations ] - * Bengali (bn.po) by Israt Jahan - * Catalan (ca.po) by Jordi Mallach - * Persian (fa.po) by Behrad Eslamifar - * Icelandic (is.po) by Sveinn í Felli - * Kazakh (kk.po) by Baurzhan Muftakhidinov - - -- Otavio Salvador Sat, 13 Nov 2010 08:58:32 -0200 - -base-installer (1.113ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Use and depend on the Ubuntu keyring. - - Enable the restricted component by default, unless - apt-setup/restricted is preseeded to false. - - Set up the default sources.list to look in -updates and -security (the - latter from apt-setup/security_host) as well as the unadorned suite; - also -proposed if apt-setup/proposed is true. - - Use Ubuntu kernel image names. - - Allow preseeding base-installer/kernel/override-image to force a given - kernel to be used. - - Install busybox-initramfs rather than busybox. - - Revert Joey's patch to call base-installer.d hooks after running - debootstrap, which broke console-setup's expectation of being able to - insert its configuration file into /target before console-setup is - installed by debootstrap. - - Add armel/imx51, armel/dove, and armel/omap subarchitectures. - - Install kernel headers to match the kernel. This may be overridden by - setting base-installer/kernel/headers to false. - - Add base-installer/kernel/backports-modules template, which may be - preseeded to install selected linux-backports-modules-* packages. - - -- Colin Watson Thu, 21 Oct 2010 16:29:45 +0100 - -base-installer (1.113) unstable; urgency=low - - * Move base-installer/install-recommends from bootstrap-base.templates - to base-installer.templates. - - -- Otavio Salvador Sun, 26 Sep 2010 14:56:54 -0300 - -base-installer (1.112) unstable; urgency=low - - * Set Dir::Media::MountPath to /media/cdrom as well as - Acquire::cdrom::mount, as otherwise apt doesn't consistently read from - the right one. - - [ Updated translations ] - * Danish (da.po) by Anders Jenbo - - -- Colin Watson Sun, 19 Sep 2010 23:09:20 +0100 - -base-installer (1.111) unstable; urgency=low - - * Team upload - * Really add kernel/tests/i386/pentium-4M-bigmem-2.test - - -- Christian Perrier Sun, 05 Sep 2010 11:51:14 +0200 - -base-installer (1.110) unstable; urgency=low - - * Team upload. - - [ Ben Hutchings ] - * Improve i386 kernel flavour selection. Closes: #589579 - - Prefer 686-bigmem flavour if it is needed to access all RAM - - Prefer 686 or 686-bigmem flavour for all AMD K7 processors - - Offer 686-bigmem and amd64 flavours for processors that support them - - -- Christian Perrier Sat, 04 Sep 2010 07:05:32 +0200 - -base-installer (1.109) unstable; urgency=low - - [ Jeremie Koenig ] - * Don't check /proc/mounts if it does not exist (ie. on Hurd) (Closes: - Bug#588776). - - [ Aurelien Jarno ] - * Teach library.sh how to do a bind mount on Hurd and GNU/kFreeBSD. - - [ Updated translations ] - * Asturian (ast.po) by maacub - * Bulgarian (bg.po) by Damyan Ivanov - * Bosnian (bs.po) by Armin Beširović - * Danish (da.po) by Jacob Sparre Andersen - * Persian (fa.po) by Ebrahim Byagowi - * Finnish (fi.po) by Esko Arajärvi - * Kazakh (kk.po) by Baurzhan Muftakhidinov - * Panjabi (pa.po) by A S Alam - * Portuguese (Brazil) (pt_BR.po) by Felipe Augusto van de Wiel (faw) - * Serbian (sr.po) by Karolina Kalic - * Telugu (te.po) by Arjuna Rao Chavala - - -- Aurelien Jarno Mon, 23 Aug 2010 11:23:24 +0200 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/Makefile ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/Makefile --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/Makefile 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -ARCHES = alpha amd64 armeb armel armhf hppa i386 ia64 m68k mips mipsel powerpc s390 sh4 sparc kfreebsd-amd64 kfreebsd-i386 - -test: - @STATUS=0; \ - cd tests && \ - for x in $(ARCHES); do ./runtests "$$x" || STATUS=1; done; \ - exit "$$STATUS" diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/README ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/README --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/README 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -Each architecture must define the following functions in kernel/$ARCH.sh: - - arch_get_kernel_flavour () - - Prints a string describing the flavour of kernel to install. This can be - in whatever scheme you like; it just has to be in sync with the other - architecture-specific functions, where it's used. - - May expect $ARCH and $SUBARCH to be set to the architecture and - subarchitecture (if applicable) respectively. - - This function should describe the kernel flavour in sufficiently general - terms as to be able to test the usability of kernels of any major - version. As such, it is not a good idea to make this function - conditional on $KERNEL_MAJOR. If you need radically different kernel - names depending on the kernel major version, you should handle that in - the other architecture-specific functions. - - Returns zero if successful, or non-zero otherwise. If non-zero, it - should print some kind of warning to syslog explaining why. - - arch_check_usable_kernel (kernel, flavour) - - Test whether a kernel is usable at all. For the purposes of this test, - we assume that SMP is usable on UP and vice versa (is this safe?). Some - architectures just have a hierarchy of optimized kernels, whereas some - have subarchitectures that are incompatible at the kernel level. This - function should cope with both cases. - - Note that by default any postfix (starting with a hyphen) is allowed - after the flavor. This allows for custom kernels and also, for example, - for kernel meta packages for stable kernel updates that have a postfix - to distinguish them from the regular kernel meta packages. - This means that if a specific postfix (such as -smp, or -bigmem) is not - allowed, this should be tested explicitly. - - The same goes for prefixes: any prefix before the flavor is allowed by - default. - - Returns zero if the kernel is usable on this flavour, or non-zero - otherwise. - - arch_get_kernel (flavour) - - Print the preferred kernels for this flavour, one per line, in order of - preference. - - No return value; must not fail. (If there's a problem, one of the two - functions above should already have failed.) - -Shell variables all functions may expect: - - ARCH - The architecture (as returned by udpkg --print-architecture). - SUBARCH - The subarchitecture (as returned by archdetect). - CPUINFO - The location of /proc/cpuinfo, parameterised for the benefit of the test - suite. - KERNEL_MAJOR - The major version of the running kernel, e.g. 2.6. - KERNEL_VERSION - The full version of the running kernel, e.g. 2.6.8. - KERNEL_FLAVOUR - The flavour of the running kernel, e.g. 486, 686-bigmem or ixp4xx. - MACHINE - The machine hardware name (as returned by uname -m). - NUMCPUS - The number of CPUs in the machine. Will only be set if /var/numcpus - exists, and may not be very accurate (ie, 2 for any SMP machine). - Only of use when grepping CPUINFO won't work. - -Please update the regression tests in the tests/ directory when making -changes here. In particular, calls to inspect the kernel version or -files in /proc need support in the test suite so that the full test -suite can be run for all architectures on any architecture. diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/alpha.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/alpha.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/alpha.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/alpha.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -arch_get_kernel_flavour () { - echo $MACHINE - return 0 -} - -arch_check_usable_kernel () { - return 0 -} - -arch_get_kernel () { - imgbase=linux-image - version=$KERNEL_MAJOR-alpha - - if [ "$NUMCPUS" ] && [ "$NUMCPUS" -gt 1 ]; then - echo "$imgbase-$version-smp" - fi - - echo "$imgbase-$version-generic" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/amd64.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/amd64.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/amd64.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/amd64.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -arch_get_kernel_flavour () { - VENDOR=`grep '^vendor_id' "$CPUINFO" | head -n1 | cut -d: -f2` - case "$VENDOR" in - " AuthenticAMD"*) - echo amd64-k8 ;; - " GenuineIntel"*) - echo em64t-p4 ;; - *) - echo amd64-generic ;; - esac - return 0 -} - -arch_check_usable_kernel () { - if echo "$1" | grep -Eq -- "-(server|generic|virtual|xen|preempt|rt)(-.*)?$"; then return 0; fi - - return 1 -} - -arch_get_kernel () { - echo "linux-generic" - echo "linux-image-generic" - - echo "linux-server" - echo "linux-image-server" - - echo "linux-virtual" - echo "linux-image-virtual" - - echo "linux-xen" - echo "linux-image-xen" - - echo "linux-preempt" - echo "linux-image-preempt" - - echo "linux-rt" - echo "linux-image-rt" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/armeb.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/armeb.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/armeb.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/armeb.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - ixp4xx) - echo "$SUBARCH" - return 0 ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - echo "linux-image-$KERNEL_MAJOR-$1" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/armel.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/armel.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/armel.sh 2012-05-16 15:25:22.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/armel.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - armadaxp|dove|highbank|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5) - echo "$SUBARCH" - return 0 ;; - ads) - # NOTE: this kernel is not in Debian, but makes it - # easier to offer unofficial support from a private apt-archive - echo "ads" - return 0 ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - echo "linux-$1" - echo "linux-image-$1" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/armhf.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/armhf.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/armhf.sh 2012-05-16 15:25:22.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/armhf.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - armadaxp|dove|highbank|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5) - echo "$SUBARCH" - return 0 ;; - ads) - # NOTE: this kernel is not in Debian, but makes it - # easier to offer unofficial support from a private apt-archive - echo "ads" - return 0 ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - echo "linux-$1" - echo "linux-image-$1" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/hppa.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/hppa.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/hppa.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/hppa.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -arch_get_kernel_flavour () { - echo "$MACHINE" - return 0 -} - -arch_check_usable_kernel () { - # TODO recent kernels expose os32/os64 in 'capabilities' line in cpuinfo - if echo "$1" | grep -Eq -- "-(parisc|hppa)(32)?(-.*)?$"; then return 0; fi - if [ "$2" = parisc ]; then return 1; fi - if echo "$1" | grep -Eq -- "-(parisc|hppa)(64)?(-.*)?$"; then return 0; fi - - # default to usable in case of strangeness - warning "Unknown kernel usability: $1 / $2" - return 0 -} - -arch_get_kernel () { - case $1 in - parisc) family=hppa32 ;; - parisc64) family=hppa64 ;; - esac - - echo "linux-$family" - echo "linux-image-$family" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/hurd-i386.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/hurd-i386.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/hurd-i386.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/hurd-i386.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -arch_get_kernel_flavour () { - # TODO: test Xen, return xen-486 in that case - echo 486 - return 0 -} - -arch_check_usable_kernel () { - # TODO: test Xen - return 0 -} - -arch_get_kernel () { - echo "gnumach-image-$KERNEL_MAJOR-$1" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/i386.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/i386.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/i386.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/i386.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,141 +0,0 @@ -arch_get_kernel_flavour () { - # Should we offer an amd64 kernel? - local HAVE_LM - if grep -q '^flags.*\blm\b' "$CPUINFO"; then - HAVE_LM=y - else - HAVE_LM=n - fi - - # Should we offer a PAE kernel? - local HAVE_PAE - if grep -q '^flags.*\bpae\b' "$CPUINFO"; then - HAVE_PAE=y - else - HAVE_PAE=n - fi - - # Should we prefer a PAE/amd64 kernel - is there RAM above 4GB? - local WANT_PAE - if [ -z "$RAM_END" ]; then - local MAP MAP_END - RAM_END=0 - for MAP in /sys/firmware/memmap/* ; do - if [ "$(cat $MAP/type)" = "System RAM" ]; then - MAP_END="$(cat $MAP/end)" - if [ $(($MAP_END > $RAM_END)) = 1 ]; then - RAM_END=$MAP_END - fi - fi - done - fi - if [ $(($RAM_END > 0x100000000)) = 1 ]; then - WANT_PAE=y - else - WANT_PAE=n - fi - # or is the installer running a PAE kernel? - case "$KERNEL_FLAVOUR" in - 686-bigmem* | 686-pae* | generic-pae | xen) - WANT_PAE=y - ;; - esac - - case "$HAVE_LM$HAVE_PAE$WANT_PAE" in - yyy) - echo 686-pae 686-bigmem amd64 686 486 - return 0 - ;; - yyn) - echo 686 686-pae 686-bigmem amd64 486 - return 0 - ;; - yn?) - warning "Processor with LM but no PAE???" - ;; - nyy) - echo 686-pae 686-bigmem 686 486 - return 0 - ;; - nyn) - echo 686 686-pae 686-bigmem 486 - return 0 - ;; - nn?) - # Need to check whether 686 is suitable - ;; - esac - - # Should we offer a 686 kernel? - if grep -q '^flags.*\bfpu\b.*\btsc\b.*\bcx8\b.*\bcmov\b' "$CPUINFO"; then - echo 686 486 - else - echo 486 - fi -} - -arch_check_usable_kernel () { - local NAME="$1" - - set -- $2 - while [ $# -ge 1 ]; do - case "$1:$NAME" in - *:*-"$1") - return 0; - ;; - *:*-"$1"-bigmem* | *:*-"$1"-pae*) - # Don't allow -bigmem or -pae suffix, as these - # require extra CPU features - ;; - *:*-"$1"-*) - # Do allow any other hyphenated suffix - return 0 - ;; - 686-pae:*-generic-pae | 686-pae:*-generic-pae-*) - return 0 - ;; - *:*-generic-pae | *:*-generic-pae-*) - # Don't allow -generic-pae for non-pae - ;; - 686*:*-generic | 686*:*-generic-*) - return 0 - ;; - 686*:*-virtual | 686*:*-virtual-*) - return 0 - ;; - 686*:*-rt | 686*:*-rt-*) - return 0 - ;; - 686-pae:*-xen | 686-pae:*-xen-*) - return 0 - ;; - esac - shift - done - return 1 -} - -arch_get_kernel () { - imgbase="linux-image-$KERNEL_MAJOR" - - set -- $1 - while [ $# -ge 1 ]; do - case $1 in - 686-pae) - echo "linux-generic-pae" - echo "linux-image-generic-pae" - echo "linux-xen" - echo "linux-image-xen" - ;; - 686) - echo "linux-generic" - echo "linux-image-generic" - echo "linux-virtual" - echo "linux-image-virtual" - echo "linux-rt" - echo "linux-image-rt" - ;; - esac - shift - done -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/ia64.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/ia64.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/ia64.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/ia64.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -arch_get_kernel_flavour () { - if grep '^features' "$CPUINFO" | grep -q branchlong; then - echo mckinley - else - echo itanium - fi - return 0 -} - -arch_check_usable_kernel () { - return 0 -} - -arch_get_kernel () { - echo "linux-ia64" - echo "linux-image-ia64" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/kfreebsd-amd64.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/kfreebsd-amd64.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/kfreebsd-amd64.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/kfreebsd-amd64.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -arch_get_kernel_flavour () { - VENDOR=`grep '^vendor_id' "$CPUINFO" | head -n1 | cut -d: -f2` - case "$VENDOR" in - *) - echo amd64 ;; - esac - return 0 -} - -arch_check_usable_kernel () { - if echo "$1" | grep -Eq -- "-amd64(-.*)?$"; then return 0; fi - - return 1 -} - -arch_get_kernel () { - echo "kfreebsd-image-$KERNEL_MAJOR-amd64" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/kfreebsd-i386.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/kfreebsd-i386.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/kfreebsd-i386.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/kfreebsd-i386.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -arch_get_kernel_flavour () { - VENDOR=`grep '^vendor_id' "$CPUINFO" | head -n1 | cut -d: -f2` - FAMILY=`grep '^cpu family' "$CPUINFO" | head -n1 | cut -d: -f2` - MODEL=`grep '^model[[:space:]]*:' "$CPUINFO" | head -n1 | cut -d: -f2` - NUMCPUS=`grep ^processor "$CPUINFO" | wc -l` - - # Only offer smp if the system supports has more than one cpu - if test $NUMCPUS -gt "1" ; then - SMP="-smp" - fi - - case "$VENDOR" in - " AuthenticAMD"*) - case "$FAMILY" in - " 15"|" 16"|" 17"|" 18"|" 20") # k8 - echo 686$SMP - ;; - " 6") # k7 - case "$MODEL" in - " 0"|" 1"|" 2"|" 3"|" 4"|" 5") - # May not have SSE support - echo 486 ;; - *) echo 686$SMP ;; - esac - ;; - *) echo 486 ;; - esac - ;; - " GenuineIntel") - case "$FAMILY" in - " 6"|" 15") echo 686$SMP ;; - *) echo 486 ;; - esac - ;; - " CentaurHauls") - case "$FAMILY" in - " 6") - case "$MODEL" in - " 9"|" 10") echo 686$SMP ;; - *) echo 486 ;; - esac - ;; - *) - echo 486 ;; - esac - ;; - *) - echo 486 ;; - esac - return 0 -} - -arch_check_usable_kernel () { - if echo "$1" | grep -Eq -- "-486(-.*)?$"; then return 0; fi - if [ "$2" = 486 ]; then return 1; fi - if echo "$1" | grep -Eq -- "-686(-.*)?$"; then return 0; fi - if [ "$2" = 686 ] || [ "$2" = 686-smp ]; then return 1; fi - - # default to usable in case of strangeness - warning "Unknown kernel usability: $1 / $2" - return 0 -} - -arch_get_kernel () { - if [ "$1" = 686-smp ]; then - echo "kfreebsd-image-$KERNEL_MAJOR-686-smp" - fi - if [ "$1" = 686 ]; then - echo "kfreebsd-image-$KERNEL_MAJOR-686" - fi - echo "kfreebsd-image-$KERNEL_MAJOR-486" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/m68k.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/m68k.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/m68k.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/m68k.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - amiga|atari|mac|bvme6000|mvme147|mvme16x|q40|sun3|sun3x) - echo "$SUBARCH" - return 0 - ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 - ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - case "$KERNEL_MAJOR" in - 2.6|3.*) - echo "linux-image-$KERNEL_MAJOR-$1" - ;; - *) - warning "Unsupported kernel major '$KERNEL_MAJOR'." - ;; - esac -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/mips.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/mips.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/mips.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/mips.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - 4kc-malta|5kc-malta|r4k-ip22|r5k-ip22|r5k-ip32|sb1-bcm91250a|sb1a-bcm91480b) - echo "$SUBARCH" - return 0 ;; - qemu-mips32) - echo "qemu" - return 0 ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - # The r4k-ip22 kernel will do for r5k-ip22 as well - if [ "$2" = r5k-ip22 ] && \ - echo "$1" | grep -Eq -- "-r4k-ip22(-.*)?$"; then - return 0 - fi - # The 4kc-malta kernel will do for 5kc-malta as well - if [ "$2" = 5kc-malta ] && \ - echo "$1" | grep -Eq -- "-4kc-malta(-.*)?$"; then - return 0 - fi - return 1 -} - -arch_get_kernel () { - case "$KERNEL_MAJOR" in - 2.6|3.*) - case $1 in - r5k-ip22) - set r4k-ip22 - ;; - 5kc-malta) - echo "linux-image-$KERNEL_MAJOR-$1" - set 4kc-malta - ;; - esac - echo "linux-image-$KERNEL_MAJOR-$1" - ;; - *) - warning "Unsupported kernel major '$KERNEL_MAJOR'." - ;; - esac -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/mipsel.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/mipsel.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/mipsel.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/mipsel.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - 4kc-malta|5kc-malta|loongson-2e|loongson-2f|r3k-kn02|r4k-kn04|sb1-bcm91250a|sb1a-bcm91480b) - echo "$SUBARCH" - return 0 ;; - qemu-mips32) - echo "qemu" - return 0 ;; - cobalt) - echo r5k-cobalt - return 0 ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - # The 4kc-malta kernel will do for 5kc-malta as well - if [ "$2" = 5kc-malta ] && \ - echo "$1" | grep -Eq -- "-4kc-malta(-.*)?$"; then - return 0 - fi - return 1 -} - -arch_get_kernel () { - case "$KERNEL_MAJOR" in - 2.6|3.*) - case $1 in - 5kc-malta) - echo "linux-image-$KERNEL_MAJOR-$1" - set 4kc-malta - ;; - esac - echo "linux-image-$KERNEL_MAJOR-$1" - ;; - *) - warning "Unsupported kernel major '$KERNEL_MAJOR'." - ;; - esac -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/powerpc.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/powerpc.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/powerpc.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/powerpc.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -arch_get_kernel_flavour () { - CPU=`grep '^cpu[[:space:]]*:' "$CPUINFO" | head -n1 | cut -d: -f2 | sed 's/^ *//; s/[, ].*//' | tr A-Z a-z` - case "$CPU" in - power3|power4|power4+|ppc970*|power5|power5+|power6|power6x|power7) - family=powerpc64 ;; - cell|i-star|s-star|pa6t|rs64-*) - family=powerpc64 ;; - *) - family=powerpc ;; - esac - case "$SUBARCH" in - powermac*|prep|chrp*|pasemi) - echo "$family" ;; - ps3|cell) - echo powerpc64 ;; - amiga) - echo apus ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac - return 0 -} - -arch_check_usable_kernel () { - # CPU family must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - if [ "$1" = "powerpc64" ] || [ "$1" = "powerpc" ]; then - SMP=-smp - else - SMP= - fi - - case "$KERNEL_MAJOR" in - 2.6|3.*) - if [ "$SMP" ]; then - echo "linux-$1$SMP" - echo "linux-image-$1$SMP" - fi - echo "linux-$1" - echo "linux-image-$1" - ;; - *) - warning "Unsupported kernel major '$KERNEL_MAJOR'." - ;; - esac -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/s390.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/s390.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/s390.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/s390.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -arch_get_kernel_flavour () { - echo $MACHINE - return 0 -} - -arch_check_usable_kernel () { - case "$1" in - *-s390-tape|*-s390x-tape) - # Bastian Blank says: "-s390-tape is only a kernel - # image without any logic and modules" - return 1 ;; - *) - return 0 ;; - esac -} - -arch_get_kernel () { - echo "linux-image-$KERNEL_MAJOR-$1" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/sh4.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/sh4.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/sh4.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/sh4.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -arch_get_kernel_flavour () { - case "$SUBARCH" in - rts7751r2d) - echo "sh7751r" - return 0 ;; - sh7785lcr) - echo "sh7785lcr" - return 0 ;; - *) - warning "Unknown $ARCH subarchitecture '$SUBARCH'." - return 1 ;; - esac -} - -arch_check_usable_kernel () { - # Subarchitecture must match exactly - if echo "$1" | grep -Eq -- "-$2(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - case "$KERNEL_MAJOR" in - 2.6|3.*) - echo "linux-image-$KERNEL_MAJOR-$1" - ;; - *) warning "Unsupported kernel major '$KERNEL_MAJOR'." - ;; - esac -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/sparc.sh ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/sparc.sh --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/sparc.sh 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/sparc.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -arch_get_kernel_flavour () { - case "$MACHINE" in - sparc) - echo sparc32 - log 'sparc32 not supported' - return 1 - ;; - sparc64) echo sparc64 ;; - esac - return 0 -} - -arch_check_usable_kernel () { - if echo "$1" | grep -Eq -- "-sparc64(-.*)?$"; then return 0; fi - return 1 -} - -arch_get_kernel () { - CPUS=`grep 'ncpus probed' "$CPUINFO" | cut -d: -f2` - TYPE=`grep '^type' "$CPUINFO" | head -n1 | cut -d: -f2 | sed -e 's/^[[:space:]]//'` - if [ "$CPUS" -ne 1 ] || [ "$TYPE" = "sun4v" ]; then - echo "linux-$1-smp" - echo "linux-image-$1-smp" - fi - echo "linux-$1" - echo "linux-image-$1" -} diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/README ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/README --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/README 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -base-installer regression test interface -======================================== - -This test suite attempts to test base-installer's per-architecture kernel -selection, using a few shims. Run it using 'make test' in the -base-installer/kernel/ directory or './runtests ' in the -base-installer/kernel/tests/ directory. - -Individual tests consist of a .test file in the appropriate per-architecture -subdirectory, plus optionally some auxiliary files. The .test file consists -of a series of directives, one per line. All lists are space-separated, and -all kernel versions are the names of kernel packages. The available -directives are as follows: - - subarch - The subarchitecture, if relevant: e.g. powermac_newworld. - - cpuinfo - Path (relative to the .test file) to a file to be used instead of - /proc/cpuinfo while running this test. If not specified, $CPUINFO will - be unset. - - numcpus - The number of processors in the machine to emulate for the test. - Only needed on arches that expect a /var/numcpus file and don't have - the info in /proc/cpuinfo. - - machine - The machine hardware name, as returned by 'uname -m'. - - majors - The kernel major versions to test: e.g. 2.6. - - flavour - The expected kernel flavour for this machine. - - kernel-2.6 - The "best" 2.6 kernel versions for this machine, as expected to be - returned by arch_get_kernel. - - usable - A list of kernel versions that are expected to be usable on this - machine. - - unusable - A list of kernel versions that are expected to be unusable on this - machine. - - env - Any environment variable you want to set. - -Please add to the test suite as appropriate. diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/alpha/escher-smp.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/alpha/escher-smp.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/alpha/escher-smp.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/alpha/escher-smp.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -machine alpha -cpuinfo escher.cpuinfo -flavour alpha -majors 2.6 -kernel-2.6 \ - linux-image-2.6-alpha-smp \ - linux-image-2.6-alpha-generic -numcpus 2 -usable \ - linux-image-2.6-alpha-smp \ - linux-image-2.6-alpha-generic \ - linux-image-2.6.18-1-alpha-smp \ - linux-image-2.6.18-1-alpha-generic diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/alpha/escher.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/alpha/escher.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/alpha/escher.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/alpha/escher.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -cpu : Alpha -cpu model : PCA56 -cpu variation : 7 -cpu revision : 0 -cpu serial number : -system type : EB164 -system variation : SX164 -system revision : 0 -system serial number : -cycle frequency [Hz] : 533333333 -timer frequency [Hz] : 1024.00 -page size [bytes] : 8192 -phys. address bits : 40 -max. addr. space # : 127 -BogoMIPS : 1057.24 -kernel unaligned acc : 36 (pc=fffffc000107a940,va=2000000003c) -user unaligned acc : 208 (pc=200001d111c,va=120010a93) -platform string : Digital AlphaPC 164SX 533 MHz -cpus detected : 1 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/alpha/escher.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/alpha/escher.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/alpha/escher.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/alpha/escher.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -machine alpha -cpuinfo escher.cpuinfo -flavour alpha -majors 2.6 -kernel-2.6 linux-image-2.6-alpha-generic -usable \ - linux-image-2.6-alpha-smp \ - linux-image-2.6-alpha-generic \ - linux-image-2.6.18-1-alpha-smp \ - linux-image-2.6.18-1-alpha-generic diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -processor : 0 -vendor_id : AuthenticAMD -cpu family : 15 -model : 12 -model name : AMD Athlon(tm) 64 Processor 3200+ -stepping : 0 -cpu MHz : 2247.446 -cache size : 512 KB -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx mmxext lm 3dnowext 3dnow -bogomips : 4423.68 -TLB size : 1088 4K pages -clflush size : 64 -cache_alignment : 64 -address sizes : 40 bits physical, 48 bits virtual -power management: ts fid vid ttp - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -cpuinfo cittagazze.cpuinfo -majors 2.6 -flavour amd64-k8 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-server \ - linux-image-server \ - linux-virtual \ - linux-image-virtual \ - linux-xen \ - linux-image-xen \ - linux-preempt \ - linux-image-preempt \ - linux-rt \ - linux-image-rt -usable \ - linux-generic \ - linux-server \ - linux-image-generic \ - linux-image-server \ - linux-image-2.6.20-15-generic \ - linux-image-2.6.20-15-server diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armeb/slug.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armeb/slug.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armeb/slug.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armeb/slug.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-IXP42x Family rev 1 (v5l) -BogoMIPS : 133.12 -Features : swp half thumb fastmult edsp -CPU implementer : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x41f -CPU revision : 1 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache format : Harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : Linksys NSLU2 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armeb/slug.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armeb/slug.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armeb/slug.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armeb/slug.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -subarch ixp4xx -cpuinfo slug.cpuinfo -majors 2.6 -flavour ixp4xx -kernel-2.6 linux-image-2.6-ixp4xx -usable \ - linux-image-2.6-ixp4xx diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-PXA255 rev 6 (v5l) -BogoMIPS : 397.31 -Features : swp half thumb fastmult edsp -CPU implementor : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x2d0 -CPU revision : 6 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache unified : harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : ADS VGX -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/adsvgx.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -subarch ads -cpuinfo adsvgx.cpuinfo -majors 2.6 -flavour ads -kernel-2.6 \ - linux-ads \ - linux-image-ads -usable \ - linux-image-ads \ - linux-image-2.6.18-4-ads -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-kirkwood \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-footbridge \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-kirkwood \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-footbridge \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-ixp4xx \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Processor : Marvell - PJ4Bv7 Processor rev 2 (v7l) -processor : 0 -BogoMIPS : 1332.01 - -processor : 1 -BogoMIPS : 1332.01 - -processor : 2 -BogoMIPS : 1332.01 - -processor : 3 -BogoMIPS : 1332.01 - -Features : swp half thumb fastmult vfp edsp vfpv3 -CPU implementer : 0x56 -CPU architecture: 7 -CPU variant : 0x2 -CPU part : 0x584 -CPU revision : 2 - -Hardware : Marvell Armada XP Development Board -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/armadaxp.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch armadaxp -cpuinfo armadaxp.cpuinfo -majors 2.6 -flavour armadaxp -kernel-2.6 \ - linux-armadaxp \ - linux-image-armadaxp -usable \ - linux-image-armadaxp \ - linux-image-11-armadaxp -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 \ - linux-image-imx51 \ - linux-image-11-imx51 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/dove.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/dove.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/dove.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/dove.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : ARMv7 Processor-wmmx-wco rev 1 (v7l) -BogoMIPS : 799.53 -Features : swp half thumb fastmult vfp edsp iwmmxt -CPU implementer : 0x56 -CPU architecture: 7 -CPU variant : 0x0 -CPU part : 0x581 -CPU revision : 1 - -Hardware : Marvell DB-MV88F6781-BP Development Board -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/dove.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/dove.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/dove.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/dove.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch dove -cpuinfo dove.cpuinfo -majors 2.6 -flavour dove -kernel-2.6 \ - linux-dove \ - linux-image-dove -usable \ - linux-image-dove \ - linux-image-11-dove -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 \ - linux-image-imx51 \ - linux-image-11-imx51 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/efikamx.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/efikamx.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/efikamx.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/efikamx.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : ARMv7 Processor rev 1 (v7l) -BogoMIPS : 799.53 -Features : swp half thumb fastmult vfp edsp thumbee vfpv3 -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x2 -CPU part : 0xc08 -CPU revision : 1 - -Hardware : Genesi EfikaMX nettop -Revision : 0011 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/efikamx.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/efikamx.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/efikamx.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/efikamx.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -subarch mx5 -cpuinfo efikamx.cpuinfo -majors 2.6 -flavour mx5 -kernel-2.6 \ - linux-mx5 \ - linux-image-mx5 -usable \ - linux-mx5 \ - linux-image-mx5 -unusable \ - linux-image-2.6-iop32x \ - linux-image-2.6-netwinder \ - linux-image-2.6-orion5x \ - linux-image-2.6-rpc \ - linux-image-2.6-s3c2410 \ - linux-image-2.6-ixp4xx \ - linux-image-2.6-kirkwood diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/imx51.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/imx51.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/imx51.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/imx51.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Processor : ARMv7 Processor rev 1 (v7l) -BogoMIPS : 799.53 -Features : swp half thumb fastmult vfp edsp -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x2 -CPU part : 0xc08 -CPU revision : 1 - -Hardware : Freescale MX51 Babbage Board -Revision : 51011 -Serial : 0000000000000000 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/imx51.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/imx51.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/imx51.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/imx51.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -subarch imx51 -cpuinfo imx51.cpuinfo -majors 2.6 -flavour imx51 -kernel-2.6 \ - linux-imx51 \ - linux-image-imx51 -usable \ - linux-image-imx51 - linux-image-11-imx51 -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/n2100.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/n2100.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/n2100.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/n2100.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-80219 rev 0 (v5l) -BogoMIPS : 593.10 -Features : swp half fastmult edsp -CPU implementer : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x2e3 -CPU revision : 0 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache format : Harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : Thecus N2100 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/n2100.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/n2100.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/n2100.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/n2100.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch iop32x -cpuinfo n2100.cpuinfo -majors 2.6 -flavour iop32x -kernel-2.6 \ - linux-iop32x \ - linux-image-iop32x -usable \ - linux-image-iop32x \ - linux-image-2.6.18-4-iop32x -unusable \ - linux-imx51 \ - linux-ixp4xx \ - linux-kirkwood \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-ixp4xx \ - linux-image-kirkwood \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-ixp4xx \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/omap4.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/omap4.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/omap4.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/omap4.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Processor : ARMv7 Processor rev 2 (v7l) -processor : 0 -BogoMIPS : 1195.29 - -processor : 1 -BogoMIPS : 1166.88 - -Features : swp half thumb fastmult vfp edsp thumbee neon vfpv3 -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x1 -CPU part : 0xc09 -CPU revision : 2 - -Hardware : OMAP4430 Panda Board -Revision : 0020 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/omap4.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/omap4.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/omap4.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/omap4.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -subarch omap4 -cpuinfo omap4.cpuinfo -majors 2.6 -flavour omap4 -kernel-2.6 \ - linux-omap4 \ - linux-image-omap4 -usable \ - linux-image-omap4 - linux-image-11-omap4 -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : ARM926EJ-S rev 5 (v5l) -BogoMIPS : 489.88 -Features : swp half thumb fastmult vfp edsp java -CPU implementer : 0x41 -CPU architecture: 5TEJ -CPU variant : 0x0 -CPU part : 0x926 -CPU revision : 5 - -Hardware : ARM-Versatile PB -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -subarch versatile -cpuinfo qemu-versatilepb.cpuinfo -majors 2.6 -flavour versatile -kernel-2.6 \ - linux-versatile \ - linux-image-versatile -usable \ - linux-versatile \ - linux-image-versatile \ - linux-image-2.6.18-4-versatile -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-kirkwood \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-kirkwood \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-ixp4xx \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-orion5x \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : Feroceon 88FR131 rev 1 (v5l) -BogoMIPS : 1192.75 -Features : swp half thumb fastmult edsp -CPU implementer : 0x56 -CPU architecture: 5TE -CPU variant : 0x2 -CPU part : 0x131 -CPU revision : 1 - -Hardware : Marvell SheevaPlug Reference Board -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -subarch kirkwood -cpuinfo sheevaplug.cpuinfo -majors 2.6 -flavour kirkwood -kernel-2.6 \ - linux-kirkwood \ - linux-image-kirkwood -usable \ - linux-kirkwood \ - linux-image-kirkwood \ - linux-image-2.6.29-1-kirkwood -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-ixp4xx \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-ixp4xx diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/slug.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/slug.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/slug.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/slug.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-IXP42x Family rev 1 (v5l) -BogoMIPS : 133.12 -Features : swp half thumb fastmult edsp -CPU implementer : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x41f -CPU revision : 1 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache format : Harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : Linksys NSLU2 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/slug.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/slug.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/slug.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/slug.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch ixp4xx -cpuinfo slug.cpuinfo -majors 2.6 -flavour ixp4xx -kernel-2.6 \ - linux-ixp4xx \ - linux-image-ixp4xx -usable \ - linux-image-ixp4xx \ - linux-image-2.6.18-4-ixp4xx -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-kirkwood \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-kirkwood \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/ts-109.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/ts-109.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/ts-109.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/ts-109.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : Feroceon rev 0 (v5l) -BogoMIPS : 332.59 -Features : swp half thumb fastmult edsp -CPU implementer : 0x41 -CPU architecture: 5TEJ -CPU variant : 0x0 -CPU part : 0x926 -CPU revision : 0 -Cache type : write-back -Cache clean : cp15 c7 ops -Cache lockdown : format C -Cache format : Harvard -I size : 32768 -I assoc : 1 -I line length : 32 -I sets : 1024 -D size : 32768 -D assoc : 1 -D line length : 32 -D sets : 1024 - -Hardware : QNAP TS-109/TS-209 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/ts-109.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/ts-109.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armel/ts-109.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armel/ts-109.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -subarch orion5x -cpuinfo ts-109.cpuinfo -majors 2.6 -flavour orion5x -kernel-2.6 \ - linux-orion5x \ - linux-image-orion5x -usable \ - linux-image-orion5x \ - linux-image-2.6.25-1-orion5x -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-ixp4xx \ - linux-kirkwood \ - linux-netwinder \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-kirkwood \ - linux-image-netwinder \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-ixp4xx diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-PXA255 rev 6 (v5l) -BogoMIPS : 397.31 -Features : swp half thumb fastmult edsp -CPU implementor : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x2d0 -CPU revision : 6 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache unified : harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : ADS VGX -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/adsvgx.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -subarch ads -cpuinfo adsvgx.cpuinfo -majors 2.6 -flavour ads -kernel-2.6 \ - linux-ads \ - linux-image-ads -usable \ - linux-image-ads \ - linux-image-2.6.18-4-ads -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-kirkwood \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-footbridge \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-kirkwood \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-footbridge \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-ixp4xx \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Processor : Marvell - PJ4Bv7 Processor rev 2 (v7l) -processor : 0 -BogoMIPS : 1332.01 - -processor : 1 -BogoMIPS : 1332.01 - -processor : 2 -BogoMIPS : 1332.01 - -processor : 3 -BogoMIPS : 1332.01 - -Features : swp half thumb fastmult vfp edsp vfpv3 -CPU implementer : 0x56 -CPU architecture: 7 -CPU variant : 0x2 -CPU part : 0x584 -CPU revision : 2 - -Hardware : Marvell Armada XP Development Board -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/armadaxp.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch armadaxp -cpuinfo armadaxp.cpuinfo -majors 2.6 -flavour armadaxp -kernel-2.6 \ - linux-armadaxp \ - linux-image-armadaxp -usable \ - linux-image-armadaxp \ - linux-image-11-armadaxp -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 \ - linux-image-imx51 \ - linux-image-11-imx51 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/dove.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/dove.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/dove.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/dove.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : ARMv7 Processor-wmmx-wco rev 1 (v7l) -BogoMIPS : 799.53 -Features : swp half thumb fastmult vfp edsp iwmmxt -CPU implementer : 0x56 -CPU architecture: 7 -CPU variant : 0x0 -CPU part : 0x581 -CPU revision : 1 - -Hardware : Marvell DB-MV88F6781-BP Development Board -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/dove.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/dove.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/dove.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/dove.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch dove -cpuinfo dove.cpuinfo -majors 2.6 -flavour dove -kernel-2.6 \ - linux-dove \ - linux-image-dove -usable \ - linux-image-dove \ - linux-image-11-dove -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 \ - linux-image-imx51 \ - linux-image-11-imx51 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : ARMv7 Processor rev 1 (v7l) -BogoMIPS : 799.53 -Features : swp half thumb fastmult vfp edsp thumbee vfpv3 -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x2 -CPU part : 0xc08 -CPU revision : 1 - -Hardware : Genesi EfikaMX nettop -Revision : 0011 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/efikamx.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -subarch mx5 -cpuinfo efikamx.cpuinfo -majors 2.6 -flavour mx5 -kernel-2.6 \ - linux-mx5 \ - linux-image-mx5 -usable \ - linux-mx5 \ - linux-image-mx5 -unusable \ - linux-image-2.6-iop32x \ - linux-image-2.6-netwinder \ - linux-image-2.6-orion5x \ - linux-image-2.6-rpc \ - linux-image-2.6-s3c2410 \ - linux-image-2.6-ixp4xx \ - linux-image-2.6-kirkwood diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/imx51.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/imx51.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/imx51.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/imx51.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Processor : ARMv7 Processor rev 1 (v7l) -BogoMIPS : 799.53 -Features : swp half thumb fastmult vfp edsp -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x2 -CPU part : 0xc08 -CPU revision : 1 - -Hardware : Freescale MX51 Babbage Board -Revision : 51011 -Serial : 0000000000000000 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/imx51.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/imx51.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/imx51.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/imx51.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -subarch imx51 -cpuinfo imx51.cpuinfo -majors 2.6 -flavour imx51 -kernel-2.6 \ - linux-imx51 \ - linux-image-imx51 -usable \ - linux-image-imx51 - linux-image-11-imx51 -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/n2100.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/n2100.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/n2100.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/n2100.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-80219 rev 0 (v5l) -BogoMIPS : 593.10 -Features : swp half fastmult edsp -CPU implementer : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x2e3 -CPU revision : 0 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache format : Harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : Thecus N2100 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/n2100.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/n2100.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/n2100.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/n2100.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch iop32x -cpuinfo n2100.cpuinfo -majors 2.6 -flavour iop32x -kernel-2.6 \ - linux-iop32x \ - linux-image-iop32x -usable \ - linux-image-iop32x \ - linux-image-2.6.18-4-iop32x -unusable \ - linux-imx51 \ - linux-ixp4xx \ - linux-kirkwood \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-ixp4xx \ - linux-image-kirkwood \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-ixp4xx \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/omap4.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/omap4.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/omap4.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/omap4.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Processor : ARMv7 Processor rev 2 (v7l) -processor : 0 -BogoMIPS : 1195.29 - -processor : 1 -BogoMIPS : 1166.88 - -Features : swp half thumb fastmult vfp edsp thumbee neon vfpv3 -CPU implementer : 0x41 -CPU architecture: 7 -CPU variant : 0x1 -CPU part : 0xc09 -CPU revision : 2 - -Hardware : OMAP4430 Panda Board -Revision : 0020 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/omap4.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/omap4.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/omap4.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/omap4.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -subarch omap4 -cpuinfo omap4.cpuinfo -majors 2.6 -flavour omap4 -kernel-2.6 \ - linux-omap4 \ - linux-image-omap4 -usable \ - linux-image-omap4 - linux-image-11-omap4 -unusable \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : ARM926EJ-S rev 5 (v5l) -BogoMIPS : 489.88 -Features : swp half thumb fastmult vfp edsp java -CPU implementer : 0x41 -CPU architecture: 5TEJ -CPU variant : 0x0 -CPU part : 0x926 -CPU revision : 5 - -Hardware : ARM-Versatile PB -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/qemu-versatilepb.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -subarch versatile -cpuinfo qemu-versatilepb.cpuinfo -majors 2.6 -flavour versatile -kernel-2.6 \ - linux-versatile \ - linux-image-versatile -usable \ - linux-versatile \ - linux-image-versatile \ - linux-image-2.6.18-4-versatile -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-ixp4xx \ - linux-netwinder \ - linux-kirkwood \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-ixp4xx \ - linux-image-netwinder \ - linux-image-kirkwood \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-ixp4xx \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-orion5x \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Processor : Feroceon 88FR131 rev 1 (v5l) -BogoMIPS : 1192.75 -Features : swp half thumb fastmult edsp -CPU implementer : 0x56 -CPU architecture: 5TE -CPU variant : 0x2 -CPU part : 0x131 -CPU revision : 1 - -Hardware : Marvell SheevaPlug Reference Board -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/sheevaplug.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -subarch kirkwood -cpuinfo sheevaplug.cpuinfo -majors 2.6 -flavour kirkwood -kernel-2.6 \ - linux-kirkwood \ - linux-image-kirkwood -usable \ - linux-kirkwood \ - linux-image-kirkwood \ - linux-image-2.6.29-1-kirkwood -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-ixp4xx \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-ixp4xx diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/slug.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/slug.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/slug.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/slug.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : XScale-IXP42x Family rev 1 (v5l) -BogoMIPS : 133.12 -Features : swp half thumb fastmult edsp -CPU implementer : 0x69 -CPU architecture: 5TE -CPU variant : 0x0 -CPU part : 0x41f -CPU revision : 1 -Cache type : undefined 5 -Cache clean : undefined 5 -Cache lockdown : undefined 5 -Cache format : Harvard -I size : 32768 -I assoc : 32 -I line length : 32 -I sets : 32 -D size : 32768 -D assoc : 32 -D line length : 32 -D sets : 32 - -Hardware : Linksys NSLU2 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/slug.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/slug.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/slug.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/slug.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -subarch ixp4xx -cpuinfo slug.cpuinfo -majors 2.6 -flavour ixp4xx -kernel-2.6 \ - linux-ixp4xx \ - linux-image-ixp4xx -usable \ - linux-image-ixp4xx \ - linux-image-2.6.18-4-ixp4xx -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-kirkwood \ - linux-netwinder \ - linux-orion5x \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-kirkwood \ - linux-image-netwinder \ - linux-image-orion5x \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-2.6.18-4-iop32x \ - linux-image-2.6.18-4-netwinder \ - linux-image-2.6.18-4-rpc \ - linux-image-2.6.18-4-s3c2410 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Processor : Feroceon rev 0 (v5l) -BogoMIPS : 332.59 -Features : swp half thumb fastmult edsp -CPU implementer : 0x41 -CPU architecture: 5TEJ -CPU variant : 0x0 -CPU part : 0x926 -CPU revision : 0 -Cache type : write-back -Cache clean : cp15 c7 ops -Cache lockdown : format C -Cache format : Harvard -I size : 32768 -I assoc : 1 -I line length : 32 -I sets : 1024 -D size : 32768 -D assoc : 1 -D line length : 32 -D sets : 1024 - -Hardware : QNAP TS-109/TS-209 -Revision : 0000 -Serial : 0000000000000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/armhf/ts-109.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -subarch orion5x -cpuinfo ts-109.cpuinfo -majors 2.6 -flavour orion5x -kernel-2.6 \ - linux-orion5x \ - linux-image-orion5x -usable \ - linux-image-orion5x \ - linux-image-2.6.25-1-orion5x -unusable \ - linux-imx51 \ - linux-iop32x \ - linux-ixp4xx \ - linux-kirkwood \ - linux-netwinder \ - linux-rpc \ - linux-s3c2410 \ - linux-image-imx51 \ - linux-image-iop32x \ - linux-image-kirkwood \ - linux-image-netwinder \ - linux-image-rpc \ - linux-image-s3c2410 \ - linux-image-ixp4xx diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/dotest ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/dotest --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/dotest 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/dotest 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -#! /bin/sh -set -e - -if [ "$TEST_VERBOSE" -ge 3 ]; then - set -x -fi - -. "$(dirname "$0")/../$ARCH.sh" - -ok () { - echo "PASS $testname" -} - -notok () { - echo "FAIL $testname" -} - -log () { - echo "$*" >&2 -} - -warning () { - echo "warning: $*" >&2 -} - -for KERNEL_MAJOR in $MAJORS; do - WANT_FLAVOUR="$FLAVOUR" - case $KERNEL_MAJOR in - 2.6) - WANT_KERNELS="$KERNEL_26" - ;; - 7) - WANT_KERNELS="$KERNEL_7" - ;; - 8) - WANT_KERNELS="$KERNEL_8" - ;; - esac - WANT_KERNELS="$(echo "$WANT_KERNELS" | tr '\n' ' ' | tr -s ' ' | sed 's/ *$//')" - WANT_KERNEL_STEM="${WANT_KERNELS%% *}" - WANT_KERNEL_STEM="${WANT_KERNEL_STEM#kernel-image-}" - WANT_KERNEL_STEM="${WANT_KERNEL_STEM#linux-image-}" - export KERNEL_MAJOR - export KERNEL_VERSION="$(echo "$WANT_KERNEL_STEM" | cut -d - -f 1)" - - # Is the correct kernel flavour selected? - - testname="arch_get_kernel_flavour $KERNEL_MAJOR exit code" - if GOT_FLAVOUR="$(arch_get_kernel_flavour)" && [ "$GOT_FLAVOUR" ] ; then - ok - else - notok - continue # nothing else will work - fi - - testname="arch_get_kernel_flavour want $WANT_FLAVOUR, got $GOT_FLAVOUR" - if [ "$WANT_FLAVOUR" = "$GOT_FLAVOUR" ]; then - ok - else - notok - fi - - # Are the correct kernels treated as usable? - - for kernel in $USABLE; do - testname="arch_check_usable_kernel $KERNEL_MAJOR $kernel should be usable" - if arch_check_usable_kernel "$kernel" "$GOT_FLAVOUR"; then - ok - else - notok - fi - done - - # By default any postfix should be allowed - for kernel in $USABLE; do - testname="arch_check_usable_kernel $KERNEL_MAJOR ${kernel}- should be usable" - if arch_check_usable_kernel "${kernel}-postfix" "$GOT_FLAVOUR"; then - ok - else - notok - fi - done - - for kernel in $UNUSABLE; do - testname="arch_check_usable_kernel $KERNEL_MAJOR $kernel should be unusable" - if arch_check_usable_kernel "$kernel" "$GOT_FLAVOUR"; then - notok - else - ok - fi - done - - # Is the correct preference order of default kernels selected? - - testname="arch_get_kernel $KERNEL_MAJOR exit code" - if GOT_KERNELS="$(arch_get_kernel "$GOT_FLAVOUR" | tr '\n' ' ' | sed 's/ *$//')"; then - ok - else - notok - continue # the rest won't work - fi - - testname="arch_get_kernel want '$WANT_KERNELS', got '$GOT_KERNELS'" - if [ "$WANT_KERNELS" = "$GOT_KERNELS" ]; then - ok - else - notok - fi -done diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/b180.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/b180.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/b180.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/b180.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -processor : 0 -cpu family : PA-RISC 1.1e -cpu : PA7300LC (PCX-L2) -cpu MHz : 180.000000 -model : 9000/778/B180L -model name : Merlin L2+ 180 (9000/778/B180L) -hversion : 0x00005040 -sversion : 0x00000481 -I-cache : 64 KB -D-cache : 64 KB (WB) -ITLB entries : 96 -DTLB entries : 96 - shared with ITLB -BTLB fixed : max. 16384 pages, pagesize=4096 (64MB) -BTLB fix-entr. : 0 instruction, 0 data (8 combined) -BTLB var-entr. : 0 instruction, 0 data (0 combined) -bogomips : 119.60 -software id : 2006001823 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/b180.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/b180.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/b180.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/b180.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -cpuinfo b180.cpuinfo -machine parisc -numcpus 1 -majors 2.6 -flavour parisc -kernel-2.6 \ - linux-hppa32 \ - linux-image-hppa32 -usable \ - linux-hppa32 -unusable \ - linux-hppa64 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/paer.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/paer.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/paer.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/paer.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -processor : 0 -cpu family : PA-RISC 2.0 -cpu : PA8600 (PCX-W+) -cpu MHz : 550.000000 -model : 9000/800/A500-5X -model name : Crescendo 550 -hversion : 0x00005d50 -sversion : 0x00000491 -I-cache : 512 KB -D-cache : 1024 KB (WB) -ITLB entries : 160 -DTLB entries : 160 - shared with ITLB -bogomips : 1097.72 -software id : 1583770588 - -processor : 1 -cpu family : PA-RISC 2.0 -cpu : PA8600 (PCX-W+) -cpu MHz : 550.000000 -model : 9000/800/A500-5X -model name : Crescendo 550 -hversion : 0x00005d50 -sversion : 0x00000491 -I-cache : 512 KB -D-cache : 1024 KB (WB) -ITLB entries : 160 -DTLB entries : 160 - shared with ITLB -bogomips : 1097.72 -software id : 1583770588 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/paer.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/paer.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/hppa/paer.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/hppa/paer.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -cpuinfo paer.cpuinfo -machine parisc64 -numcpus 2 -majors 2.6 -flavour parisc64 -kernel-2.6 \ - linux-hppa64 \ - linux-image-hppa64 -usable \ - linux-hppa32 \ - linux-hppa64 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -processor : 0 -vendor_id : AuthenticAMD -cpu family : 6 -model : 2 -model name : Fictional AMD Athlon system (mostly copied from cittagazze) -stepping : 0 -cpu MHz : 2246.427 -cache size : 512 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr syscall nx mmxext 3dnowext 3dnow up ts fid vid ttp -bogomips : 4506.97 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -cpuinfo amd-k7-old.cpuinfo -majors 2.6 -flavour 686 686-pae 686-bigmem 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -unusable \ - linux-image-2.6-amd64 \ - linux-image-2.6.25-1-amd64 -env RAM_END 0x10000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -processor : 0 -vendor_id : AuthenticAMD -cpu family : 15 -model : 12 -model name : AMD Athlon(tm) 64 Processor 3200+ -stepping : 0 -cpu MHz : 2246.427 -cache size : 512 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx mmxext 3dnowext 3dnow up ts fid vid ttp -bogomips : 4506.97 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/cittagazze.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -cpuinfo cittagazze.cpuinfo -majors 2.6 -flavour 686 686-pae 686-bigmem 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -unusable \ - linux-image-2.6-amd64 \ - linux-image-2.6.25-1-amd64 -env KERNEL_FLAVOUR generic -env RAM_END 0x10000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/oqo1.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/oqo1.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/oqo1.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/oqo1.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -processor : 0 -vendor_id : GenuineTMx86 -cpu family : 6 -model : 4 -model name : Transmeta(tm) Crusoe(tm) Processor TM5800 -stepping : 3 -cpu MHz : 1005.846 -cache size : 512 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr cx8 sep cmov mmx pni longrun lrti -bogomips : 1896.44 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/oqo1.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/oqo1.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/oqo1.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/oqo1.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -cpuinfo oqo1.cpuinfo -majors 2.6 -flavour 686 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt -usable \ - linux-generic \ - linux-image-generic \ - linux-image-2.6.36-1-generic -unusable \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x4000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -processor : 0 -vendor_id : GenuineIntel -cpu family : 6 -model : 7 -model name : Pentium III (Katmai) -stepping : 3 -cpu MHz : 451.030 -cache size : 512 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 2 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr sse -bogomips : 897.84 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-3.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -cpuinfo pentium-3.cpuinfo -majors 2.6 -flavour 686 686-pae 686-bigmem 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x10000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -cpuinfo pentium-4M.cpuinfo -machine i686 -majors 2.6 -flavour 686-pae 686-bigmem 686 486 -kernel-2.6 \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR 486 -env RAM_END 0x140000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -cpuinfo pentium-4M.cpuinfo -machine i686 -majors 2.6 -flavour 686-pae 686-bigmem 686 486 -kernel-2.6 \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic-pae -env RAM_END 0x10000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -processor : 0 -vendor_id : GenuineIntel -cpu family : 15 -model : 2 -model name : Mobile Intel(R) Pentium(R) 4 CPU 2.80GHz -stepping : 9 -cpu MHz : 2793.420 -cache size : 512 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 2 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid -bogomips : 5537.79 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -cpuinfo pentium-4M.cpuinfo -machine i686 -majors 2.6 -flavour 686 686-pae 686-bigmem 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x10000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -processor : 0 -vendor_id : GenuineIntel -cpu family : 15 -model : 4 -model name : Intel(R) Pentium(R) D CPU 2.80GHz -stepping : 7 -cpu MHz : 2793.256 -cache size : 1024 KB -physical id : 0 -siblings : 2 -core id : 0 -cpu cores : 2 -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 5 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_ts -c pni monitor ds_cpl cid cx16 xtpr lahf_lm -bogomips : 5591.11 -clflush size : 64 - -processor : 1 -vendor_id : GenuineIntel -cpu family : 15 -model : 4 -model name : Intel(R) Pentium(R) D CPU 2.80GHz -stepping : 7 -cpu MHz : 2793.256 -cache size : 1024 KB -physical id : 0 -siblings : 2 -core id : 1 -cpu cores : 2 -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 5 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_ts -c pni monitor ds_cpl cid cx16 xtpr lahf_lm -bogomips : 5586.38 -clflush size : 64 - - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -cpuinfo pentium-d-2p.cpuinfo -majors 2.6 -flavour 686 686-pae 686-bigmem amd64 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x10000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -processor : 0 -vendor_id : GenuineIntel -cpu family : 5 -model : 2 -model name : Pentium 75 - 200 -stepping : 12 -cpu MHz : 199.436 -fdiv_bug : no -hlt_bug : no -f00f_bug : yes -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr mce cx8 -bogomips : 398.13 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/pentium.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/pentium.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -cpuinfo pentium.cpuinfo -machine i586 -majors 2.6 -flavour 486 -kernel-2.6 -unusable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x4000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -processor : 0 -vendor_id : CentaurHauls -cpu family : 6 -model : 9 -model name : VIA Nehemiah -stepping : 8 -cpu MHz : 1002.222 -cache size : 64 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr cx8 sep mtrr pge cmov pat mmx fxsr sse rng rng_en ace ace_en -bogomips : 2004.44 -clflush size : 32 -cache_alignment : 32 -address sizes : 32 bits physical, 32 bits virtual -power management: - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -cpuinfo via-c3-nehemiah.cpuinfo -majors 2.6 -flavour 686 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt -usable \ - linux-generic \ - linux-image-generic \ - linux-image-2.6.36-1-generic -unusable \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x4000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -processor : 0 -vendor_id : CentaurHauls -cpu family : 6 -model : 10 -model name : VIA Esther processor 2000MHz -stepping : 9 -cpu MHz : 1995.084 -cache size : 128 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge cmov pat clflush acpi mmx fxsr sse sse2 tm nx pni est tm2 rng rng_en ace ace_en ace2 ace2_en phe phe_en pmm pmm_en -bogomips : 3994.32 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -cpuinfo via-c7-Esther.cpuinfo -machine i686 -majors 2.6 -flavour 686 686-pae 686-bigmem 486 -kernel-2.6 \ - linux-generic \ - linux-image-generic \ - linux-virtual \ - linux-image-virtual \ - linux-rt \ - linux-image-rt \ - linux-generic-pae \ - linux-image-generic-pae \ - linux-xen \ - linux-image-xen -usable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x4000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -processor : 0 -vendor_id : CentaurHauls -cpu family : 6 -model : 7 -model name : VIA Samuel 2 -stepping : 3 -cpu MHz : 599.926 -cache size : 64 KB -fdiv_bug : no -hlt_bug : no -f00f_bug : no -coma_bug : no -fpu : yes -fpu_exception : yes -cpuid level : 1 -wp : yes -flags : fpu de tsc msr cx8 mtrr pge mmx 3dnow -bogomips : 1201.02 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -cpuinfo via-c7-Samuel.cpuinfo -machine i686 -majors 2.6 -flavour 486 -kernel-2.6 -unusable \ - linux-generic \ - linux-generic-pae \ - linux-image-generic \ - linux-image-generic-pae \ - linux-image-2.6.36-1-generic \ - linux-image-2.6.36-1-generic-pae -env KERNEL_FLAVOUR generic -env RAM_END 0x4000000 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/caballero.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/caballero.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/caballero.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/caballero.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -processor : 0 -vendor : GenuineIntel -arch : IA-64 -family : Itanium 2 -model : 0 -revision : 7 -archrev : 0 -features : branchlong -cpu number : 0 -cpu regs : 4 -cpu MHz : 1000.000000 -itc MHz : 1000.000000 -BogoMIPS : 535.82 - -processor : 1 -vendor : GenuineIntel -arch : IA-64 -family : Itanium 2 -model : 0 -revision : 7 -archrev : 0 -features : branchlong -cpu number : 0 -cpu regs : 4 -cpu MHz : 1000.000000 -itc MHz : 1000.000000 -BogoMIPS : 1497.36 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/caballero.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/caballero.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/caballero.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/caballero.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -cpuinfo caballero.cpuinfo -majors 2.6 -flavour mckinley -kernel-2.6 \ - linux-ia64 \ - linux-image-ia64 -usable \ - linux-ia64 \ - linux-image-ia64 \ - linux-image-2.6.30-1-ia64 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/merulo.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/merulo.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/merulo.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/merulo.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -processor : 0 -vendor : GenuineIntel -arch : IA-64 -family : Itanium -model : 0 -revision : 6 -archrev : 0 -features : standard -cpu number : 0 -cpu regs : 4 -cpu MHz : 733.353984 -itc MHz : 733.353984 -BogoMIPS : 729.80 - -processor : 1 -vendor : GenuineIntel -arch : IA-64 -family : Itanium -model : 0 -revision : 6 -archrev : 0 -features : standard -cpu number : 0 -cpu regs : 4 -cpu MHz : 733.353984 -itc MHz : 733.353984 -BogoMIPS : 731.90 - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/merulo.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/merulo.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/ia64/merulo.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/ia64/merulo.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -cpuinfo merulo.cpuinfo -majors 2.6 -flavour itanium -kernel-2.6 \ - linux-ia64 \ - linux-image-ia64 -usable \ - linux-ia64 \ - linux-image-ia64 \ - linux-image-2.6.30-1-ia64 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -processor : 0 -vendor_id : GenuineIntel -cpu family : 6 -model : 15 -model name : Intel(R) Core(TM)2 Quad CPU Q9650 @ 3.00GHz -stepping : 10 -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 b19 mmx fxsr xmm b26 b27 -cpu MHz : 2579.69 -bogomips : 2579.69 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -cpuinfo core2.cpuinfo -majors 7 -flavour amd64 -kernel-7 \ - kfreebsd-image-7-amd64 -usable \ - kfreebsd-image-7-amd64 \ - kfreebsd-image-7.2-amd64 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -processor : 0 -vendor_id : AuthenticAMD -cpu family : 6 -model : 7 -model name : AMD Sempron(tm) Processor 2600+ -stepping : 2 -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 b19 mmx fxsr xmm b26 -cpu MHz : 1607.33 -bogomips : 1607.33 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -cpuinfo k8.cpuinfo -majors 7 -flavour amd64 -kernel-7 \ - kfreebsd-image-7-amd64 -usable \ - kfreebsd-image-7-amd64 \ - kfreebsd-image-7.2-amd64 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -processor : 0 -vendor_id : GenuineIntel -cpu family : 6 -model : 15 -model name : Intel(R) Core(TM)2 Quad CPU Q9650 @ 3.00GHz -stepping : 10 -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 b19 mmx fxsr xmm b26 b27 -cpu MHz : 2579.69 -bogomips : 2579.69 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -cpuinfo core2.cpuinfo -majors 7 -flavour 686 -kernel-7 \ - kfreebsd-image-7-686 \ - kfreebsd-image-7-486 -usable \ - kfreebsd-image-7-486 \ - kfreebsd-image-7-686 \ - kfreebsd-image-7-686-smp \ - kfreebsd-image-7.2-486 \ - kfreebsd-image-7.2-686 \ - kfreebsd-image-7.2-686-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -processor : 0 -vendor_id : AuthenticAMD -cpu family : 6 -model : 7 -model name : AMD Sempron(tm) Processor 2600+ -stepping : 2 -flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 b19 mmx fxsr xmm b26 -cpu MHz : 1607.33 -bogomips : 1607.33 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -cpuinfo k8.cpuinfo -majors 7 -flavour 686 -kernel-7 \ - kfreebsd-image-7-686 \ - kfreebsd-image-7-486 -usable \ - kfreebsd-image-7-486 \ - kfreebsd-image-7-686 \ - kfreebsd-image-7-686-smp \ - kfreebsd-image-7.2-486 \ - kfreebsd-image-7.2-686 \ - kfreebsd-image-7.2-686-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/m68k/crest.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/m68k/crest.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/m68k/crest.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/m68k/crest.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -CPU: 68060 -MMU: 68060 -FPU: 68060 -Clocking: 49.8MHz -BogoMips: 99.73 -Calibration: 498688 loops diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/m68k/crest.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/m68k/crest.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/m68k/crest.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/m68k/crest.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -subarch amiga -cpuinfo crest.cpuinfo -majors 2.6 -flavour amiga -kernel-2.6 linux-image-2.6-amiga -usable \ - linux-image-2.6-amiga -unusable \ - linux-image-2.6-atari \ - linux-image-2.6-bvme6000 \ - linux-image-2.6-hp \ - linux-image-2.6-mac \ - linux-image-2.6-mvme147 \ - linux-image-2.6-mvme16x \ - linux-image-2.6-q40 \ - linux-image-2.6-sun3 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : MIPS Malta -processor : 0 -cpu model : MIPS 24K V0.0 FPU V0.0 -BogoMIPS : 696.32 -wait instruction : yes -microsecond timers : yes -tlb_entries : 16 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : -VCED exceptions : not available -VCEI exceptions : not available - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -subarch 4kc-malta -cpuinfo 4kc-malta.cpuinfo -majors 2.6 -flavour 4kc-malta -kernel-2.6 linux-image-2.6-4kc-malta -usable \ - linux-image-2.6-4kc-malta -unusable \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-qemu \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : MIPS Malta -processor : 0 -cpu model : MIPS 5Kc V0.0 FPU V0.0 -BogoMIPS : 1302.52 -wait instruction : yes -microsecond timers : yes -tlb_entries : 32 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : -VCED exceptions : not available -VCEI exceptions : not available - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -subarch 5kc-malta -cpuinfo 5kc-malta.cpuinfo -majors 2.6 -flavour 5kc-malta -kernel-2.6 \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-4kc-malta -usable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta -unusable \ - linux-image-2.6-qemu \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -system type : SGI O2 -processor : 0 -cpu model : R5000 V2.1 FPU V1.0 -BogoMIPS : 0.00 -byteorder : big endian -wait instruction : yes -microsecond timers : yes -tlb_entries : 48 -extra interrupt vector : no -hardware watchpoint : no -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -subarch r5k-ip32 -cpuinfo ip32-r5k.cpuinfo -majors 2.6 -flavour r5k-ip32 -kernel-2.6 linux-image-2.6-r5k-ip32 -usable \ - linux-image-2.6-r5k-ip32 -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-qemu \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/qemu.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/qemu.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/qemu.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/qemu.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : Qemu -processor : 0 -cpu model : MIPS 4Kc V0.0 FPU V1.0 -BogoMIPS : 559.10 -wait instruction : yes -microsecond timers : yes -tlb_entries : 16 -extra interrupt vector : no -hardware watchpoint : yes -ASEs implemented : -VCED exceptions : not available -VCEI exceptions : not available - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/qemu.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/qemu.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/qemu.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/qemu.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -subarch qemu-mips32 -cpuinfo qemu.cpuinfo -majors 2.6 -flavour qemu -kernel-2.6 linux-image-2.6-qemu -usable \ - linux-image-2.6-qemu -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -system type : SGI Indy -processor : 0 -cpu model : R4000SC V3.0 FPU V0.0 -BogoMIPS : 49.86 -byteorder : big endian -wait instruction : no -microsecond timers : yes -tlb_entries : 48 -extra interrupt vector : no -hardware watchpoint : yes -VCED exceptions : 741282316 -VCEI exceptions : 66661638 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -subarch r4k-ip22 -cpuinfo r4k-ip22.cpuinfo -majors 2.6 -flavour r4k-ip22 -kernel-2.6 linux-image-2.6-r4k-ip22 -usable \ - linux-image-2.6-r4k-ip22 -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-qemu \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -cpu : MIPS -cpu model : R5000 V1.0 -system type : SGI Indy -BogoMIPS : 179.81 -byteorder : big endian -unaligned accesses : 12 -wait instruction : yes -microsecond timers : yes -extra interrupt vector : no -hardware watchpoint : no -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch r5k-ip22 -cpuinfo r5k-ip22.cpuinfo -majors 2.6 -flavour r5k-ip22 -kernel-2.6 linux-image-2.6-r4k-ip22 -usable \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6.18-1-r4k-ip22 -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-qemu \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b \ - linux-image-2.6.18-1-r10k-ip27 \ - linux-image-2.6.18-1-r10k-ip30 \ - linux-image-2.6.18-1-r5k-ip32 \ - linux-image-2.6.18-1-sb1-bcm91250a \ - linux-image-2.6.18-1-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -system type : SiByte BCM91250A (SWARM) -processor : 0 -cpu model : SiByte SB1 V0.2 FPU V0.2 -BogoMIPS : 532.48 -byteorder : big endian -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 1 -cpu model : SiByte SB1 V0.2 FPU V0.2 -BogoMIPS : 532.48 -byteorder : big endian -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -subarch sb1-bcm91250a -cpuinfo sb1-bcm91250a.cpuinfo -majors 2.6 -flavour sb1-bcm91250a -kernel-2.6 linux-image-2.6-sb1-bcm91250a -usable \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6.18-1-sb1-bcm91250a -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-qemu \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1a-bcm91480b \ - linux-image-2.6.18-1-qemu \ - linux-image-2.6.18-1-r4k-ip22 \ - linux-image-2.6.18-1-r5k-ip32 \ - linux-image-2.6.18-1-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -system type : SiByte BCM91x80A/B (BigSur) -processor : 0 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 463.87 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 1 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 466.94 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 2 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 466.94 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 3 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 466.94 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -subarch sb1a-bcm91480b -cpuinfo sb1a-bcm91480b.cpuinfo -majors 2.6 -flavour sb1a-bcm91480b -kernel-2.6 linux-image-2.6-sb1a-bcm91480b -usable \ - linux-image-2.6-sb1a-bcm91480b \ - linux-image-2.6.18-1-sb1a-bcm91480b -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-qemu \ - linux-image-2.6-r4k-ip22 \ - linux-image-2.6-r5k-ip32 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6.18-1-qemu \ - linux-image-2.6.18-1-r4k-ip22 \ - linux-image-2.6.18-1-r5k-ip32 \ - linux-image-2.6.18-1-sb1-bcm91250a diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : MIPS Malta -processor : 0 -cpu model : MIPS 24K V0.0 FPU V0.0 -BogoMIPS : 636.92 -wait instruction : yes -microsecond timers : yes -tlb_entries : 16 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : -VCED exceptions : not available -VCEI exceptions : not available - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch 4kc-malta -cpuinfo 4kc-malta.cpuinfo -majors 2.6 -flavour 4kc-malta -kernel-2.6 linux-image-2.6-4kc-malta -usable \ - linux-image-2.6-4kc-malta -unusable \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : MIPS Malta -processor : 0 -cpu model : MIPS 5Kc V0.0 FPU V0.0 -BogoMIPS : 3670.01 -wait instruction : yes -microsecond timers : yes -tlb_entries : 32 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : -VCED exceptions : not available -VCEI exceptions : not available - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -subarch 5kc-malta -cpuinfo 5kc-malta.cpuinfo -majors 2.6 -flavour 5kc-malta -kernel-2.6 \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-4kc-malta -usable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta -unusable \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -system type : lemote-fuloong-2e-box -processor : 0 -cpu model : ICT Loongson-2 V0.2 FPU V0.1 -BogoMIPS : 443.39 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : no -hardware watchpoint : yes, count: 0, address/irw mask: [] -ASEs implemented : -shadow register sets : 1 -core : 0 -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch loongson-2e -cpuinfo fuloong-2e.cpuinfo -majors 2.6 -flavour loongson-2e -kernel-2.6 linux-image-2.6-loongson-2e -usable \ - linux-image-2.6-loongson-2e -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -system type : lemote-fuloong-2f-box -processor : 0 -cpu model : ICT Loongson-2 V0.3 FPU V0.1 -BogoMIPS : 528.38 -wait instruction : yes -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : no -hardware watchpoint : yes, count: 0, address/irw mask: [] -ASEs implemented : -shadow register sets : 1 -core : 0 -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch loongson-2f -cpuinfo fuloong-2f.cpuinfo -majors 2.6 -flavour loongson-2f -kernel-2.6 linux-image-2.6-loongson-2f -usable \ - linux-image-2.6-loongson-2f -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : Qemu -processor : 0 -cpu model : MIPS 4Kc V0.0 FPU V1.0 -BogoMIPS : 487.42 -wait instruction : yes -microsecond timers : yes -tlb_entries : 16 -extra interrupt vector : no -hardware watchpoint : yes -ASEs implemented : -VCED exceptions : not available -VCEI exceptions : not available - diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/qemu.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch qemu-mips32 -cpuinfo qemu.cpuinfo -majors 2.6 -flavour qemu -kernel-2.6 linux-image-2.6-qemu -usable \ - linux-image-2.6-qemu -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -system type : Digital DECstation 5000/1xx -processor : 0 -cpu model : R3000A V3.0 FPU V4.0 -BogoMIPS : 32.75 -wait instruction : no -microsecond timers : no -tlb_entries : 64 -extra interrupt vector : no -hardware watchpoint : no -VCED exceptions : not available -VCEI exceptions : not available -ll emulations : 1 -sc emulations : 1 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch r3k-kn02 -cpuinfo r3k-kn02.cpuinfo -majors 2.6 -flavour r3k-kn02 -kernel-2.6 linux-image-2.6-r3k-kn02 -usable \ - linux-image-2.6-r3k-kn02 -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1a-bcm91480b \ - linux-image-2.6-sb1-bcm91250a diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -cpu model : R4000SC V3.0 -system type : Digital DECstation 5000/1xx -BogoMIPS : 49.68 -unaligned accesses : 0 -wait instruction : no -microsecond timers : no -extra interrupt vector : no -hardware watchpoint : yes -VCED exceptions : 6565 -VCEI exceptions : 11303 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch r4k-kn04 -cpuinfo r4k-kn04.cpuinfo -majors 2.6 -flavour r4k-kn04 -kernel-2.6 linux-image-2.6-r4k-kn04 -usable \ - linux-image-2.6-r4k-kn04 -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1a-bcm91480b \ - linux-image-2.6-sb1-bcm91250a diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -system type : MIPS Cobalt -processor : 0 -cpu model : Nevada V10.0 FPU V10.0 -BogoMIPS : 249.85 -wait instruction : yes -microsecond timers : yes -tlb_entries : 48 -extra interrupt vector : yes -hardware watchpoint : no -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch cobalt -cpuinfo r5k-cobalt.cpuinfo -majors 2.6 -flavour r5k-cobalt -kernel-2.6 linux-image-2.6-r5k-cobalt -usable \ - linux-image-2.6-r5k-cobalt -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-sb1-bcm91250a \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -system type : SiByte BCM91250A (SWARM) -processor : 0 -cpu model : SiByte SB1 V0.2 FPU V0.2 -BogoMIPS : 532.48 -byteorder : little endian -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -VCED exceptions : not available -VCEI exceptions : not available -processor : 1 -cpu model : SiByte SB1 V0.2 FPU V0.2 -BogoMIPS : 532.48 -byteorder : little endian -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch sb1-bcm91250a -cpuinfo sb1-bcm91250a.cpuinfo -majors 2.6 -flavour sb1-bcm91250a -kernel-2.6 linux-image-2.6-sb1-bcm91250a -usable \ - linux-image-2.6-sb1-bcm91250a -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1a-bcm91480b diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -system type : SiByte BCM91x80A/B (BigSur) -processor : 0 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 463.87 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 1 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 466.94 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 2 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 466.94 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available -processor : 3 -cpu model : SiByte SB1A V0.0 FPU V0.3 -BogoMIPS : 466.94 -wait instruction : no -microsecond timers : yes -tlb_entries : 64 -extra interrupt vector : yes -hardware watchpoint : yes -ASEs implemented : mdmx mips3d -VCED exceptions : not available -VCEI exceptions : not available diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -subarch sb1a-bcm91480b -cpuinfo sb1a-bcm91480b.cpuinfo -majors 2.6 -flavour sb1a-bcm91480b -kernel-2.6 linux-image-2.6-sb1a-bcm91480b -usable \ - linux-image-2.6-sb1a-bcm91480b -unusable \ - linux-image-2.6-4kc-malta \ - linux-image-2.6-5kc-malta \ - linux-image-2.6-loongson-2e \ - linux-image-2.6-loongson-2f \ - linux-image-2.6-qemu \ - linux-image-2.6-r3k-kn02 \ - linux-image-2.6-r4k-kn04 \ - linux-image-2.6-r5k-cobalt \ - linux-image-2.6-sb1-bcm91250a diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -processor : 0 -cpu : POWER4+ (gq) -clock : 1452.000000MHz -revision : 2.1 - -processor : 1 -cpu : POWER4+ (gq) -clock : 1452.000000MHz -revision : 2.1 - -timebase : 181495442 -machine : CHRP IBM,7029-6E3 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch chrp_ibm -cpuinfo chrp_ibm.cpuinfo -majors 2.6 -flavour powerpc64 -kernel-2.6 \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-powerpc64 \ - linux-image-powerpc64 -usable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.20-15-powerpc64-smp -unusable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.20-15-powerpc \ - linux-image-2.6.20-15-powerpc-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/g5.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/g5.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/g5.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/g5.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -cpu : PPC970, altivec supported -clock : 1800MHz -revision : 2.2 (pvr 0039 0202) -bogomips : 1127.21 -machine : PowerMac7,2 -motherboard : PowerMac7,2 MacRISC4 Power Macintosh -board revision : 00000001 -detected as : 336 (PowerMac G5) -pmac flags : 00000000 -L2 cache : 512K unified -memory : 0MB -pmac-generation : NewWorld diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/g5.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/g5.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/g5.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/g5.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch powermac_newworld -cpuinfo g5.cpuinfo -majors 2.6 -flavour powerpc64 -kernel-2.6 \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-powerpc64 \ - linux-image-powerpc64 -usable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.20-15-powerpc64-smp -unusable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.20-15-powerpc \ - linux-image-2.6.20-15-powerpc-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -processor : 0 -cpu : PPC970FX -clock : 2000MHz -revision : 3.0 (pvr 003c 0300) -bogomips : 1331.20 -machine : PowerMac7,3 -motherboard : PowerMac7,3 MacRISC4 Power Macintosh -detected as : 336 (PowerMac G5) -pmac flags : 00000000 -L2 cache : 512K unified -memory : 0MB -pmac-generation : NewWorld diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch powermac_newworld -cpuinfo powermac7,3.cpuinfo -majors 2.6 -flavour powerpc64 -kernel-2.6 \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-powerpc64 \ - linux-image-powerpc64 -usable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.20-15-powerpc64-smp -unusable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.20-15-powerpc \ - linux-image-2.6.20-15-powerpc-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -processor : 0 -cpu : 7457, altivec supported -clock : 999MHz -revision : 1.1 (pvr 8002 0101) -bogomips : 997.22 -machine : PowerBook5,2 -motherboard : PowerBook5,2 MacRISC3 Power Macintosh -detected as : 287 (PowerBook G4 15") -pmac flags : 0000000a -L2 cache : 512K unified -memory : 512MB -pmac-generation : NewWorld diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch powermac_newworld -cpuinfo powermac_newworld.cpuinfo -majors 2.6 -flavour powerpc -kernel-2.6 \ - linux-powerpc-smp \ - linux-image-powerpc-smp \ - linux-powerpc \ - linux-image-powerpc -usable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.20-15-powerpc \ - linux-image-2.6.20-15-powerpc-smp -unusable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.20-15-powerpc64-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -processor : 0 -cpu : 604r -clock : ??? -revision : 49.2 (pvr 0009 3102) -bogomips : 299.00 -machine : PReP Utah (Powerstack II Pro4000) -l2 cache : 512KiB, parity disabled SRAM:synchronous, pipelined, no parity diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch prep -cpuinfo powerstackII.cpuinfo -majors 2.6 -flavour powerpc -kernel-2.6 \ - linux-powerpc-smp \ - linux-image-powerpc-smp \ - linux-powerpc \ - linux-image-powerpc -usable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.20-15-powerpc \ - linux-image-2.6.20-15-powerpc-smp -unusable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.20-15-powerpc64-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -processor : 0 -cpu : Cell Broadband Engine, altivec supported -clock : 3192.000000MHz -revision : 16.0 (pvr 0070 1000) - -processor : 1 -cpu : Cell Broadband Engine, altivec supported -clock : 3192.000000MHz -revision : 16.0 (pvr 0070 1000) - -timebase : 79800000 -platform : PS3 -model : SonyPS3 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo.moved ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo.moved --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo.moved 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo.moved 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -processor : 0 -cpu : Cell Broadband Engine, altivec supported -clock : 3192.000000MHz -revision : 5.1 (pvr 0070 0501) - -processor : 1 -cpu : Cell Broadband Engine, altivec supported -clock : 3192.000000MHz -revision : 5.1 (pvr 0070 0501) - -timebase : 79800000 -platform : PS3 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch ps3 -cpuinfo ps3.cpuinfo -majors 2.6 -flavour powerpc64 -kernel-2.6 \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-powerpc64 \ - linux-image-powerpc64 -usable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.24-16-powerpc64-smp -unusable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.24-16-powerpc \ - linux-image-2.6.24-16-powerpc-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test.moved ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test.moved --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test.moved 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test.moved 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch ps3 -cpuinfo ps3.cpuinfo -majors 2.6 -flavour powerpc64 -kernel-2.6 \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-powerpc64 \ - linux-image-powerpc64 -usable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.24-16-powerpc64-smp -unusable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.24-16-powerpc \ - linux-image-2.6.24-16-powerpc-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -processor : 0 -cpu : RS64-IV (sstar) -clock : 601.600000MHz -revision : 0.0 (pvr 0037 0000) - -processor : 1 -cpu : RS64-IV (sstar) -clock : 601.600000MHz -revision : 0.0 (pvr 0037 0000) - -processor : 2 -cpu : RS64-IV (sstar) -clock : 601.600000MHz -revision : 0.0 (pvr 0037 0000) - -processor : 3 -cpu : RS64-IV (sstar) -clock : 601.600000MHz -revision : 0.0 (pvr 0037 0000) - -timebase : 601580836 -platform : pSeries -machine : CHRP IBM,7025-6F0 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -subarch chrp_ibm -cpuinfo rs64-iv.cpuinfo -majors 2.6 -flavour powerpc64 -kernel-2.6 \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-powerpc64 \ - linux-image-powerpc64 -usable \ - linux-powerpc64-smp \ - linux-image-powerpc64-smp \ - linux-image-2.6.20-15-powerpc64-smp -unusable \ - linux-powerpc \ - linux-powerpc-smp \ - linux-image-powerpc \ - linux-image-powerpc-smp \ - linux-image-2.6.20-15-powerpc \ - linux-image-2.6.20-15-powerpc-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/runtests ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/runtests --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/runtests 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/runtests 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -#! /bin/sh -set -e - -if [ -z "$1" ]; then - echo "Usage: runtests " >&2 - exit 1 -fi - -ARCH="$1" -PASSES=0 -FAILURES=0 - -[ "$TEST_VERBOSE" ] || export TEST_VERBOSE=1 - -verbose () { - if [ "$TEST_VERBOSE" -ge 2 ]; then - echo "$@" - fi - eval "$@" -} - -# Run a test based on a test file. -run_test () { - TEST="$1" - - unset SUBARCH CPUINFO MACHINE FLAVOUR KERNEL_26 KERNEL_7 KERNEL_8 USABLE UNUSABLE \ - || true - NUMCPUS=1 - MAJORS=2.6 - - while read name value; do - case $name in - subarch) - SUBARCH="$value" - ;; - cpuinfo) - CPUINFO="${TEST%/*}/$value" - ;; - numcpus) - NUMCPUS="$value" - ;; - machine) - MACHINE="$value" - ;; - majors) - MAJORS="$value" - ;; - flavour) - FLAVOUR="$value" - ;; - kernel-2.6) - KERNEL_26="$value" - ;; - kernel-7) - KERNEL_7="$value" - ;; - kernel-8) - KERNEL_8="$value" - ;; - usable) - USABLE="$value" - ;; - unusable) - UNUSABLE="$value" - ;; - env) - # TODO: is there any quote-safe way to do - # this? - eval "export ${value%% *}='${value#* }'" - ;; - esac - done < "$TEST" - - export ARCH SUBARCH CPUINFO NUMCPUS MACHINE - export MAJORS FLAVOUR KERNEL_26 KERNEL_7 KERNEL_8 - export USABLE UNUSABLE - - TMP="$(mktemp -t base-installer-tests.XXXXXX)" - trap 'rm -f "$TMP"' 0 HUP INT QUIT TERM - - # Run the actual testset. - verbose ./dotest >"$TMP" - - # Massage testset output into a more useful form. - while read state message; do - case "$state" in - PASS) - PASSES="$(($PASSES + 1))" - ;; - FAIL) - FAILURES="$(($FAILURES + 1))" - ;; - esac - if [ "$state" != PASS ] || [ "$TEST_VERBOSE" -ge 2 ]; then - echo "$state $TEST $message" - fi - done <"$TMP" - rm -f "$TMP" - trap 0 HUP INT QUIT TERM -} - -if [ "$2" ]; then - ONETEST="$2" - run_test "$ONETEST" -else - for test in "$ARCH"/*.test; do - # Sanity check: check test file for incorrect line continuations - if ! awk 'BEGIN {lc=0} - /\\[[:space:]]*$/ {if (lc==1 && substr($0,1,1)!=" ") {exit 1}; lc=1} - /[^\\][:space:]*$/ {lc=0} - END {if (lc==1) {exit 1}}' $test - then - echo "Incorrect line continuation in test file '$test'" - exit 1 - fi - run_test "$test" - done -fi - -if [ "$TEST_VERBOSE" -ge 1 ]; then - echo "$ARCH: $PASSES passes, $FAILURES failures." -fi - -if [ "$FAILURES" -eq 0 ]; then - exit 0 -else - exit 1 -fi diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/s390/raptor.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/s390/raptor.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/s390/raptor.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/s390/raptor.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -vendor_id : IBM/S390 -# processors : 6 -bogomips per cpu: 825.75 -processor 0: version = FF, identification = 000000, machine = 2064 -processor 1: version = FF, identification = 010101, machine = 2064 -processor 2: version = FF, identification = 020202, machine = 2064 -processor 3: version = FF, identification = 030303, machine = 2064 -processor 4: version = FF, identification = 040404, machine = 2064 -processor 5: version = FF, identification = 050505, machine = 2064 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/s390/raptor.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/s390/raptor.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/s390/raptor.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/s390/raptor.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -machine s390 -cpuinfo raptor.cpuinfo -flavour s390 -majors 2.6 -kernel-2.6 \ - linux-image-2.6-s390 -usable \ - linux-image-2.6-s390 \ - linux-image-2.6-s390x \ - linux-image-2.6.18-2-s390 \ - linux-image-2.6.30-1-s390x -unusable \ - linux-image-2.6-s390-tape \ - linux-image-2.6-s390x-tape \ - linux-image-2.6.18-2-s390-tape \ - linux-image-2.6.30-1-s390x-tape diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -machine : RTS7751R2D -processor : 0 -cpu family : sh4 -cpu type : SH7751R -cut : unknown -cpu flags : ptea -cache type : split (harvard) -icache size : 4KiB (2-way) -dcache size : 4KiB (2-way) -bogomips : 120.00 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -subarch rts7751r2d -cpuinfo rts7751r2d.cpuinfo -majors 2.6 -flavour sh7751r -kernel-2.6 linux-image-2.6-sh7751r -usable \ - linux-image-2.6-sh7751r \ - linux-image-2.6.32-5-sh7751r -unusable \ - linux-image-2.6-sh7785lcr \ - linux-image-2.6.32-5-sh7785lcr diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -machine : SH7785LCR -processor : 0 -cpu family : sh4a -cpu type : SH7785 -cut : 7.x -cpu flags : fpu perfctr llsc -cache type : split (harvard) -icache size : 32KiB (4-way) -dcache size : 32KiB (4-way) -bogomips : 599.99 diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -subarch sh7785lcr -cpuinfo sh7785lcr.cpuinfo -majors 2.6 -flavour sh7785lcr -kernel-2.6 linux-image-2.6-sh7785lcr -usable \ - linux-image-2.6-sh7785lcr \ - linux-image-2.6.32-5-sh7785lcr -unusable \ - linux-image-2.6-sh7751r \ - linux-image-2.6.32-5-sh7751r diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -cpu : UltraSparc T1 (Niagara) -fpu : UltraSparc T1 integrated FPU -prom : OBP 4.26.1 2007/04/02 16:26 -type : sun4v -ncpus probed : 16 -ncpus active : 16 -D$ parity tl1 : 0 -I$ parity tl1 : 0 -Cpu0Bogo : 1993.81 -Cpu0ClkTck : 000000003b9aca00 -Cpu1Bogo : 1989.74 -Cpu1ClkTck : 000000003b9aca00 -Cpu2Bogo : 1986.99 -Cpu2ClkTck : 000000003b9aca00 -Cpu3Bogo : 1984.34 -Cpu3ClkTck : 000000003b9aca00 -Cpu4Bogo : 1981.84 -Cpu4ClkTck : 000000003b9aca00 -Cpu5Bogo : 1979.49 -Cpu5ClkTck : 000000003b9aca00 -Cpu6Bogo : 1977.14 -Cpu6ClkTck : 000000003b9aca00 -Cpu7Bogo : 1974.79 -Cpu7ClkTck : 000000003b9aca00 -Cpu8Bogo : 1972.45 -Cpu8ClkTck : 000000003b9aca00 -Cpu9Bogo : 1970.05 -Cpu9ClkTck : 000000003b9aca00 -Cpu10Bogo : 1967.69 -Cpu10ClkTck : 000000003b9aca00 -Cpu11Bogo : 1965.33 -Cpu11ClkTck : 000000003b9aca00 -Cpu12Bogo : 1963.01 -Cpu12ClkTck : 000000003b9aca00 -Cpu13Bogo : 1960.66 -Cpu13ClkTck : 000000003b9aca00 -Cpu14Bogo : 1958.30 -Cpu14ClkTck : 000000003b9aca00 -Cpu15Bogo : 1955.95 -Cpu15ClkTck : 000000003b9aca00 -MMU Type : Hypervisor (sun4v) -State: -CPU0: online -CPU1: online -CPU2: online -CPU3: online -CPU4: online -CPU5: online -CPU6: online -CPU7: online -CPU8: online -CPU9: online -CPU10: online -CPU11: online -CPU12: online -CPU13: online -CPU14: online -CPU15: online diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -cpuinfo niagara-t1-smp.cpuinfo -machine sparc64 -majors 2.6 -flavour sparc64 -kernel-2.6 \ - linux-sparc64-smp \ - linux-image-sparc64-smp \ - linux-sparc64 \ - linux-image-sparc64 -usable \ - linux-sparc64 \ - linux-sparc64-smp \ - linux-image-sparc64 \ - linux-image-sparc64-smp \ - linux-image-2.6.20-15-sparc64 \ - linux-image-2.6.20-15-sparc64-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -cpu : UltraSparc T1 (Niagara) -fpu : UltraSparc T1 integrated FPU -prom : OBP 4.26.1 2007/04/02 16:26 -type : sun4v -ncpus probed : 1 -ncpus active : 1 -D$ parity tl1 : 0 -I$ parity tl1 : 0 -Cpu0Bogo : 1993.81 -Cpu0ClkTck : 000000003b9aca00 -MMU Type : Hypervisor (sun4v) -State: -CPU0: online -CPU1: online -CPU2: online -CPU3: online -CPU4: online -CPU5: online -CPU6: online -CPU7: online -CPU8: online -CPU9: online -CPU10: online -CPU11: online -CPU12: online -CPU13: online -CPU14: online -CPU15: online diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -cpuinfo niagara-t1-up.cpuinfo -machine sparc64 -majors 2.6 -flavour sparc64 -kernel-2.6 \ - linux-sparc64-smp \ - linux-image-sparc64-smp \ - linux-sparc64 \ - linux-image-sparc64 -usable \ - linux-sparc64 \ - linux-sparc64-smp \ - linux-image-sparc64 \ - linux-image-sparc64-smp \ - linux-image-2.6.20-15-sparc64 \ - linux-image-2.6.20-15-sparc64-smp diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.cpuinfo ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.cpuinfo --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.cpuinfo 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.cpuinfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -cpu : TI UltraSparc IIi (Sabre) -fpu : UltraSparc IIi integrated FPU -promlib : Version 3 Revision 11 -prom : 3.11.9 -type : sun4u -ncpus probed : 1 -ncpus active : 1 -Cpu0Bogo : 595.96 -Cpu0ClkTck : 0000000011de39c5 -MMU Type : Spitfire diff -Nru ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.test ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.test --- ubuntu-release-upgrader-0.180/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.test 2012-05-16 15:24:55.000000000 +0000 +++ ubuntu-release-upgrader-0.181/DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -cpuinfo ultra-IIi.cpuinfo -machine sparc64 -majors 2.6 -flavour sparc64 -kernel-2.6 \ - linux-sparc64 \ - linux-image-sparc64 -usable \ - linux-sparc64 \ - linux-sparc64-smp \ - linux-image-sparc64 \ - linux-image-sparc64-smp \ - linux-image-2.6.20-15-sparc64 \ - linux-image-2.6.20-15-sparc64-smp diff -Nru ubuntu-release-upgrader-0.180/data/demoted.cfg ubuntu-release-upgrader-0.181/data/demoted.cfg --- ubuntu-release-upgrader-0.180/data/demoted.cfg 2012-09-04 08:02:57.000000000 +0000 +++ ubuntu-release-upgrader-0.181/data/demoted.cfg 2012-07-03 20:58:44.000000000 +0000 @@ -1,7 +1,4 @@ # demoted packages from precise to quantal -akonadi-backend-mysql -akonadi-dbg -akonadi-server akregator amarok amarok-common @@ -61,12 +58,9 @@ cdrdao cervisia choqok -compiz-plugins -cpp-4.5 -cpp-4.5-doc +compiz-fusion-plugins-main create-resources cvsservice -debconf-kde-dbg dia-common dia-gnome dia-libs @@ -80,7 +74,6 @@ expat eyed3 filelight -finger fonts-dustin fonts-sil-gentium fonts-sil-gentium-basic @@ -88,24 +81,16 @@ fortunes-min freecdb freespacenotifier -g++-4.5 gawk-doc -gcc-4.5 -gcc-4.5-base -gcc-4.5-doc -gcc-4.5-plugin-dev gcj-4.6-source -gfortran-4.5-doc gfortran-4.6 gfortran-4.6-multilib gftp-common gftp-gtk ggzcore-bin -ginn gir1.2-launchpad-integration-3.0 glade gle-doc -gnome-nettool gnugo gobjc-4.6 gpgsm @@ -117,11 +102,7 @@ gwenview gwenview-dbg ibus-qt4 -icedtea-6-plugin -icoutils indi-dbg -jockey-common -jockey-gtk jockey-kde jovie juk @@ -145,10 +126,6 @@ kapman kapptemplate karbon -kate -kate-data -kate-dbg -katepart katomic kbattleship kblackbox @@ -167,7 +144,6 @@ kde-baseapps kde-baseapps-bin kde-baseapps-data -kde-baseapps-dbg kde-config-cddb kde-config-cron kde-config-gtk @@ -192,7 +168,6 @@ kde-l10n-ga kde-l10n-gl kde-l10n-he -kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia @@ -229,10 +204,6 @@ kde-l10n-wa kde-l10n-zhcn kde-l10n-zhtw -kde-runtime -kde-runtime-data -kde-runtime-dbg -kde-sc-dev-latest kde-style-oxygen kde-wallpapers kde-wallpapers-default @@ -250,11 +221,7 @@ kdeadmin kdeadmin-dbg kdeartwork-dbg -kdebase-dbg -kdebase-runtime -kdebase-runtime-dbg kdebase-workspace -kdebase-workspace-dbg kdebase-workspace-dev kdeedu kdeedu-kvtml-data @@ -268,7 +235,6 @@ kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers -kdelibs5-plugins kdemultimedia kdemultimedia-kio-plugins kdenetwork @@ -276,25 +242,16 @@ kdenetwork-filesharing kdepasswd kdepim -kdepim-dbg kdepim-dev kdepim-doc kdepim-kresources -kdepim-runtime -kdepim-runtime-dbg kdepim-strigi-plugins -kdepimlibs-dbg -kdepimlibs-kio-plugins -kdepimlibs5 -kdepimlibs5-dev kdeplasma-addons kdeplasma-addons-dbg kdesdk -kdesdk-dbg kdesdk-dolphin-plugins kdesdk-kio-plugins kdesdk-misc -kdesdk-scripts kdesdk-strigi-plugins kdesudo kdetoys @@ -353,10 +310,7 @@ konqueror konqueror-nsplugins konquest -konsole -konsole-dbg konsolekalendar -kontact konversation konversation-data konversation-dbg @@ -401,8 +355,6 @@ kturtle ktux kubrick -kubuntu-debug-installer -kubuntu-debug-installer-dbg kubuntu-default-settings kubuntu-desktop kubuntu-docs @@ -422,21 +374,6 @@ language-selector-kde latex-sanskrit launchpad-integration -lib32objc2 -lib32objc2-dbg -lib32stdc++6-4.5-dbg -lib64objc2 -lib64objc2-dbg -lib64stdc++6-4.5-dbg -libakonadi-calendar4 -libakonadi-contact4 -libakonadi-dev -libakonadi-kabc4 -libakonadi-kcal4 -libakonadi-kde4 -libakonadi-kmime4 -libakonadi-notes4 -libakonadiprotocolinternals1 libanalitza4abi1 libanalitzagui4abi1 libapache2-mod-auth-kerb @@ -444,6 +381,23 @@ libavogadro1 libbluedevil-dev libbluedevil1 +libboost-graph1.46-dev +libboost-graph1.46.1 +libboost-iostreams1.46-dev +libboost-iostreams1.46.1 +libboost-program-options1.46-dev +libboost-program-options1.46.1 +libboost-python1.46-dev +libboost-python1.46.1 +libboost-regex1.46-dev +libboost-regex1.46.1 +libboost-serialization1.46-dev +libboost-serialization1.46.1 +libboost-test1.46-dev +libboost-test1.46.1 +libboost1.46-dbg +libboost1.46-dev +libboost1.46-doc libcalendarsupport4 libcfitsio3 libcfitsio3-dbg @@ -453,12 +407,6 @@ libcln6 libcue-dev libcue1 -libdconf-qt-dev -libdconf-qt0 -libdebconf-kde-dev -libdebconf-kde0 -libdmtx-dev -libdmtx0a libeigen2-dev libeigen2-doc libepub-dev @@ -467,6 +415,8 @@ libfacile-ocaml-dev libfli-dev libfli1 +libgdu-gtk-dev +libgdu-gtk0 libggz-dev libggz2 libggzcore-dev @@ -479,18 +429,13 @@ libglew1.5-dev libglewmx1.5 libglewmx1.5-dev -libgpgme++2 libgps-dev libgps20 -libgsf-gnome-1-114 -libgsf-gnome-1-dev libgtlcore0.8 libgtlfragment0.8 libgtlimageio0.8 libibus-qt-dev libibus-qt1 -libicc-utils-dev -libicc-utils2 libifp-dev libifp4 libincidenceeditorsng4 @@ -503,18 +448,7 @@ libk3b-dev libk3b6 libk3b6-extracodecs -libkabc4 -libkactivities-bin -libkactivities-dbg -libkactivities-dev -libkactivities6 -libkalarmcal2 libkateinterfaces4 -libkatepartinterfaces4 -libkblog4 -libkcal4 -libkcalcore4 -libkcalutils4 libkcddb-dev libkcddb4 libkdcraw-data @@ -523,39 +457,26 @@ libkdeedu-dbg libkdeedu-dev libkdegames-dev +libkdegames5a libkdepim4 libkdepimdbusinterfaces4 libkdgantt2 libkeduvocdocument4 libkephal4abi1 +libkexiv2-10 libkexiv2-data libkexiv2-dbg libkexiv2-dev -libkholidays4 -libkimap4 libkipi-data libkipi-dbg libkipi-dev -libkldap4 libkleo4 libkmahjongglib4 libkmanagesieve4 -libkmbox4 -libkmime4 -libkonq-common -libkonq5-dev -libkonq5-templates -libkonq5abi1 -libkonqsidebarplugin-dev -libkonqsidebarplugin4a -libkontactinterface4 libkopete-dev libkopete4 +libkpathsea5 libkpgp4 -libkpimidentities4 -libkpimtextedit4 -libkpimutils4 -libkresources4 libksane-data libksane-dbg libksane-dev @@ -565,7 +486,6 @@ libksieve4 libksieveui4 libksignalplotter4 -libktnef4 libktorrent-dbg libktorrent-dev libktorrent-l10n @@ -573,9 +493,9 @@ libkwinactivenvidiahack4 libkwinglesutils1 libkwinnvidiahack4 -libkxmlrpcclient4 liblastfm-dbg liblastfm-dev +liblastfm0 liblaunchpad-integration-3.0-1 liblaunchpad-integration-3.0-dev liblaunchpad-integration-cil-dev @@ -583,22 +503,21 @@ liblaunchpad-integration-dev liblaunchpad-integration1 liblaunchpad-integration1.0-cil -libllvm-3.0-ocaml-dev -libllvm3.0 libloudmouth1-0 libloudmouth1-0-dbg libloudmouth1-dev +liblouis-data +liblouis-dev +liblouis2 liblsofui4 libmad0 libmad0-dev libmailcommon4 -libmailtransport4 libmarble-dev libmessagecomposer4 libmessagecore4 libmessagelist4 libmessageviewer4 -libmicroblog4 libmpcdec-dev libmpcdec6 libmsn-dev @@ -610,27 +529,12 @@ libmygpo-qt-dev libmygpo-qt1 libmysqld-pic -libnepomuksync4 +libnepomukdatamanagement4 libnjb-dev libnjb-doc libnjb5 -libnl2 -libnl2-dbg -libnl2-dev -libnl2-doc libnova-dev -libntrack-dev -libntrack-glib-dev -libntrack-glib2 -libntrack-gobject-dev -libntrack-gobject1 -libntrack-qt4-1 -libntrack-qt4-dev -libntrack0 -libobjc2 -libobjc2-dbg -libokteta1core1 -libokteta1gui1 +libnunit2.5-cil libokularcore1abi1 libopenal-data libopenal-dev @@ -651,9 +555,6 @@ libpqxx-3.1-dbg libpqxx3-dev libpqxx3-doc -libprison-dbg -libprison-dev -libprison0 libprocesscore4abi1 libprocessui4a libpstoedit-dev @@ -661,31 +562,14 @@ libqalculate-dev libqalculate-doc libqalculate5 -libqapt-dev -libqapt-runtime -libqapt1 libqca2-plugin-ossl -libqgpgme1 libqgpsmm-dev libqgpsmm20 libqoauth-dev libqoauth1 -libqrencode-dev -libqrencode3 libqscintilla2-designer libqt4-sql-odbc libqt4-sql-psql -libqtbamf-dev -libqtbamf1 -libqtdee-dev -libqtdee2 -libqtgconf-dev -libqtgconf1 -libqtglib-2.0-0 -libqtgstreamer-0.10-0 -libqtgstreamer-dev -libqtgstreamerui-0.10-0 -libqtgstreamerutils-0.10-0 libqtgtl-dev libqtgtl0.1 libqtscript4-core @@ -706,47 +590,32 @@ libreoffice-style-oxygen libreplaygain-dev libreplaygain1 -libsampleicc-dev -libsampleicc2 -libservlet2.5-java -libservlet2.5-java-doc libsolidcontrol4abi2 libsolidcontrolifaces4abi2 libspnav-dev libspnav0 -libstdc++6-4.5-dbg -libstdc++6-4.5-dev -libstdc++6-4.5-doc -libsyndication4 libtag-extras-dev libtag-extras1 libtaskmanager4abi3 libtemplateparser4 -libtiff4 -libtiffxx0c2 -libtomcat6-java libunicode-map8-perl libunicode-string-perl -libunity-2d-private0 libweather-ion6 libxbase2.0-0 libxbase2.0-dev +libxcb-ewmh1 libxml-handler-yawriter-perl libxml-sax-machines-perl libxml-twig-perl libxml-xpath-perl libxsltc-java +libyajl1 libzip-dev libzip2 liferea liferea-data liferea-dbg lirc -llvm-3.0 -llvm-3.0-dev -llvm-3.0-doc -llvm-3.0-examples -llvm-3.0-runtime lokalize lskat marble @@ -760,10 +629,7 @@ muon-notifier muon-updater network-manager-kde -ntrack-module-libnl-0 ocaml-native-compilers -okteta -okteta-dev okular okular-dbg okular-dev @@ -772,7 +638,6 @@ openoffice.org-hyphenation-lt oxygen-cursor-theme oxygen-cursor-theme-extra -oxygen-icon-theme palapeli palapeli-data parley @@ -783,9 +648,7 @@ plasma-dataengines-addons plasma-dataengines-workspace plasma-desktop -plasma-netbook plasma-runners-addons -plasma-scriptengine-javascript plasma-scriptengine-python plasma-scriptengine-superkaramba plasma-wallpapers-addons @@ -796,45 +659,34 @@ plasma-widget-lancelot plasma-widget-menubar plasma-widget-message-indicator -plasma-widget-networkmanagement plasma-widget-networkmanagement-dbg plasma-widgets-addons plasma-widgets-workspace plymouth-theme-kubuntu-logo plymouth-theme-kubuntu-text polkit-kde-1 -poxml printer-applet pstoedit pymacs python-avogadro -python-couchdb python-enchant python-eyed3 python-germinate python-gtk2-tutorial +python-gtop python-iniparse -python-kde4 -python-kde4-dbg -python-kde4-dev -python-kde4-doc python-launchpad-integration python-launchpad-integration-dbg python-levenshtein python-libproxy +python-louis python-packagekit -python-pyatspi2 python-pyudev python-qscintilla2 python-vobject -qapt-batch -qapt-dbg qapt-deb-installer qt-x11-free-dbg qt4-doc-html -qtgstreamer-dbg -qtgstreamer-doc -qtgstreamer-plugins quassel quassel-data quassel-dbg @@ -909,11 +761,6 @@ texlive-lang-vietnamese texlive-publishers texlive-science -tomcat6 -tomcat6-admin -tomcat6-common -tomcat6-docs -tomcat6-examples translate-toolkit translate-toolkit-dev-doc ttf-dustin @@ -921,19 +768,11 @@ type-handling ubiquity-frontend-kde ubiquity-slideshow-kubuntu -ubuntu-wallpapers-precise umbrello unclutter -unity-2d -unity-2d-common -unity-2d-panel -unity-2d-shell -unity-2d-spread update-manager-kde usb-creator-kde userconfig -virtuoso-minimal -virtuoso-opensource-6.1-bin vorbisgain xml-twig-tools xnest diff -Nru ubuntu-release-upgrader-0.180/data/mirrors.cfg ubuntu-release-upgrader-0.181/data/mirrors.cfg --- ubuntu-release-upgrader-0.180/data/mirrors.cfg 2012-09-04 08:03:05.000000000 +0000 +++ ubuntu-release-upgrader-0.181/data/mirrors.cfg 2012-07-03 20:58:44.000000000 +0000 @@ -847,8 +847,3 @@ http://suro.ubaya.ac.id/ubuntu/ http://ubuntu.repo.unpas.ac.id/ubuntu/ http://ubuntu.ntc.net.np/ubuntu/ -http://ftp.wa.co.za/pub/ubuntu/ubuntu/ -http://mirror.cogentco.com/pub/linux/ubuntu/ -http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ -http://ubuntu.mirror.neology.co.za/ubuntu/ -http://pandawa.ipb.ac.id/ubuntu/ diff -Nru ubuntu-release-upgrader-0.180/debian/changelog ubuntu-release-upgrader-0.181/debian/changelog --- ubuntu-release-upgrader-0.180/debian/changelog 2012-09-04 08:01:48.000000000 +0000 +++ ubuntu-release-upgrader-0.181/debian/changelog 2012-09-27 16:32:02.000000000 +0000 @@ -1,3 +1,17 @@ +ubuntu-release-upgrader (1:0.181) quantal; urgency=low + + [ Colin Watson ] + * DistUpgrade/DistUpgradeController.py: Guard against UnboundLocalError in + doDistUpgradeFetching. + + [ Brian Murray ] + * ensure that apt-clone system state is included in bug reports filed by + apport + * DistUpgrade/DistUpgradeController.py: properly handle source entries with + unicode comments in them (LP: #1039484) + + -- Brian Murray Thu, 27 Sep 2012 09:31:58 -0700 + ubuntu-release-upgrader (1:0.180) quantal; urgency=low * drop "unity-2d" from removal blacklist diff -Nru ubuntu-release-upgrader-0.180/debian/source_ubuntu-release-upgrader.py ubuntu-release-upgrader-0.181/debian/source_ubuntu-release-upgrader.py --- ubuntu-release-upgrader-0.180/debian/source_ubuntu-release-upgrader.py 2012-08-08 14:39:07.000000000 +0000 +++ ubuntu-release-upgrader-0.181/debian/source_ubuntu-release-upgrader.py 2012-09-27 15:48:58.000000000 +0000 @@ -6,7 +6,9 @@ from apport.hookutils import ( attach_gsettings_package, - attach_file_if_exists) + attach_file_if_exists, + root_command_output) + def add_info(report, ui): try: @@ -15,9 +17,9 @@ pass report.setdefault('Tags', 'dist-upgrade') report['Tags'] += ' dist-upgrade' - attach_file_if_exists(report, - '/var/log/dist-upgrade/apt-clone_system_state.tar.gz', - 'VarLogDistupgradeAptclonesystemstate.tar.gz') + clone_file = '/var/log/dist-upgrade/apt-clone_system_state.tar.gz' + report['VarLogDistupgradeAptclonesystemstate.tar.gz'] = \ + root_command_output(["cat", clone_file], decode_utf8=False) attach_file_if_exists(report, '/var/log/dist-upgrade/apt.log', 'VarLogDistupgradeAptlog') attach_file_if_exists(report, '/var/log/dist-upgrade/apt-term.log', diff -Nru ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list --- ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list 2012-09-04 08:03:26.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - -# main repo -deb http://ports.ubuntu.com/ubuntu-ports/ hardy main restricted multiverse universe -deb http://ports.ubuntu.com/ubuntu-ports/ hardy main restricted multiverse -deb-src http://archive.ubuntu.com/ubuntu/ hardy main restricted multiverse - -deb http://ports.ubuntu.com/ubuntu-ports/ hardy-security main restricted universe multiverse diff -Nru ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.d/prerequists-sources.list ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.d/prerequists-sources.list --- ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.d/prerequists-sources.list 2012-09-04 08:03:26.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.d/prerequists-sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# sources.list fragment for pre-requists (mirror from sources.list + fallback) -# this is safe to remove after the upgrade -# deb http://archive.ubuntu.com/ubuntu feisty-backports main/debian-installer - -# below is just for testing -# deb http://archive.dogfood.launchpad.net/ubuntu feisty-backports main/debian-installer diff -Nru ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.d/prerequists-sources.list.distUpgrade ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.d/prerequists-sources.list.distUpgrade --- ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.d/prerequists-sources.list.distUpgrade 2012-09-04 08:03:26.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.d/prerequists-sources.list.distUpgrade 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# sources.list fragment for pre-requists (mirror from sources.list + fallback) -# this is safe to remove after the upgrade -# deb http://archive.ubuntu.com/ubuntu feisty-backports main/debian-installer - -# below is just for testing -# deb http://archive.dogfood.launchpad.net/ubuntu feisty-backports main/debian-installer diff -Nru ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.distUpgrade ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.distUpgrade --- ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.distUpgrade 2012-09-04 08:03:26.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.distUpgrade 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - -# main repo -deb http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse universe -deb http://de.archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse -deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse - -deb http://security.ubuntu.com/ubuntu gutsy-security main restricted \ No newline at end of file diff -Nru ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.unicode ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.unicode --- ubuntu-release-upgrader-0.180/tests/data-sources-list-test/sources.list.unicode 1970-01-01 00:00:00.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/data-sources-list-test/sources.list.unicode 2012-09-27 16:17:56.000000000 +0000 @@ -0,0 +1,5 @@ +deb http://archive.ubuntu.com/ubuntu gutsy main restricted +deb http://archive.ubuntu.com/ubuntu gutsy-updates main restricted +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted +# A PPA with a unicode comment +deb http://ppa.launchpad.net/random-ppa quantal main # ppa of Víctor R. Ruiz (vrruiz) diff -Nru ubuntu-release-upgrader-0.180/tests/patchdir/dotdot ubuntu-release-upgrader-0.181/tests/patchdir/dotdot --- ubuntu-release-upgrader-0.180/tests/patchdir/dotdot 2012-09-04 08:03:13.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/patchdir/dotdot 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -. -. diff -Nru ubuntu-release-upgrader-0.180/tests/patchdir/fail ubuntu-release-upgrader-0.181/tests/patchdir/fail --- ubuntu-release-upgrader-0.180/tests/patchdir/fail 2012-09-04 08:03:13.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/patchdir/fail 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -This is a patch that is intended to fail to ensure that the md5sum check works diff -Nru ubuntu-release-upgrader-0.180/tests/patchdir/foo ubuntu-release-upgrader-0.181/tests/patchdir/foo --- ubuntu-release-upgrader-0.180/tests/patchdir/foo 2012-09-04 08:03:13.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/patchdir/foo 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -World diff -Nru ubuntu-release-upgrader-0.180/tests/patchdir/fstab ubuntu-release-upgrader-0.181/tests/patchdir/fstab --- ubuntu-release-upgrader-0.180/tests/patchdir/fstab 2012-09-04 08:03:13.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/patchdir/fstab 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# /etc/fstab: static file system information. -# -# for a device; this may be used with UUID= as a more robust way to name -# devices that works even if disks are added and removed. See fstab(5). -# -# -proc /proc proc nodev,noexec,nosuid 0 0 -# / was on /dev/sda1 during installation -UUID=-05ff-43e4-9525-4206e8840761 / ext4 errors=remount-ro 0 1 -# swap was on /dev/sda5 during installation -UUID=c8b0eb70-9f4c-4c38-81fe-7309fb1965d0 none swap sw 0 0 - -# lalal# lalalaa - -# 1.5tb disk -UUID=e47814ee-ba9f-4c65-98cd-6f92a7fe26ba /space ext4 defaults 0 0 - - - -# Some additional junk diff -Nru ubuntu-release-upgrader-0.180/tests/patchdir/pycompile ubuntu-release-upgrader-0.181/tests/patchdir/pycompile --- ubuntu-release-upgrader-0.180/tests/patchdir/pycompile 2012-09-04 08:03:13.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/patchdir/pycompile 1970-01-01 00:00:00.000000000 +0000 @@ -1,314 +0,0 @@ -#! /usr/bin/python -# -*- coding: utf-8 -*- -# vim: et ts=4 sw=4 - -# Copyright © 2010 Piotr Ożarowski -# Copyright © 2010 Canonical Ltd -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -from __future__ import with_statement -import logging -import optparse -import os -import sys -from os import environ, listdir, walk -from os.path import abspath, exists, isdir, isfile, join -from subprocess import PIPE, STDOUT, Popen -sys.path.insert(1, '/usr/share/python/') -from debpython.version import SUPPORTED, debsorted, vrepr, \ - get_requested_versions, parse_vrange, getver -from debpython.option import Option, compile_regexpr -from debpython.pydist import PUBLIC_DIR_RE -from debpython.tools import memoize - -# initialize script -logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: ' - '%(message)s') -log = logging.getLogger(__name__) -STDINS = {} -WORKERS = {} - -"""TODO: move it to manpage -Examples: - pycompile -p python-mako # package's public files - pycompile -p foo /usr/share/foo # package's private files - pycompile -p foo -V 2.6- /usr/share/foo # private files, Python >= 2.6 - pycompile -V 2.6 /usr/lib/python2.6/dist-packages # python2.6 only - pycompile -V 2.6 /usr/lib/foo/bar.py # python2.6 only -""" - - -### FILES ###################################################### -def get_directory_files(dname): - """Generate *.py file names available in given directory.""" - if isfile(dname) and dname.endswith('.py'): - yield dname - else: - for root, dirs, file_names in walk(abspath(dname)): - #if root != dname and not exists(join(root, '__init__.py')): - # del dirs[:] - # continue - for fn in file_names: - if fn.endswith('.py'): - yield join(root, fn) - - -def get_package_files(package_name): - """Generate *.py file names available in given package.""" - process = Popen("/usr/bin/dpkg -L %s" % package_name,\ - shell=True, stdout=PIPE) - stdout, stderr = process.communicate() - if process.returncode != 0: - log.error('cannot get content of %s', package_name) - exit(2) - for line in stdout.split('\n'): - if line.endswith('.py'): - yield line - - -def get_private_files(files, dname): - """Generate *.py file names that match given directory.""" - for fn in files: - if fn.startswith(dname): - yield fn - - -def get_public_files(files, versions): - """Generate *.py file names that match given versions.""" - versions_str = set("%d.%d" % i for i in versions) - for fn in files: - if fn.startswith('/usr/lib/python') and \ - fn[15:18] in versions_str: - yield fn - - -### EXCLUDES ################################################### -@memoize -def get_exclude_patterns_from_dir(name='/usr/share/python/bcep/'): - """Return patterns for files that shouldn't be bytecompiled.""" - if not isdir(name): - return [] - - result = [] - for fn in listdir(name): - with file(join(name, fn), 'r') as lines: - for line in lines: - type_, vrange, dname, pattern = line.split('|', 3) - vrange = parse_vrange(vrange) - versions = get_requested_versions(vrange, available=True) - if not versions: - # pattern doesn't match installed Python versions - continue - pattern = pattern.rstrip('\n') - if type_ == 're': - pattern = compile_regexpr(None, None, pattern) - result.append((type_, versions, dname, pattern)) - return result - - -def get_exclude_patterns(directory='/', patterns=None, versions=None): - """Return patterns for files that shouldn't be compiled in given dir.""" - if patterns: - if versions is None: - versions = set(SUPPORTED) - patterns = [('re', versions, directory, i) for i in patterns] - else: - patterns = [] - - for type_, vers, dname, pattern in get_exclude_patterns_from_dir(): - # skip patterns that do not match requested directory - if not dname.startswith(directory[:len(dname)]): - continue - # skip patterns that do not match requested versions - if versions and not versions & vers: - continue - patterns.append((type_, vers, dname, pattern)) - return patterns - - -def filter_files(files, e_patterns, compile_versions): - """Generate (file, versions_to_compile) pairs.""" - for fn in files: - valid_versions = set(compile_versions) # all by default - - for type_, vers, dname, pattern in e_patterns: - if type_ == 'dir' and fn.startswith(dname): - valid_versions = valid_versions - vers - elif type_ == 're' and pattern.match(fn): - valid_versions = valid_versions - vers - - # move to the next file if all versions were removed - if not valid_versions: - break - if valid_versions: - public_dir = PUBLIC_DIR_RE.match(fn) - if public_dir: - yield fn, set([getver(public_dir.group(1))]) - else: - yield fn, valid_versions - - -### COMPILE #################################################### -def py_compile(version, optimize, workers): - if not isinstance(version, basestring): - version = vrepr(version) - cmd = "python%s%s -m py_compile -" \ - % (version, '' if (__debug__ or not optimize) else ' -O') - process = Popen(cmd, bufsize=1, shell=True, - stdin=PIPE, close_fds=True) - workers[version] = process # keep the reference for .communicate() - stdin = process.stdin - while True: - filename = (yield) - stdin.write(filename + '\n') - - -def compile(files, versions, force, optimize, e_patterns=None): - global STDINS, WORKERS - # start Python interpreters that will handle byte compilation - for version in versions: - if version not in STDINS: - coroutine = py_compile(version, optimize, WORKERS) - coroutine.next() - STDINS[version] = coroutine - - # byte compile files - for fn, versions_to_compile in filter_files(files, e_patterns, versions): - cfn = fn + 'c' if (__debug__ or not optimize) else 'o' - if exists(cfn) and not force: - ftime = os.stat(fn).st_mtime - try: - ctime = os.stat(cfn).st_mtime - except os.error: - ctime = 0 - if (ctime > ftime): - continue - for version in versions_to_compile: - try: - pipe = STDINS[version] - except KeyError: - # `pycompile /usr/lib/` invoked, add missing worker - pipe = py_compile(version, optimize, WORKERS) - pipe.next() - STDINS[version] = pipe - pipe.send(fn) - - -################################################################ -def main(): - usage = '%prog [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n' + \ - ' %prog -p PACKAGE' - parser = optparse.OptionParser(usage, version='%prog 0.9', - option_class=Option) - parser.add_option('-v', '--verbose', action='store_true', dest='verbose', - help='turn verbose mode on') - parser.add_option('-q', '--quiet', action='store_false', dest='verbose', - default=False, help='be quiet') - parser.add_option('-f', '--force', action='store_true', dest='force', - default=False, help='force rebuild even if timestamps are up-to-date') - parser.add_option('-O', action='store_true', dest='optimize', - default=False, help="byte-compile to .pyo files") - parser.add_option('-p', '--package', - help='specify Debian package name whose files should be bytecompiled') - parser.add_option('-V', type='version_range', dest='vrange', - help="""force private modules to be bytecompiled with Python version -from given range, regardless of the default Python version in the system. -If there are no other options, bytecompile all public modules for installed -Python versions that match given range. - -VERSION_RANGE examples: '2.5' (version 2.5 only), '2.5-' (version 2.5 or -newer), '2.5-2.7' (version 2.5 or 2.6), '-3.0' (all supported 2.X versions)""") - parser.add_option('-X', '--exclude', action='append', - dest='regexpr', type='regexpr', - help='exclude items that match given REGEXPR. You may use this option \ -multiple times to build up a list of things to exclude.') - - (options, args) = parser.parse_args() - - if options.verbose or environ.get('PYCOMPILE_DEBUG') == '1': - log.setLevel(logging.DEBUG) - log.debug('argv: %s', sys.argv) - log.debug('options: %s', options) - log.debug('args: %s', args) - else: - log.setLevel(logging.WARN) - - if options.regexpr and not args: - parser.error('--exclude option works with private directories ' - 'only, please use /usr/share/python/bcep to specify ' - 'public modules to skip') - - if options.vrange and options.vrange[0] == options.vrange[1] and\ - options.vrange != (None, None) and\ - exists("/usr/bin/python%d.%d" % options.vrange[0]): - # specific version requested, use it even if it's not in SUPPORTED - versions = set(options.vrange[:1]) - else: - versions = get_requested_versions(options.vrange, available=True) - if not versions: - log.error('Requested versions are not installed') - exit(3) - - if options.package and args: # package's private directories - # get requested Python version - compile_versions = debsorted(versions)[:1] - log.debug('compile versions: %s', versions) - - pkg_files = tuple(get_package_files(options.package)) - for item in args: - e_patterns = get_exclude_patterns(item, options.regexpr, \ - compile_versions) - if not exists(item): - log.warn('No such file or directory: %s', item) - else: - log.debug('byte compiling %s using Python %s', - item, compile_versions) - files = get_private_files(pkg_files, item) - compile(files, compile_versions, options.force, - options.optimize, e_patterns) - elif options.package: # package's public modules - # no need to limit versions here, it's either pyr mode or version is - # hardcoded in path / via -V option - e_patterns = get_exclude_patterns() - files = get_package_files(options.package) - files = get_public_files(files, versions) - compile(files, versions, - options.force, options.optimize, e_patterns) - elif args: # other directories/files (public ones mostly) - versions = debsorted(versions)[:1] - for item in args: - e_patterns = get_exclude_patterns(item, options.regexpr, versions) - files = get_directory_files(item) - compile(files, versions, - options.force, options.optimize, e_patterns) - else: - parser.print_usage() - exit(1) - - # wait for all processes to finish - rv = 0 - for process in WORKERS.itervalues(): - process.communicate() - if process.returncode not in (None, 0): - rv = process.returncode - sys.exit(rv) - -if __name__ == '__main__': - main() diff -Nru ubuntu-release-upgrader-0.180/tests/test-data/fstab.ntfs ubuntu-release-upgrader-0.181/tests/test-data/fstab.ntfs --- ubuntu-release-upgrader-0.180/tests/test-data/fstab.ntfs 2012-09-04 08:03:19.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/test-data/fstab.ntfs 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# /etc/fstab: static file system information. -# -# Use 'vol_id --uuid' to print the universally unique identifier for a -# device; this may be used with UUID= as a more robust way to name devices -# that works even if disks are added and removed. See fstab(5). -# -# -proc /proc proc defaults 0 0 -# / was on /dev/sda1 during installation -UUID=xxxxxxx-ba9f-4232-xxxx-xxxxxxx / ext4 relatime,errors=remount-ro 0 1 -# swap was on /dev/sda5 during installation -UUID=xxxxxxxx-xxx-xxxx-b210-xxxxxxxxa none swap sw 0 0 -/dev/scd0 /media/cdrom0 udf,iso9660 user,noauto,exec,utf8 0 0 - -/dev/sdb1 /media/xxx ext3 defaults 0 0 - - -UUID=7260D4F760D4C2c2 /media/storage ntfs defaults,nls=utf8,umask=000,gid=46 0 0 - -/dev/sdb1 /media/xxx ext3 defaults 0 0 - -UUID=7260D4F760D4C2D1 /media/storage ntfs defaults,nls=utf8,umask=000,gid=46 0 0 diff -Nru ubuntu-release-upgrader-0.180/tests/test-data/xorg.conf ubuntu-release-upgrader-0.181/tests/test-data/xorg.conf --- ubuntu-release-upgrader-0.180/tests/test-data/xorg.conf 2012-09-04 08:03:26.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/test-data/xorg.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -# xorg.conf (xorg X Window System server configuration file) -# -# This file was generated by failsafeDexconf, using -# values from the debconf database and some overrides to use vesa mode. -# -# You should use dexconf or another such tool for creating a "real" xorg.conf -# For example: -# sudo dpkg-reconfigure -phigh xserver-xorg -Section "Files" -EndSection - -#Section "Module" -# Disable "dbe" -# Disable "dri" -# Disable "glx" -# Disable "vbe" -#EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "kbd" - Option "CoreKeyboard" - Option "XkbRules" "xorg" - Option "XkbModel" "pc104" - Option "XkbLayout" "de" - Option "XkbOptions" "ctrl:nocaps" -EndSection - -#Section "InputDevice" -# Identifier "Configured Mouse" -# Driver "mouse" -# Option "CorePointer" -# Option "Device" "/dev/input/mice" -# Option "Protocol" "ImPS/2" -# Option "ZAxisMapping" "4 5" -# Option "Emulate3Buttons" "true" -# Option "EmulateWheel" "true" -# Option "EmulateWheelButton" "2" -#EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "evdev" - Option "Device" "/dev/input/input9" - Option "Emulate3Buttons" "true" - Option "EmulateWheel" "true" - Option "EmulateWheelButton" "2" - Option "ZAxisMapping" "4 5" -EndSection - - -Section "InputDevice" - Identifier "Synaptics Touchpad" - Driver "synaptics" - Option "SendCoreEvents" "true" - Option "Device" "/dev/psaux" - Option "Protocol" "auto-dev" - Option "HorizScrollDelta" "0" -EndSection - -Section "Device" - Identifier "Failsafe Device" - #Driver "vesa" - #Driver "radeonhd" - Driver "ati" # or "fglrx" - #Driver "fglrx" -EndSection - -Section "Monitor" - Identifier "Failsafe Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Failsafe Device" - Monitor "Failsafe Monitor" - #Input "Configured Mouse" - Defaultdepth 24 - SubSection "Display" - Depth 24 - Modes "1400x1050" - EndSubSection -EndSection - -Section "ServerLayout" -EndSection -#Section "ServerLayout" -#EndSection diff -Nru ubuntu-release-upgrader-0.180/tests/test_quirks.py ubuntu-release-upgrader-0.181/tests/test_quirks.py --- ubuntu-release-upgrader-0.180/tests/test_quirks.py 2012-08-08 14:39:07.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/test_quirks.py 2012-09-27 16:51:36.000000000 +0000 @@ -143,7 +143,7 @@ "pci:v00001001d00006702sv*sd*bc03sc*i*"])]) def testFglrx(self): - mock_lspci_good = set(['1002:9714']) + mock_lspci_good = set(['1002:9990']) mock_lspci_bad = set(['8086:ac56']) config = mock.Mock() cache = apt.Cache() diff -Nru ubuntu-release-upgrader-0.180/tests/test_sources_list.py ubuntu-release-upgrader-0.181/tests/test_sources_list.py --- ubuntu-release-upgrader-0.180/tests/test_sources_list.py 2012-08-08 14:39:07.000000000 +0000 +++ ubuntu-release-upgrader-0.181/tests/test_sources_list.py 2012-09-27 16:17:14.000000000 +0000 @@ -326,6 +326,28 @@ deb http://archive.canonical.com/ubuntu gutsy partner """) + def test_unicode_comments(self): + """ + test transition of apt-cacher/apt-torrent uris + """ + shutil.copy(os.path.join(self.testdir, "sources.list.unicode"), + os.path.join(self.testdir, "sources.list")) + apt_pkg.config.set("Dir::Etc::sourcelist", "sources.list") + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v, datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assertTrue(res) + + # verify it + self._verifySources(""" +deb http://archive.ubuntu.com/ubuntu gutsy main restricted +deb http://archive.ubuntu.com/ubuntu gutsy-updates main restricted +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted +# A PPA with a unicode comment +# deb http://ppa.launchpad.net/random-ppa quantal main # ppa of Víctor R. Ruiz (vrruiz) disabled on upgrade to gutsy +""") + def _verifySources(self, expected): sources_file = apt_pkg.config.find_file("Dir::Etc::sourcelist") sources_list = open(sources_file).read() diff -Nru ubuntu-release-upgrader-0.180/utils/apt/sources.list ubuntu-release-upgrader-0.181/utils/apt/sources.list --- ubuntu-release-upgrader-0.180/utils/apt/sources.list 2012-09-04 08:02:57.000000000 +0000 +++ ubuntu-release-upgrader-0.181/utils/apt/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -deb-src http://archive.ubuntu.com/ubuntu quantal main Binary files /tmp/NdwOl4CeZX/ubuntu-release-upgrader-0.180/utils/apt/trusted.gpg and /tmp/kgvBhagDXO/ubuntu-release-upgrader-0.181/utils/apt/trusted.gpg differ diff -Nru ubuntu-release-upgrader-0.180/utils/demoted.cfg ubuntu-release-upgrader-0.181/utils/demoted.cfg --- ubuntu-release-upgrader-0.180/utils/demoted.cfg 2012-09-04 08:02:57.000000000 +0000 +++ ubuntu-release-upgrader-0.181/utils/demoted.cfg 2012-07-03 20:58:44.000000000 +0000 @@ -1,7 +1,4 @@ # demoted packages from precise to quantal -akonadi-backend-mysql -akonadi-dbg -akonadi-server akregator amarok amarok-common @@ -61,12 +58,9 @@ cdrdao cervisia choqok -compiz-plugins -cpp-4.5 -cpp-4.5-doc +compiz-fusion-plugins-main create-resources cvsservice -debconf-kde-dbg dia-common dia-gnome dia-libs @@ -80,7 +74,6 @@ expat eyed3 filelight -finger fonts-dustin fonts-sil-gentium fonts-sil-gentium-basic @@ -88,24 +81,16 @@ fortunes-min freecdb freespacenotifier -g++-4.5 gawk-doc -gcc-4.5 -gcc-4.5-base -gcc-4.5-doc -gcc-4.5-plugin-dev gcj-4.6-source -gfortran-4.5-doc gfortran-4.6 gfortran-4.6-multilib gftp-common gftp-gtk ggzcore-bin -ginn gir1.2-launchpad-integration-3.0 glade gle-doc -gnome-nettool gnugo gobjc-4.6 gpgsm @@ -117,11 +102,7 @@ gwenview gwenview-dbg ibus-qt4 -icedtea-6-plugin -icoutils indi-dbg -jockey-common -jockey-gtk jockey-kde jovie juk @@ -145,10 +126,6 @@ kapman kapptemplate karbon -kate -kate-data -kate-dbg -katepart katomic kbattleship kblackbox @@ -167,7 +144,6 @@ kde-baseapps kde-baseapps-bin kde-baseapps-data -kde-baseapps-dbg kde-config-cddb kde-config-cron kde-config-gtk @@ -192,7 +168,6 @@ kde-l10n-ga kde-l10n-gl kde-l10n-he -kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia @@ -229,10 +204,6 @@ kde-l10n-wa kde-l10n-zhcn kde-l10n-zhtw -kde-runtime -kde-runtime-data -kde-runtime-dbg -kde-sc-dev-latest kde-style-oxygen kde-wallpapers kde-wallpapers-default @@ -250,11 +221,7 @@ kdeadmin kdeadmin-dbg kdeartwork-dbg -kdebase-dbg -kdebase-runtime -kdebase-runtime-dbg kdebase-workspace -kdebase-workspace-dbg kdebase-workspace-dev kdeedu kdeedu-kvtml-data @@ -268,7 +235,6 @@ kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers -kdelibs5-plugins kdemultimedia kdemultimedia-kio-plugins kdenetwork @@ -276,25 +242,16 @@ kdenetwork-filesharing kdepasswd kdepim -kdepim-dbg kdepim-dev kdepim-doc kdepim-kresources -kdepim-runtime -kdepim-runtime-dbg kdepim-strigi-plugins -kdepimlibs-dbg -kdepimlibs-kio-plugins -kdepimlibs5 -kdepimlibs5-dev kdeplasma-addons kdeplasma-addons-dbg kdesdk -kdesdk-dbg kdesdk-dolphin-plugins kdesdk-kio-plugins kdesdk-misc -kdesdk-scripts kdesdk-strigi-plugins kdesudo kdetoys @@ -353,10 +310,7 @@ konqueror konqueror-nsplugins konquest -konsole -konsole-dbg konsolekalendar -kontact konversation konversation-data konversation-dbg @@ -401,8 +355,6 @@ kturtle ktux kubrick -kubuntu-debug-installer -kubuntu-debug-installer-dbg kubuntu-default-settings kubuntu-desktop kubuntu-docs @@ -422,21 +374,6 @@ language-selector-kde latex-sanskrit launchpad-integration -lib32objc2 -lib32objc2-dbg -lib32stdc++6-4.5-dbg -lib64objc2 -lib64objc2-dbg -lib64stdc++6-4.5-dbg -libakonadi-calendar4 -libakonadi-contact4 -libakonadi-dev -libakonadi-kabc4 -libakonadi-kcal4 -libakonadi-kde4 -libakonadi-kmime4 -libakonadi-notes4 -libakonadiprotocolinternals1 libanalitza4abi1 libanalitzagui4abi1 libapache2-mod-auth-kerb @@ -444,6 +381,23 @@ libavogadro1 libbluedevil-dev libbluedevil1 +libboost-graph1.46-dev +libboost-graph1.46.1 +libboost-iostreams1.46-dev +libboost-iostreams1.46.1 +libboost-program-options1.46-dev +libboost-program-options1.46.1 +libboost-python1.46-dev +libboost-python1.46.1 +libboost-regex1.46-dev +libboost-regex1.46.1 +libboost-serialization1.46-dev +libboost-serialization1.46.1 +libboost-test1.46-dev +libboost-test1.46.1 +libboost1.46-dbg +libboost1.46-dev +libboost1.46-doc libcalendarsupport4 libcfitsio3 libcfitsio3-dbg @@ -453,12 +407,6 @@ libcln6 libcue-dev libcue1 -libdconf-qt-dev -libdconf-qt0 -libdebconf-kde-dev -libdebconf-kde0 -libdmtx-dev -libdmtx0a libeigen2-dev libeigen2-doc libepub-dev @@ -467,6 +415,8 @@ libfacile-ocaml-dev libfli-dev libfli1 +libgdu-gtk-dev +libgdu-gtk0 libggz-dev libggz2 libggzcore-dev @@ -479,18 +429,13 @@ libglew1.5-dev libglewmx1.5 libglewmx1.5-dev -libgpgme++2 libgps-dev libgps20 -libgsf-gnome-1-114 -libgsf-gnome-1-dev libgtlcore0.8 libgtlfragment0.8 libgtlimageio0.8 libibus-qt-dev libibus-qt1 -libicc-utils-dev -libicc-utils2 libifp-dev libifp4 libincidenceeditorsng4 @@ -503,18 +448,7 @@ libk3b-dev libk3b6 libk3b6-extracodecs -libkabc4 -libkactivities-bin -libkactivities-dbg -libkactivities-dev -libkactivities6 -libkalarmcal2 libkateinterfaces4 -libkatepartinterfaces4 -libkblog4 -libkcal4 -libkcalcore4 -libkcalutils4 libkcddb-dev libkcddb4 libkdcraw-data @@ -523,39 +457,26 @@ libkdeedu-dbg libkdeedu-dev libkdegames-dev +libkdegames5a libkdepim4 libkdepimdbusinterfaces4 libkdgantt2 libkeduvocdocument4 libkephal4abi1 +libkexiv2-10 libkexiv2-data libkexiv2-dbg libkexiv2-dev -libkholidays4 -libkimap4 libkipi-data libkipi-dbg libkipi-dev -libkldap4 libkleo4 libkmahjongglib4 libkmanagesieve4 -libkmbox4 -libkmime4 -libkonq-common -libkonq5-dev -libkonq5-templates -libkonq5abi1 -libkonqsidebarplugin-dev -libkonqsidebarplugin4a -libkontactinterface4 libkopete-dev libkopete4 +libkpathsea5 libkpgp4 -libkpimidentities4 -libkpimtextedit4 -libkpimutils4 -libkresources4 libksane-data libksane-dbg libksane-dev @@ -565,7 +486,6 @@ libksieve4 libksieveui4 libksignalplotter4 -libktnef4 libktorrent-dbg libktorrent-dev libktorrent-l10n @@ -573,9 +493,9 @@ libkwinactivenvidiahack4 libkwinglesutils1 libkwinnvidiahack4 -libkxmlrpcclient4 liblastfm-dbg liblastfm-dev +liblastfm0 liblaunchpad-integration-3.0-1 liblaunchpad-integration-3.0-dev liblaunchpad-integration-cil-dev @@ -583,22 +503,21 @@ liblaunchpad-integration-dev liblaunchpad-integration1 liblaunchpad-integration1.0-cil -libllvm-3.0-ocaml-dev -libllvm3.0 libloudmouth1-0 libloudmouth1-0-dbg libloudmouth1-dev +liblouis-data +liblouis-dev +liblouis2 liblsofui4 libmad0 libmad0-dev libmailcommon4 -libmailtransport4 libmarble-dev libmessagecomposer4 libmessagecore4 libmessagelist4 libmessageviewer4 -libmicroblog4 libmpcdec-dev libmpcdec6 libmsn-dev @@ -610,27 +529,12 @@ libmygpo-qt-dev libmygpo-qt1 libmysqld-pic -libnepomuksync4 +libnepomukdatamanagement4 libnjb-dev libnjb-doc libnjb5 -libnl2 -libnl2-dbg -libnl2-dev -libnl2-doc libnova-dev -libntrack-dev -libntrack-glib-dev -libntrack-glib2 -libntrack-gobject-dev -libntrack-gobject1 -libntrack-qt4-1 -libntrack-qt4-dev -libntrack0 -libobjc2 -libobjc2-dbg -libokteta1core1 -libokteta1gui1 +libnunit2.5-cil libokularcore1abi1 libopenal-data libopenal-dev @@ -651,9 +555,6 @@ libpqxx-3.1-dbg libpqxx3-dev libpqxx3-doc -libprison-dbg -libprison-dev -libprison0 libprocesscore4abi1 libprocessui4a libpstoedit-dev @@ -661,31 +562,14 @@ libqalculate-dev libqalculate-doc libqalculate5 -libqapt-dev -libqapt-runtime -libqapt1 libqca2-plugin-ossl -libqgpgme1 libqgpsmm-dev libqgpsmm20 libqoauth-dev libqoauth1 -libqrencode-dev -libqrencode3 libqscintilla2-designer libqt4-sql-odbc libqt4-sql-psql -libqtbamf-dev -libqtbamf1 -libqtdee-dev -libqtdee2 -libqtgconf-dev -libqtgconf1 -libqtglib-2.0-0 -libqtgstreamer-0.10-0 -libqtgstreamer-dev -libqtgstreamerui-0.10-0 -libqtgstreamerutils-0.10-0 libqtgtl-dev libqtgtl0.1 libqtscript4-core @@ -706,47 +590,32 @@ libreoffice-style-oxygen libreplaygain-dev libreplaygain1 -libsampleicc-dev -libsampleicc2 -libservlet2.5-java -libservlet2.5-java-doc libsolidcontrol4abi2 libsolidcontrolifaces4abi2 libspnav-dev libspnav0 -libstdc++6-4.5-dbg -libstdc++6-4.5-dev -libstdc++6-4.5-doc -libsyndication4 libtag-extras-dev libtag-extras1 libtaskmanager4abi3 libtemplateparser4 -libtiff4 -libtiffxx0c2 -libtomcat6-java libunicode-map8-perl libunicode-string-perl -libunity-2d-private0 libweather-ion6 libxbase2.0-0 libxbase2.0-dev +libxcb-ewmh1 libxml-handler-yawriter-perl libxml-sax-machines-perl libxml-twig-perl libxml-xpath-perl libxsltc-java +libyajl1 libzip-dev libzip2 liferea liferea-data liferea-dbg lirc -llvm-3.0 -llvm-3.0-dev -llvm-3.0-doc -llvm-3.0-examples -llvm-3.0-runtime lokalize lskat marble @@ -760,10 +629,7 @@ muon-notifier muon-updater network-manager-kde -ntrack-module-libnl-0 ocaml-native-compilers -okteta -okteta-dev okular okular-dbg okular-dev @@ -772,7 +638,6 @@ openoffice.org-hyphenation-lt oxygen-cursor-theme oxygen-cursor-theme-extra -oxygen-icon-theme palapeli palapeli-data parley @@ -783,9 +648,7 @@ plasma-dataengines-addons plasma-dataengines-workspace plasma-desktop -plasma-netbook plasma-runners-addons -plasma-scriptengine-javascript plasma-scriptengine-python plasma-scriptengine-superkaramba plasma-wallpapers-addons @@ -796,45 +659,34 @@ plasma-widget-lancelot plasma-widget-menubar plasma-widget-message-indicator -plasma-widget-networkmanagement plasma-widget-networkmanagement-dbg plasma-widgets-addons plasma-widgets-workspace plymouth-theme-kubuntu-logo plymouth-theme-kubuntu-text polkit-kde-1 -poxml printer-applet pstoedit pymacs python-avogadro -python-couchdb python-enchant python-eyed3 python-germinate python-gtk2-tutorial +python-gtop python-iniparse -python-kde4 -python-kde4-dbg -python-kde4-dev -python-kde4-doc python-launchpad-integration python-launchpad-integration-dbg python-levenshtein python-libproxy +python-louis python-packagekit -python-pyatspi2 python-pyudev python-qscintilla2 python-vobject -qapt-batch -qapt-dbg qapt-deb-installer qt-x11-free-dbg qt4-doc-html -qtgstreamer-dbg -qtgstreamer-doc -qtgstreamer-plugins quassel quassel-data quassel-dbg @@ -909,11 +761,6 @@ texlive-lang-vietnamese texlive-publishers texlive-science -tomcat6 -tomcat6-admin -tomcat6-common -tomcat6-docs -tomcat6-examples translate-toolkit translate-toolkit-dev-doc ttf-dustin @@ -921,19 +768,11 @@ type-handling ubiquity-frontend-kde ubiquity-slideshow-kubuntu -ubuntu-wallpapers-precise umbrello unclutter -unity-2d -unity-2d-common -unity-2d-panel -unity-2d-shell -unity-2d-spread update-manager-kde usb-creator-kde userconfig -virtuoso-minimal -virtuoso-opensource-6.1-bin vorbisgain xml-twig-tools xnest