diff -pruN 1.158/debian/base-installer.templates 1.158ubuntu7/debian/base-installer.templates --- 1.158/debian/base-installer.templates 2011-01-19 04:28:19.000000000 +0000 +++ 1.158ubuntu7/debian/base-installer.templates 2012-09-11 09:19:44.000000000 +0000 @@ -69,3 +69,122 @@ Default: true Description: for internal use; can be preseeded Will configure APT in the target system not to install recommened packages by default. For experienced users only. + +Template: base-installer/initramfs/generator +Type: select +# :sl3: +Choices: ${GENERATORS} +_Description: Tool to use to generate boot initrd: + The list shows the available tools. If you are unsure which to select, + you should select the default. If your system fails to boot, you can + retry the installation using the other options. + +Template: base-installer/initramfs/unsupported +Type: error +# :sl3: +_Description: Unsupported initrd generator + The package ${GENERATOR} that was selected to generate the + initrd is not supported. + +Template: base-installer/initramfs-tools/driver-policy +Type: select +Choices-C: most, dep +# :sl3: +__Choices: generic: include all available drivers, targeted: only include drivers needed for this system +# :sl3: +_Description: Drivers to include in the initrd: + The primary function of an initrd is to allow the kernel to mount the + root file system. It therefore needs to contain all drivers and supporting + programs required to do that. + . + A generic initrd is much larger than a targeted one and may even be so + large that some boot loaders are unable to load it but has the advantage that + it can be used to boot the target system on almost any hardware. With the + smaller targeted initrd there is a very small chance that not all needed + drivers are included. + +Template: base-installer/kernel/failed-install +Type: error +# :sl2: +_Description: Unable to install the selected kernel + An error was returned while trying to install the kernel into the + target system. + . + Kernel package: '${KERNEL}'. + . + Check /var/log/syslog or see virtual console 4 for the details. + +Template: base-installer/kernel/image +Type: select +# :sl2: +#flag:translate!:1 +# For base-installer, "none" is an additional choice to a list of kernels. +# It means "no kernel" +__Choices: ${KERNELS}, none[ Do not translate what's inside the brackets and just put the translation for the word "none" in your language without any brackets. This "none" means "no kernel" ] +# :sl2: +_Description: Kernel to install: + The list shows the available kernels. Please choose one of them in order + to make the system bootable from the hard drive. + +Template: base-installer/kernel/altmeta +Type: text +Description: for internal use; can be preseeded + Optional postfix for kernel meta packages; can be used for example to + support installation of an updated kernel for stable. + Don't include the leading hyphen: it will be prepended in the code. + +Template: base-installer/kernel/skip-install +Type: boolean +Default: false +# :sl2: +_Description: Continue without installing a kernel? + No installable kernel was found in the defined APT sources. + . + You may try to continue without a kernel, and manually install your own + kernel later. This is only recommended for experts, otherwise you will + likely end up with a machine that doesn't boot. + +Template: base-installer/kernel/no-kernels-found +Type: error +# :sl2: +_Description: Cannot install kernel + The installer cannot find a suitable kernel package to install. + +Template: base-installer/kernel/failed-package-install +Type: error +# :sl2: +_Description: Unable to install ${PACKAGE} + An error was returned while trying to install the ${PACKAGE} package + onto the target system. + . + Check /var/log/syslog or see virtual console 4 for the details. + +Template: base-installer/section/pick_kernel +Type: text +# :sl1: +_Description: Selecting the kernel to install... + +Template: base-installer/section/install_linux +Type: text +# :sl1: +_Description: Installing the kernel... + +Template: base-installer/section/install_kernel_package +Type: text +# :sl1: +# SUBST0 is a package name +_Description: Installing the kernel - retrieving and installing ${SUBST0}... + +Template: base-installer/kernel/headers +Type: boolean +Default: true +Description: for internal use; can be preseeded + Install kernel headers along with the kernel. + +Template: base-installer/kernel/backports-modules +Type: string +Description: for internal use; can be preseeded + Install kernel backports modules along with the kernel. For example, + setting this to "nouveau wireless" will install + linux-backports-modules-nouveau-$DISTRIBUTION-$FLAVOUR and + linux-backports-modules-wireless-$DISTRIBUTION-$FLAVOUR. diff -pruN 1.158/debian/bootstrap-base.postinst 1.158ubuntu7/debian/bootstrap-base.postinst --- 1.158/debian/bootstrap-base.postinst 2014-04-15 06:58:14.000000000 +0000 +++ 1.158ubuntu7/debian/bootstrap-base.postinst 2014-02-27 13:58:22.000000000 +0000 @@ -7,7 +7,7 @@ db_capb backup . /usr/lib/base-installer/library.sh ETCDIR=/target/etc -KEYRING=/usr/share/keyrings/archive.gpg +KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg # Architecture and OS detection ARCH=`udpkg --print-architecture` @@ -162,11 +162,12 @@ install_base_system () { waypoint 1 check_target waypoint 1 get_mirror_info -waypoint 100 install_base_system waypoint 1 pre_install_hooks +waypoint 100 install_base_system waypoint 1 setup_dev waypoint 1 configure_apt_preferences waypoint 1 configure_apt +waypoint 1 configure_apt_overlay waypoint 3 apt_update waypoint 5 post_install_hooks waypoint 1 pick_kernel diff -pruN 1.158/debian/bootstrap-base.templates 1.158ubuntu7/debian/bootstrap-base.templates --- 1.158/debian/bootstrap-base.templates 2011-01-19 04:28:19.000000000 +0000 +++ 1.158ubuntu7/debian/bootstrap-base.templates 2012-09-11 09:19:41.000000000 +0000 @@ -55,95 +55,6 @@ _Description: Debootstrap Error . Check /var/log/syslog or see virtual console 4 for the details. -Template: base-installer/initramfs/generator -Type: select -# :sl3: -Choices: ${GENERATORS} -_Description: Tool to use to generate boot initrd: - The list shows the available tools. If you are unsure which to select, - you should select the default. If your system fails to boot, you can - retry the installation using the other options. - -Template: base-installer/initramfs/unsupported -Type: error -# :sl3: -_Description: Unsupported initrd generator - The package ${GENERATOR} that was selected to generate the - initrd is not supported. - -Template: base-installer/initramfs-tools/driver-policy -Type: select -Choices-C: most, dep -# :sl3: -__Choices: generic: include all available drivers, targeted: only include drivers needed for this system -# :sl3: -_Description: Drivers to include in the initrd: - The primary function of an initrd is to allow the kernel to mount the - root file system. It therefore needs to contain all drivers and supporting - programs required to do that. - . - A generic initrd is much larger than a targeted one and may even be so - large that some boot loaders are unable to load it but has the advantage that - it can be used to boot the target system on almost any hardware. With the - smaller targeted initrd there is a very small chance that not all needed - drivers are included. - -Template: base-installer/kernel/failed-install -Type: error -# :sl2: -_Description: Unable to install the selected kernel - An error was returned while trying to install the kernel into the - target system. - . - Kernel package: '${KERNEL}'. - . - Check /var/log/syslog or see virtual console 4 for the details. - -Template: base-installer/kernel/image -Type: select -# :sl2: -#flag:translate!:1 -# For base-installer, "none" is an additional choice to a list of kernels. -# It means "no kernel" -__Choices: ${KERNELS}, none[ Do not translate what's inside the brackets and just put the translation for the word "none" in your language without any brackets. This "none" means "no kernel" ] -# :sl2: -_Description: Kernel to install: - The list shows the available kernels. Please choose one of them in order - to make the system bootable from the hard drive. - -Template: base-installer/kernel/altmeta -Type: text -Description: for internal use; can be preseeded - Optional postfix for kernel meta packages; can be used for example to - support installation of an updated kernel for stable. - Don't include the leading hyphen: it will be prepended in the code. - -Template: base-installer/kernel/skip-install -Type: boolean -Default: false -# :sl2: -_Description: Continue without installing a kernel? - No installable kernel was found in the defined APT sources. - . - You may try to continue without a kernel, and manually install your own - kernel later. This is only recommended for experts, otherwise you will - likely end up with a machine that doesn't boot. - -Template: base-installer/kernel/no-kernels-found -Type: error -# :sl2: -_Description: Cannot install kernel - The installer cannot find a suitable kernel package to install. - -Template: base-installer/kernel/failed-package-install -Type: error -# :sl2: -_Description: Unable to install ${PACKAGE} - An error was returned while trying to install the ${PACKAGE} package - onto the target system. - . - Check /var/log/syslog or see virtual console 4 for the details. - Template: base-installer/debootstrap/error/nogetrel Type: error # :sl2: @@ -421,22 +332,6 @@ Type: text # :sl1: _Description: Configuring APT sources... -Template: base-installer/section/pick_kernel -Type: text -# :sl1: -_Description: Selecting the kernel to install... - -Template: base-installer/section/install_linux -Type: text -# :sl1: -_Description: Installing the kernel... - -Template: base-installer/section/install_kernel_package -Type: text -# :sl1: -# SUBST0 is a package name -_Description: Installing the kernel - retrieving and installing ${SUBST0}... - Template: base-installer/includes Type: string Description: for internal use; can be preseeded diff -pruN 1.158/debian/changelog 1.158ubuntu7/debian/changelog --- 1.158/debian/changelog 2015-11-27 06:13:36.000000000 +0000 +++ 1.158ubuntu7/debian/changelog 2020-04-15 12:26:55.000000000 +0000 @@ -1,3 +1,74 @@ +base-installer (1.158ubuntu7) focal; urgency=medium + + * Fix testsuite. + + -- Dimitri John Ledkov Wed, 15 Apr 2020 13:26:55 +0100 + +base-installer (1.158ubuntu6) focal; urgency=medium + + * Update kernel flavours to the ones currently offered. Filter out + non-existent flavours. Filter out transitional 18.04 flavours. Filter + out single ABI kernels. LP: #1871523 + + -- Dimitri John Ledkov Tue, 14 Apr 2020 23:47:21 +0100 + +base-installer (1.158ubuntu5) eoan; urgency=medium + + * Use link_in_boot true on all Ubuntu arches. + + -- Dimitri John Ledkov Tue, 23 Apr 2019 12:29:54 +0100 + +base-installer (1.158ubuntu4) yakkety; urgency=medium + + * Use the generic kernel for the powerpc64 flavor (LP: #1625368) + + -- Adam Conrad Mon, 19 Sep 2016 15:44:51 -0600 + +base-installer (1.158ubuntu3) yakkety; urgency=medium + + * Tolerate omission of leading "deb " in apt-setup/local0/repository + (based on patch by Lars Kollstedt; LP: #1512347). + + -- Colin Watson Wed, 04 May 2016 00:43:55 +0100 + +base-installer (1.158ubuntu2) xenial; urgency=high + + * Fix s390x kernels. + + -- Dimitri John Ledkov Mon, 25 Jan 2016 17:33:27 +0000 + +base-installer (1.158ubuntu1) xenial; urgency=medium + + * 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 armhf/keystone, armhf/omap, and armhf/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. + - Move some kernel installation support code from bootstrap-base to + base-installer, and allow live-installer to override the title + template used by that. + - Add powerpc/e500 and powerpc/e500mc subarchitectures. + - Add overlay archive support. + * Fix up architecture tests to still pass with less delta from Debian. + + -- Mathieu Trudel-Lapierre Tue, 08 Dec 2015 10:25:44 -0500 + base-installer (1.158) unstable; urgency=medium [ Cyril Brulebois ] @@ -108,6 +179,49 @@ base-installer (1.145) unstable; urgency -- Cyril Brulebois Fri, 14 Mar 2014 14:12:18 +0100 +base-installer (1.144ubuntu2) wily; urgency=medium + + * library.sh: Properly handle the case where there is no + overlay_early_apt_pkg_install. + + -- Mathieu Trudel-Lapierre Fri, 03 Jul 2015 22:15:26 -0400 + +base-installer (1.144ubuntu1) trusty; urgency=medium + + [ Colin Watson ] + * 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 armhf/keystone, armhf/omap, and armhf/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. + - Move some kernel installation support code from bootstrap-base to + base-installer, and allow live-installer to override the title + template used by that. + - Add powerpc/e500 and powerpc/e500mc subarchitectures. + - Add overlay archive support. + - Add arm64 and ppc64el architectures. + + [ dann frazier ] + * Add arm64 kernel selection tests (LP: #1284712). + + -- Colin Watson Thu, 27 Feb 2014 14:01:50 +0000 + base-installer (1.144) unstable; urgency=medium [ Colin Watson ] @@ -126,6 +240,52 @@ base-installer (1.144) unstable; urgency -- Colin Watson Thu, 27 Feb 2014 10:15:15 +0000 +base-installer (1.143ubuntu2) trusty; urgency=medium + + * Cherry-pick POWER7+ and POWER8 support from Debian for powerpc64. + + -- Adam Conrad Tue, 25 Feb 2014 17:53:44 -0700 + +base-installer (1.143ubuntu1) trusty; urgency=medium + + [ Colin Watson ] + * Reverse lots of our delta against Debian relating to architectures no + longer supported in Ubuntu (armel, hppa, ia64, sparc), to make merging + from Debian less painful. + * 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 armhf/keystone, armhf/omap, and armhf/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. + - Move some kernel installation support code from bootstrap-base to + base-installer, and allow live-installer to override the title + template used by that. + - Add powerpc/e500 and powerpc/e500mc subarchitectures. + - Add overlay archive support. + - Add ppc64el architecture. + * Remove code for some old Ubuntu i386 kernel names that no longer exist. + + [ dann frazier ] + * Add arm64 kernel detection (LP: #1263756). + + -- Colin Watson Fri, 14 Feb 2014 14:55:53 +0000 + base-installer (1.143) unstable; urgency=medium * Add HTTPS support: pass --no-check-certificate to debootstrap if @@ -317,6 +477,162 @@ base-installer (1.123) unstable; urgency -- Otavio Salvador Tue, 03 Apr 2012 19:36:14 -0300 +base-installer (1.122ubuntu21) trusty; urgency=medium + + * Cherry-pick from trunk: + - pkgdetails.c: Only interpret percentages following whitespace, to cope + with GNU wget outputting the local file name (which may contain "%" + due to URL-encoding) after it finishes the download (LP: #1172101). + + -- Colin Watson Fri, 07 Feb 2014 16:38:27 +0000 + +base-installer (1.122ubuntu20) trusty; urgency=medium + + * Add ppc64el support. + + -- Colin Watson Fri, 31 Jan 2014 10:06:42 +0000 + +base-installer (1.122ubuntu19) trusty; urgency=low + + * Merge in overlay archive support (LP: #1250930) + * Merge in Dann Frazier's local0 overloading patch (LP: #1250930) + * Add keystone to allowed kernels list for armhf + + -- Michael Casadevall Thu, 02 Jan 2014 06:07:21 -0500 + +base-installer (1.122ubuntu17) saucy; urgency=low + + * Add generic-lpae the the allowed list of subarches in armhf/armel. + + -- Adam Conrad Tue, 10 Sep 2013 15:15:59 -0400 + +base-installer (1.122ubuntu16) saucy; urgency=low + + * Install the signed kernels on any 64bit UEFI machine. (LP: #1184297) + + -- Stéphane Graber Fri, 19 Jul 2013 11:30:15 -0400 + +base-installer (1.122ubuntu15) raring; urgency=low + + * Replace "highbank" flavor with "generic" (LP: #1166597) + + -- dann frazier Tue, 09 Apr 2013 00:01:08 -0600 + +base-installer (1.122ubuntu14) raring; urgency=low + + [ Ben Collins ] + * Add powerpc e500 and e500mc kernel detection. + + -- Colin Watson Fri, 16 Nov 2012 16:02:12 +0000 + +base-installer (1.122ubuntu13) quantal; urgency=low + + * Consider signed images in kernel_update_list and install_kernel_linux + (LP: #1067250). + + -- Colin Watson Tue, 16 Oct 2012 10:38:12 +0100 + +base-installer (1.122ubuntu12) quantal; urgency=low + + * On amd64/efi, install a signed kernel if the SecureBoot variable is set. + + -- Colin Watson Tue, 09 Oct 2012 13:52:30 +0100 + +base-installer (1.122ubuntu11) quantal; urgency=low + + * Move debconf templates relating to kernel installation from + bootstrap-base to base-installer (LP: #1049011). + * Allow live-installer to override the title template used by kernel + installation code. + + -- Colin Watson Tue, 11 Sep 2012 10:30:40 +0100 + +base-installer (1.122ubuntu10) quantal; urgency=low + + * Move /usr/lib/base-installer/kernel.sh from bootstrap-base to + base-installer (LP: #1028453). + + -- Colin Watson Sun, 09 Sep 2012 13:13:49 +0100 + +base-installer (1.122ubuntu9) quantal; urgency=low + + * Cherry-pick from upstream (Ben Hutchings): + - base-installer/kernel/tests: Fix regex syntax error in runtests. + + -- Colin Watson Fri, 07 Sep 2012 12:15:22 +0100 + +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 ] @@ -350,6 +666,33 @@ base-installer (1.122) unstable; urgency -- 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 ] @@ -383,6 +726,53 @@ base-installer (1.120) unstable; urgency -- 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 ] @@ -438,6 +828,39 @@ base-installer (1.117) unstable; urgency -- 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 ] @@ -449,6 +872,33 @@ base-installer (1.116) unstable; urgency -- 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 ] @@ -466,6 +916,44 @@ base-installer (1.115) unstable; urgency -- 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 ] @@ -487,6 +975,31 @@ base-installer (1.114) unstable; urgency -- 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 @@ -572,6 +1085,51 @@ base-installer (1.108) unstable; urgency -- Christian Perrier Sat, 10 Jul 2010 20:23:41 +0200 +base-installer (1.107ubuntu3) maverick; urgency=low + + * Backport from trunk: + - Move base-installer/install-recommends from bootstrap-base.templates + to base-installer.templates. + + -- Cody A.W. Somerville Wed, 29 Sep 2010 11:20:54 +0100 + +base-installer (1.107ubuntu2) maverick; urgency=low + + * Backport from trunk: + - Set Dir::Media::MountPath to /media/cdrom as well as + Acquire::cdrom::mount, as otherwise apt doesn't consistently read from + the right one. + + -- Colin Watson Wed, 22 Sep 2010 13:28:28 +0100 + +base-installer (1.107ubuntu1) maverick; 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. + - Prefer PAE kernels on machines with >3GB of RAM. + - 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. + * Drop patch to ignore Recommends while installing the kernel, superseded + by a more general change upstream. + + -- Colin Watson Wed, 19 May 2010 12:06:04 +0100 + base-installer (1.107) unstable; urgency=low [ Frans Pop ] @@ -649,6 +1207,74 @@ base-installer (1.104) unstable; urgency -- Frans Pop Wed, 23 Dec 2009 00:20:24 +0100 +base-installer (1.103ubuntu7) lucid; urgency=low + + * Add armel/omap subarchitecture. + + -- Colin Watson Tue, 13 Apr 2010 14:28:26 +0100 + +base-installer (1.103ubuntu6) lucid; urgency=low + + * Handle armel metapackages in ordering hack (imx51, dove, and omap). + + -- Colin Watson Tue, 30 Mar 2010 10:21:10 +0100 + +base-installer (1.103ubuntu5) lucid; urgency=low + + * Add support for preempt kernel flavour on amd64 (LP: #541625). + + -- Colin Watson Fri, 19 Mar 2010 10:06:10 +0000 + +base-installer (1.103ubuntu4) lucid; urgency=low + + * Add base-installer/kernel/backports-modules template, which may be + preseeded to install selected linux-backports-modules-* packages + (LP: #526422). + + -- Colin Watson Tue, 23 Feb 2010 17:45:53 +0000 + +base-installer (1.103ubuntu3) lucid; urgency=low + + * Backport from trunk: + - Ensure that Acquire::cdrom::AutoDetect is disabled when running + apt-cdrom. We bind-mount /target/cdrom, so apt's new libudev-based + autodetection isn't needed during installation. + + -- Colin Watson Thu, 04 Feb 2010 12:51:40 -0800 + +base-installer (1.103ubuntu2) lucid; urgency=low + + * Explicitly ignore Recommends while installing the kernel. We don't want + to install bootloaders at this point. + + -- Colin Watson Fri, 04 Dec 2009 15:04:25 +0000 + +base-installer (1.103ubuntu1) lucid; 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 and armel/dove subarchitectures. + - Prefer PAE kernels on machines with >3GB of RAM. + - Install kernel headers to match the kernel. This may be overridden by + setting base-installer/kernel/headers to false. + * Remove all traces of lpia, which is being decommissioned (see + https://blueprints.launchpad.net/ubuntu/+spec/mobile-lucid-lpia-future). + + -- Colin Watson Thu, 03 Dec 2009 12:21:27 +0000 + base-installer (1.103) unstable; urgency=low [ Aurelien Jarno ] @@ -696,6 +1322,36 @@ base-installer (1.103) unstable; urgency -- Frans Pop Mon, 16 Nov 2009 14:05:24 +0100 +base-installer (1.102ubuntu2) karmic; urgency=low + + * Install kernel headers to match the kernel (LP: #413135). This may be + overridden by setting base-installer/kernel/headers to false. + + -- Colin Watson Tue, 13 Oct 2009 20:47:08 +0100 + +base-installer (1.102ubuntu1) karmic; urgency=low + + * Resynchronise with Debian (STANZAS addition fixes LP: #435376). + 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 and armel/dove subarchitectures. + - Prefer PAE kernels on machines with >3GB of RAM. + + -- Colin Watson Wed, 23 Sep 2009 16:47:35 +0100 + base-installer (1.102) unstable; urgency=low [ Frans Pop ] @@ -716,6 +1372,51 @@ base-installer (1.102) unstable; urgency -- Frans Pop Tue, 04 Aug 2009 20:13:45 +0200 +base-installer (1.101ubuntu5) karmic; urgency=low + + * Use DMI information if possible to determine memory size (LP: #413135). + + -- Colin Watson Wed, 23 Sep 2009 16:24:16 +0100 + +base-installer (1.101ubuntu4) karmic; urgency=low + + * Prefer PAE kernels on machines with >3GB of RAM (LP: #413135). + + -- Colin Watson Mon, 24 Aug 2009 13:26:20 +0100 + +base-installer (1.101ubuntu3) karmic; urgency=low + + * Added support for the Marvell dove SoC (LP: #409238) + + -- Michael Casadevall Mon, 24 Aug 2009 12:30:29 +0100 + +base-installer (1.101ubuntu2) karmic; urgency=low + + * Adjust for new PAE kernel package naming on i386. + + -- Colin Watson Thu, 25 Jun 2009 16:25:00 +0100 + +base-installer (1.101ubuntu1) karmic; 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 subarchitecture. + + -- Colin Watson Mon, 15 Jun 2009 17:25:16 +0100 + base-installer (1.101) unstable; urgency=low * Fix reversed script and mirror arguments to run-debootstrap (thanks, @@ -742,6 +1443,36 @@ base-installer (1.100) unstable; urgency -- Colin Watson Tue, 02 Jun 2009 13:56:52 +0100 +base-installer (1.99ubuntu2) karmic; urgency=low + + * Use block-attr from di-utils 1.68. + + -- Colin Watson Tue, 12 May 2009 17:31:26 +0100 + +base-installer (1.99ubuntu1) karmic; 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. + - Write out the resume partition as a UUID if possible. + - 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 subarchitecture. + - Silently skip non-existent devices in /proc/swaps. + * Use -ia64 kernel across the board on ia64. + + -- Colin Watson Wed, 29 Apr 2009 16:51:19 +0100 + base-installer (1.99) unstable; urgency=low [ Ian Campbell ] @@ -786,6 +1517,77 @@ base-installer (1.99) unstable; urgency= -- Martin Michlmayr Fri, 27 Mar 2009 18:00:30 +0100 +base-installer (1.98ubuntu7) jaunty; urgency=low + + * Add linux-lpia to kernel_update_list metapackage ordering hack + (LP: #359174). + + -- Colin Watson Fri, 17 Apr 2009 12:22:12 +0100 + +base-installer (1.98ubuntu6) jaunty; urgency=low + + * Silently skip non-existent devices in /proc/swaps (LP: #290947). + + -- Colin Watson Thu, 09 Apr 2009 02:00:26 +0100 + +base-installer (1.98ubuntu5) jaunty; urgency=low + + [ Emmet Hikory ] + * Add lpia kernel selection and tests (LP: #291670) + + -- Colin Watson Tue, 31 Mar 2009 15:55:20 +0100 + +base-installer (1.98ubuntu4) jaunty; urgency=low + + [ Michael Casadevall ] + * Fixed armel arch_get_kernel() call for Ubuntu/armel + * Updated the test suite for Ubuntu/armel + * Added imx51 to armel as a new sub-architecture and added its + test suite (LP: #345534) + + -- Colin Watson Fri, 27 Mar 2009 11:41:54 +0000 + +base-installer (1.98ubuntu3) jaunty; urgency=low + + * 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 (LP: #340308). + + -- Colin Watson Tue, 10 Mar 2009 09:47:12 +0000 + +base-installer (1.98ubuntu2) jaunty; urgency=low + + * Check dmraid's exit code as well as parsing its output, the latter for + backward compatibility with dmraid << 1.0.0.rc15-1~exp4 only + (LP: #325947). + + -- Colin Watson Thu, 12 Feb 2009 12:36:32 +0000 + +base-installer (1.98ubuntu1) jaunty; 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. + - Write out the resume partition as a UUID if possible. + - Install busybox-initramfs rather than busybox. + - If base-installer/use_unclean_target is asked, emit a warning to the + logs so that we know about it when diagnosing problems. + - Never select /dev/ramzswap* as a hibernation target. + * Backport from trunk (Ian Campbell, Frans Pop): + - Use -686 kernels for CentaurHauls processors again (effectively + undoing r55059) . According to 464962 the kernel has been fixed since + 2.6.26-8. Closes: #504095 + + -- Colin Watson Thu, 29 Jan 2009 22:14:20 +0000 + base-installer (1.98) unstable; urgency=low [ Colin Watson ] @@ -1104,6 +1906,93 @@ base-installer (1.87) unstable; urgency= -- Frans Pop Wed, 06 Feb 2008 17:31:00 +0100 +base-installer (1.86ubuntu9) jaunty; urgency=low + + * Use the correct mirror for -security in the event of + apt-setup/security_host being preseeded (LP: #306356). + + -- Colin Watson Mon, 15 Dec 2008 12:05:18 +0000 + +base-installer (1.86ubuntu8) jaunty; urgency=low + + * 'dmraid -c -s' changed its output format; cope with both old and new. + + -- Colin Watson Fri, 21 Nov 2008 21:06:12 +0000 + +base-installer (1.86ubuntu7) intrepid; urgency=low + + * Add support for virtual kernel flavour on amd64 (LP: #283368). + + -- Colin Watson Fri, 17 Oct 2008 17:25:53 +0100 + +base-installer (1.86ubuntu6) intrepid; urgency=low + + * Add support for AMD family 17 on i386. + + -- Colin Watson Tue, 16 Sep 2008 00:50:13 +0100 + +base-installer (1.86ubuntu5) intrepid; urgency=low + + * Never select /dev/ramzswap* as a hibernation target. + + -- Colin Watson Wed, 10 Sep 2008 15:11:19 +0100 + +base-installer (1.86ubuntu4) intrepid; urgency=low + + * Merge from hardy-proposed: + - Fix exclusion of restricted in CD installations (LP: #220805). + + -- Colin Watson Wed, 20 Aug 2008 00:46:31 +0100 + +base-installer (1.86ubuntu3) intrepid; urgency=low + + * Use powerpc64-smp kernel on PS3/Cell (LP: #221647). + * Don't include restricted in the base sources.list if + apt-setup/restricted is preseeded to false (LP: #220805). + + -- Colin Watson Tue, 20 May 2008 22:37:07 +0200 + +base-installer (1.86ubuntu2.2) hardy-proposed; urgency=low + + * Fix exclusion of restricted in CD installations (LP: #220805). + + -- Colin Watson Mon, 16 Jun 2008 11:38:05 +0100 + +base-installer (1.86ubuntu2.1) hardy-proposed; urgency=low + + * Don't include restricted in the base sources.list if + apt-setup/restricted is preseeded to false (LP: #220805). + + -- Colin Watson Tue, 20 May 2008 22:40:15 +0200 + +base-installer (1.86ubuntu2) hardy; urgency=low + + [ Colin Watson ] + * If apt-setup/proposed is true, set up the default sources.list to look + in -proposed as well (LP: #181776). + * If base-installer/use_unclean_target is asked, emit a warning to the + logs so that we know about it when diagnosing problems. + + [ Soren Hansen ] + * Add support for AMD CPU family 16 on i386 (LP: #187869). + + -- Colin Watson Tue, 19 Feb 2008 10:25:10 +0000 + +base-installer (1.86ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use and depend on the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + - Install busybox-initramfs rather than busybox. + + -- Colin Watson Mon, 10 Dec 2007 17:46:16 +0000 + base-installer (1.86) unstable; urgency=low [ Martin Michlmayr ] @@ -1114,6 +2003,34 @@ base-installer (1.86) unstable; urgency= -- Martin Michlmayr Thu, 29 Nov 2007 09:15:41 +0100 +base-installer (1.85ubuntu3) hardy; urgency=low + + * Fix construction of sources.list when installing from the network (">" + used in place of ">>"). Thanks to Timo Aaltonen for the report. + + -- Colin Watson Fri, 30 Nov 2007 10:06:16 +0000 + +base-installer (1.85ubuntu2) hardy; urgency=low + + * Install busybox-initramfs rather than busybox. + + -- Colin Watson Thu, 29 Nov 2007 14:34:33 +0000 + +base-installer (1.85ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use and depend on the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + * Set the Vcs-Bzr field to the Ubuntu branch. + + -- Evan Dandrea Tue, 27 Nov 2007 15:50:44 -0500 + base-installer (1.85) unstable; urgency=low * Bind mount /dev to /target/dev instead of creating device nodes for @@ -1205,6 +2122,41 @@ base-installer (1.82) unstable; urgency= -- Otavio Salvador Fri, 29 Jun 2007 15:10:49 -0300 +base-installer (1.81ubuntu4) gutsy; urgency=low + + * Add support for virtual, rt, and xen kernel flavours (LP: #144111). + + -- Colin Watson Mon, 01 Oct 2007 13:45:37 +0100 + +base-installer (1.81ubuntu3) gutsy; urgency=low + + * Support powerpc/cell subarchitecture. + * Use cell kernel flavour on powerpc/ps3 and powerpc/cell. + + -- Colin Watson Sun, 23 Sep 2007 21:48:42 +0100 + +base-installer (1.81ubuntu2) gutsy; urgency=low + + * Treat pre-Nehemiah Via C3s as 586, so they use the -generic kernel + (LP: #137340). + + -- Colin Watson Wed, 05 Sep 2007 13:40:06 +0100 + +base-installer (1.81ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use and depend on the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + - Install smp kernel by default on sun4v (Niagara based sparc). + + -- Colin Watson Wed, 01 Aug 2007 19:06:43 +0100 + base-installer (1.81) unstable; urgency=low [ Otavio Salvador ] @@ -1213,6 +2165,30 @@ base-installer (1.81) unstable; urgency= -- Joey Hess Mon, 18 Jun 2007 22:16:24 +0100 +base-installer (1.80ubuntu2) gutsy; urgency=low + + * Install smp kernel by default on sun4v (Niagara based sparc). + With the new LDOM support on the way, adding/removing CPU's + from control/service/guest nodes is easy as drinking a glass + of water. With this change we will guarantee that the user + will always get the best setup. + + -- Fabio M. Di Nitto Tue, 03 Jul 2007 09:58:53 +0200 + +base-installer (1.80ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use and depend on the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + + -- Evan Dandrea Fri, 15 Jun 2007 15:52:38 -0400 + base-installer (1.80) unstable; urgency=low [ Frans Pop ] @@ -1229,6 +2205,22 @@ base-installer (1.80) unstable; urgency= -- Frans Pop Mon, 21 May 2007 16:33:20 +0200 +base-installer (1.79ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + * Remove some old cruft from Ubuntu kernel selection code. + * i386 -server* kernels require 686 processors. + + -- Colin Watson Thu, 26 Apr 2007 14:31:55 +0100 + base-installer (1.79) unstable; urgency=low [ Frans Pop ] @@ -1357,6 +2349,62 @@ base-installer (1.71) unstable; urgency= -- Frans Pop Sat, 6 Jan 2007 20:15:26 +0100 +base-installer (1.70ubuntu7) feisty; urgency=low + + * Use powerpc64 kernels on PS3 systems; the separate ps3 kernels have gone + away. + * Add PS3 tests. + + -- Colin Watson Wed, 11 Apr 2007 15:07:05 +0100 + +base-installer (1.70ubuntu6) feisty; urgency=low + + * Add linux-generic and linux-ps3 to crazy kernel_update_list metapackage + ordering hack. + + -- Colin Watson Wed, 21 Mar 2007 16:45:16 +0000 + +base-installer (1.70ubuntu5) feisty; urgency=low + + * Install linux-ps3 on PS3 systems. + + -- Colin Watson Tue, 27 Feb 2007 19:23:48 +0000 + +base-installer (1.70ubuntu4) feisty; urgency=low + + * Fix VIA CPU family detection (LP: #86270). + + -- Colin Watson Mon, 19 Feb 2007 14:05:02 +0000 + +base-installer (1.70ubuntu3) feisty; urgency=low + + * Set Maintainer to ubuntu-installer@lists.ubuntu.com. + + -- Colin Watson Fri, 16 Feb 2007 09:28:35 +0000 + +base-installer (1.70ubuntu2) feisty; urgency=low + + * Backport from trunk: + - Fix processor detection on SMP i386 and amd64 systems if booting with + an SMP-capable kernel (LP: #79109; test case taken from that bug). + + -- Colin Watson Wed, 17 Jan 2007 17:02:42 +0000 + +base-installer (1.70ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + - Strip comments from debian/templates-arch in output templates file. + + -- Colin Watson Tue, 12 Dec 2006 11:28:05 +0000 + base-installer (1.70) unstable; urgency=low * Add support for selecting prep kernels (powerpc). Closes: #386265. @@ -1401,6 +2449,21 @@ base-installer (1.69) unstable; urgency= -- Frans Pop Wed, 22 Nov 2006 15:04:49 +0100 +base-installer (1.68ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use the Ubuntu keyring. + - Enable the restricted component by default. + - 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. + - Use Ubuntu kernel image names. + - Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used. + - Write out the resume partition as a UUID if possible. + - Strip comments from debian/templates-arch in output templates file. + + -- Colin Watson Wed, 8 Nov 2006 14:27:23 -0800 + base-installer (1.68) unstable; urgency=low [ Frans Pop ] @@ -1539,6 +2602,55 @@ base-installer (1.64) unstable; urgency= -- Frans Pop Sun, 30 Jul 2006 02:38:59 +0200 +base-installer (1.63ubuntu6) edgy; urgency=low + + * Backport from trunk: + - AMD CPU family 15 systems (i.e. K8) should be allowed to install K7 + kernels. + * Backport from trunk (Sven Luther): + - [powerpc] Added support for IBM Power5+ cpus. + + -- Colin Watson Thu, 12 Oct 2006 02:55:27 +0100 + +base-installer (1.63ubuntu5) edgy; urgency=low + + * Stop installing usplash along with initramfs-tools. We now rely on the + desktop installation step to do this. + + -- Colin Watson Fri, 6 Oct 2006 13:07:11 +0100 + +base-installer (1.63ubuntu4) edgy; urgency=low + + * Track changes in kernel targets in linux-source-2.6.17 2.6.17-7.19: + - amd64: amd64-generic -> generic, amd64-server -> server, amd64-k8 and + amd64-xeon removed; + - i386: (686, k7) -> generic; + - hppa, ia64: -smp targets removed (all kernels for these architectures + are SMP-capable now). + + -- Colin Watson Fri, 8 Sep 2006 01:49:54 +0100 + +base-installer (1.63ubuntu3) edgy; urgency=low + + * Backport from trunk: + - Fix quoting so that LVM (but not crypto) installs don't break due to + the lack of dmsetup-udeb. + * Write out the resume partition as a UUID if possible. + + -- Colin Watson Tue, 25 Jul 2006 12:01:17 +0100 + +base-installer (1.63ubuntu2) edgy; urgency=low + + * Fix handling of new initramfs-tools configuration directory. + + -- Colin Watson Thu, 13 Jul 2006 09:50:45 +0100 + +base-installer (1.63ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Wed, 12 Jul 2006 20:47:10 +0100 + base-installer (1.63) unstable; urgency=low * Set meta package as default kernel for S/390. @@ -1562,6 +2674,12 @@ base-installer (1.62) unstable; urgency= -- Martin Michlmayr Mon, 03 Jul 2006 17:40:31 +0200 +base-installer (1.61ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Mon, 3 Jul 2006 11:20:06 +0100 + base-installer (1.61) unstable; urgency=low [ David Härdeman ] @@ -1896,6 +3014,89 @@ base-installer (1.43) unstable; urgency= -- Steve Langasek Sat, 21 Jan 2006 21:55:53 -0800 +base-installer (1.42ubuntu11) dapper; urgency=low + + * Backport from trunk (needed for netboot installs on clock-skewed + machines): + - Move 00IgnoreTimeConflict creation so it happens for any type of apt + source. Other settings of --ignore-time-conflict should be removed + from the rest of d-i eventually. + + -- Colin Watson Tue, 25 Apr 2006 17:34:59 +0100 + +base-installer (1.42ubuntu10) dapper; urgency=low + + * Run kernel_update_list before checking kernel overrides. + + -- Colin Watson Thu, 20 Apr 2006 08:52:22 +0100 + +base-installer (1.42ubuntu9) dapper; urgency=low + + * Update the kernel_update_list regex to match linux-server and + linux-server-bigiron. + + -- Colin Watson Wed, 19 Apr 2006 18:54:45 +0100 + +base-installer (1.42ubuntu8) dapper; urgency=low + + * Strip comments from debian/templates-arch in output templates file. + + -- Colin Watson Thu, 13 Apr 2006 23:12:14 +0100 + +base-installer (1.42ubuntu7) dapper; urgency=low + + * Allow preseeding base-installer/kernel/override-image to force a given + kernel to be used (closes: Malone #31474). + + -- Colin Watson Wed, 12 Apr 2006 23:32:39 +0100 + +base-installer (1.42ubuntu6) dapper; urgency=low + + * Backport from trunk: + - Add PPC970MP (actually PPC970*) and POWER5 to the list of powerpc64 + systems (closes: #339283, http://launchpad.net/bugs/35116). + - Don't consider powerpc64 kernels usable on powerpc. + * Fix trailing backslashes in a couple of tests. + + -- Colin Watson Thu, 16 Mar 2006 10:01:17 +0000 + +base-installer (1.42ubuntu5) dapper; urgency=low + + * Write resume partition to /target/etc/mkinitramfs/conf.d/resume, rather + than editing a conffile. Requires initramfs-tools 0.40ubuntu23. + + -- Colin Watson Fri, 17 Feb 2006 10:25:27 +0000 + +base-installer (1.42ubuntu4) dapper; urgency=low + + * Add support for -amd64-server kernels on amd64 and -server and + -server-bigiron kernels on i386. + + -- Colin Watson Wed, 15 Feb 2006 09:37:11 +0000 + +base-installer (1.42ubuntu3) dapper; urgency=low + + * Backport from trunk (closes: Malone #30048): + - Make apt-cdrom ignore time conflicts while verifying Release + signatures (for those creating signed CDs). + + -- Colin Watson Tue, 14 Feb 2006 13:58:48 +0000 + +base-installer (1.42ubuntu2) dapper; urgency=low + + * 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. + * Look for linux-image-* as well as linux-* to make installs without + restricted work better. + + -- Colin Watson Thu, 9 Feb 2006 10:54:34 +0000 + +base-installer (1.42ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Tue, 17 Jan 2006 20:37:23 +0000 + base-installer (1.42) unstable; urgency=low [ Frans Pop ] @@ -1931,6 +3132,14 @@ base-installer (1.42) unstable; urgency= -- Frans Pop Sat, 7 Jan 2006 23:13:53 +0100 +base-installer (1.41ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * Set base-installer/kernel/linux/initramfs-generators default to + initramfs-tools for all architectures. + + -- Colin Watson Mon, 2 Jan 2006 00:44:18 +0000 + base-installer (1.41) unstable; urgency=low [ Frans Pop ] @@ -2021,6 +3230,22 @@ base-installer (1.40) unstable; urgency= -- Joey Hess Mon, 19 Dec 2005 22:40:25 -0500 +base-installer (1.39ubuntu2) dapper; urgency=low + + * Restore usplash as base-installer/kernel/linux/extra-packages-2.6 + default. + + -- Colin Watson Mon, 12 Dec 2005 19:59:57 +0000 + +base-installer (1.39ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * Drop Provides: target-base-system, since nothing depends on that any + more. + * Update some kernel versions in test suite. + + -- Colin Watson Wed, 30 Nov 2005 18:58:51 +0000 + base-installer (1.39) unstable; urgency=low * Use log-output for installing extra packages. @@ -2393,6 +3618,54 @@ base-installer (1.21) unstable; urgency= -- Joey Hess Tue, 5 Jul 2005 21:36:26 +0300 +base-installer (1.20ubuntu7) breezy; urgency=low + + * Drop back to initrd-tools on hppa and ia64, where initramfs-tools + doesn't quite work yet. + + -- Colin Watson Tue, 4 Oct 2005 00:13:36 +0100 + +base-installer (1.20ubuntu6) breezy; urgency=low + + * Update fuzzy and missing translations from Rosetta (with some strings + from Debian where available): Greek, Spanish, Finnish, French, + Hungarian, Dutch, Brazilian Portuguese, Swedish. + + -- Colin Watson Fri, 30 Sep 2005 21:13:40 +0100 + +base-installer (1.20ubuntu5) breezy; urgency=low + + * Control usplash installation by a template + (base-installer/kernel/linux/extra-packages-2.6) so that it can be + disabled for server installations. + + -- Colin Watson Mon, 12 Sep 2005 15:49:00 +0100 + +base-installer (1.20ubuntu4) breezy; urgency=low + + * Don't fall over if usplash doesn't exist (e.g. on powerpc). + + -- Colin Watson Wed, 7 Sep 2005 11:02:07 +0100 + +base-installer (1.20ubuntu3) breezy; urgency=low + + * Install usplash along with initramfs-tools. + + -- Colin Watson Mon, 5 Sep 2005 14:45:35 +0100 + +base-installer (1.20ubuntu2) breezy; urgency=low + + * Support configuring initramfs-tools rather than initrd-tools, and make + that the default. + + -- Colin Watson Wed, 10 Aug 2005 20:56:19 +0100 + +base-installer (1.20ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Mon, 27 Jun 2005 12:33:47 +0100 + base-installer (1.20) unstable; urgency=low * dann frazier @@ -2448,6 +3721,19 @@ base-installer (1.20) unstable; urgency= -- Joey Hess Mon, 27 Jun 2005 02:35:36 -0400 +base-installer (1.19ubuntu2) breezy; urgency=low + + * Install powerpc64-smp kernels instead of power3/power4. + + -- Colin Watson Thu, 23 Jun 2005 13:04:43 +0100 + +base-installer (1.19ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + * Fix kernel selection on single-processor sparc systems. + + -- Colin Watson Tue, 7 Jun 2005 14:26:42 +0100 + base-installer (1.19) unstable; urgency=low * Colin Watson @@ -2599,6 +3885,132 @@ base-installer (1.16) experimental; urge -- Colin Watson Sun, 30 Jan 2005 13:44:27 +0000 +base-installer (1.15ubuntu17) hoary; urgency=low + + * Update Danish translation (thanks, Frederik Dannemare). + + -- Colin Watson Wed, 6 Apr 2005 00:43:49 +0100 + +base-installer (1.15ubuntu16) hoary; urgency=low + + * Make apt-get use gpgv --ignore-time-conflict to avoid validation errors + due to clock problems (Ubuntu #8496). + + -- Colin Watson Tue, 5 Apr 2005 18:49:42 +0100 + +base-installer (1.15ubuntu15) hoary; urgency=low + + * Update Greek translation (thanks, Giorgos Logiotatidis). + * Update Norwegian Bokmål translation (thanks, Terance Edward Sola). + + -- Colin Watson Tue, 5 Apr 2005 17:22:53 +0100 + +base-installer (1.15ubuntu14) hoary; urgency=low + + * Add a post-base-installation hook: scripts in + /usr/lib/post-base-installer.d/ will be run after the base system + installation is complete. + * Update Romanian translation (thanks, Ovidiu Damian). + * Update Spanish translation (thanks, Enrique Matías Sánchez). + * Update Xhosa translation (thanks, Adi Attar). + + -- Colin Watson Thu, 31 Mar 2005 15:46:10 +0100 + +base-installer (1.15ubuntu13) hoary; urgency=low + + * Update Brazilian Portuguese translation (thanks, Carlos Eduardo Pedroza + Santiviago). + * Update Hungarian translation (thanks, Gabor Burjan). + * Update Indonesian translation (thanks, Yoppy Hidayanto). + * Update Polish translation (thanks, Dominik Zabłotny). + + -- Colin Watson Mon, 28 Mar 2005 20:19:03 +0100 + +base-installer (1.15ubuntu12) hoary; urgency=low + + * Update Brazilian Portuguese translation (thanks, Carlos Eduardo Pedroza + Santiviago). + * Update French translation (thanks, Sebastien Bacher). + * Update German translation (thanks, Herbert Straub). + + -- Colin Watson Sat, 26 Mar 2005 01:04:14 +0000 + +base-installer (1.15ubuntu11) hoary; urgency=low + + * Add draft Xhosa translation. + + -- Colin Watson Tue, 22 Mar 2005 14:21:01 +0000 + +base-installer (1.15ubuntu10) hoary; urgency=low + + * Don't install mkvmlinuz on Pegasos, since that has yaboot support with + Open Firmware version 2005.03.10-beta or later. + + -- Colin Watson Wed, 16 Mar 2005 11:16:22 +0000 + +base-installer (1.15ubuntu9) hoary; urgency=low + + * Provide target-base-system (i.e. base system installed in /target, also + provided by casper). + + -- Colin Watson Tue, 15 Mar 2005 13:00:18 +0000 + +base-installer (1.15ubuntu8) hoary; urgency=low + + * Better version of get_resume_partition that protects against using swap + files for RESUME= (thanks, Jeff Bailey; closes: Ubuntu #7474). + + -- Colin Watson Fri, 11 Mar 2005 17:27:59 +0000 + +base-installer (1.15ubuntu7) hoary; urgency=low + + * Work out the largest swap partition, if any, and use its devfs-mapped + name as the value of RESUME= in /etc/mkinitrd/mkinitrd.conf. + + -- Colin Watson Wed, 9 Mar 2005 05:19:23 +0000 + +base-installer (1.15ubuntu6) hoary; urgency=low + + * Fix syntax error in configure_apt. + + -- Colin Watson Tue, 8 Mar 2005 14:37:29 +0000 + +base-installer (1.15ubuntu5) hoary; urgency=low + + * Tweak kernel_update_list to list more general metapackages first, and + stop listing kernel-image-*. + * If the ideal kernel isn't available, just pick the first on the list + rather than trying to match up kernel versions. + + -- Colin Watson Mon, 7 Mar 2005 13:11:31 +0000 + +base-installer (1.15ubuntu4) hoary; urgency=low + + * Update Polish branding (thanks, Piotr Szotkowski). + + -- Colin Watson Mon, 14 Feb 2005 11:56:32 +0000 + +base-installer (1.15ubuntu3) hoary; urgency=low + + * Use linux-* kernels on hppa. + + -- Colin Watson Mon, 24 Jan 2005 15:26:58 +0000 + +base-installer (1.15ubuntu2) hoary; urgency=low + + * Enable debootstrap Release.gpg checking. Add matching + base-installer/debootstrap/section/downrelsig template. + + -- Colin Watson Mon, 17 Jan 2005 18:18:26 +0000 + +base-installer (1.15ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * Fixed amd64-xeon kernel selection. + * Fixed tests to pass for Ubuntu on all but sparc (no sparc64 tests yet). + + -- Colin Watson Sun, 16 Jan 2005 21:01:45 +0000 + base-installer (1.15) experimental; urgency=low NOTE: not for sarge, needs rootskel 1.11 @@ -2613,6 +4025,19 @@ base-installer (1.15) experimental; urge -- Colin Watson Sun, 16 Jan 2005 15:41:53 +0000 +base-installer (1.14ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + - Note that the kernel selection test suite currently fails with our + changes. This needs work upstream to support different kernel-image + stems more easily. + * Remove all the per-architecture defaults from + base-installer/kernel/image-2.6, since they should no longer be needed. + * Adapt kernel selection for supported architectures to use linux-* + kernels. + + -- Colin Watson Thu, 23 Dec 2004 22:56:14 +0000 + base-installer (1.14) experimental; urgency=low NOTE: not for sarge, needs rootskel 1.11 @@ -2651,6 +4076,27 @@ base-installer (1.14) experimental; urge -- Colin Watson Wed, 22 Dec 2004 17:52:20 +0000 +base-installer (1.13ubuntu3) hoary; urgency=low + + * Recognise linux-itanium*, linux-mckinley*, and linux-sparc* as + installable kernels. + + -- Colin Watson Tue, 21 Dec 2004 10:40:46 +0000 + +base-installer (1.13ubuntu2) hoary; urgency=low + + * Use linux-* kernels on ia64 and sparc. + * Remove sparc32 support, since we don't build kernels for it. + + -- Colin Watson Wed, 8 Dec 2004 23:31:16 +0100 + +base-installer (1.13ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * Update Finnish branding. + + -- Colin Watson Tue, 9 Nov 2004 23:28:10 +0000 + base-installer (1.13) unstable; urgency=low * Bdale Garbee @@ -2670,6 +4116,13 @@ base-installer (1.13) unstable; urgency= -- Colin Watson Thu, 28 Oct 2004 18:23:34 +0100 +base-installer (1.12ubuntu1) hoary; urgency=low + + * Resynchronise with Debian (thanks, Scott James Remnant). + * Update Ubuntu branding. + + -- Colin Watson Thu, 28 Oct 2004 18:22:20 +0100 + base-installer (1.12) unstable; urgency=low * Frans Pop @@ -2966,6 +4419,114 @@ base-installer (0.088) unstable; urgency -- Colin Watson Mon, 5 Jul 2004 18:05:46 +0100 +base-installer (0.087ubuntu13) warty; urgency=low + + * Updated translations: + - Catalan (ca.po) by Jordi Mallach + - German (de.po) by Martin Pitt + - Greek (el.po) by Logiotatidis George + - French (fr.po) by VETSEL Patrice + + -- Colin Watson Tue, 12 Oct 2004 12:43:32 +0100 + +base-installer (0.087ubuntu12) warty; urgency=low + + * Install kernel metapackages from the linux-meta source package (closes: + Ubuntu #2136). + * Remove install_restricted_modules, no longer necessary due to the above. + * Fix syntax error in install_base_system. + + -- Colin Watson Tue, 12 Oct 2004 12:26:26 +0100 + +base-installer (0.087ubuntu11) warty; urgency=low + + * Fix sed syntax error while fiddling with mkinitrd.conf. + * Clarify and expand base-installer/debootstrap/error/couldntdl text + (closes: Warty #1350). + + -- Colin Watson Mon, 20 Sep 2004 15:21:07 +0100 + +base-installer (0.087ubuntu10) warty; urgency=low + + * Properly comma-separate component list to fix non-CD installs (closes: + Warty #1224). + + -- Colin Watson Tue, 14 Sep 2004 20:22:17 +0100 + +base-installer (0.087ubuntu9) warty; urgency=low + + * Try to install an appropriate linux-restricted-modules package (closes: + Warty #1210). + + -- Colin Watson Tue, 14 Sep 2004 15:19:01 +0100 + +base-installer (0.087ubuntu8) warty; urgency=low + + * Add base-installer/debootstrap/info/unpackbase and + base-installer/debootstrap/info/confbase templates, to get rid of ugly + things like "Configuring required packages: Unpacking the base + system...". + + -- Colin Watson Sun, 12 Sep 2004 22:49:49 +0100 + +base-installer (0.087ubuntu7) warty; urgency=low + + * Fix kernel_update_list not to fail if there are no kernel-image + packages. + + -- Colin Watson Tue, 7 Sep 2004 13:06:12 +0100 + +base-installer (0.087ubuntu6) warty; urgency=low + + * Move powerpc to linux-image-*. Simplify, given that the only + linux-image-* kernels for powerpc have no subarchitecture stuff in their + names, only CPU families. + * Add amd64 kernel selection support. + + -- Colin Watson Tue, 7 Sep 2004 02:22:12 +0100 + +base-installer (0.087ubuntu5) warty; urgency=low + + * Support linux-image-* kernel packages as well as kernel-image-*. + * Fix i386 kernel selection; 586tsc and k6 kernels no longer exist (Debian + bug #257411). + * Move i386 to linux-image-* (Ubuntu-only, won't work with Debian). + + -- Colin Watson Mon, 6 Sep 2004 12:38:08 +0100 + +base-installer (0.087ubuntu4) warty; urgency=low + + * Colin Watson + - Adapt waypoints and templates for new, more granular debootstrap. + - Guard against overlong progress bars. + + -- Colin Watson Fri, 20 Aug 2004 15:41:13 +0100 + +base-installer (0.087ubuntu3) warty; urgency=low + + * Colin Watson + - Fixed Lithuanian translation of "Ubuntu", per Steve Alexander. + + -- Colin Watson Mon, 16 Aug 2004 17:07:33 +0100 + +base-installer (0.087ubuntu2) warty; urgency=low + + * Tollef Fog Heen + - Ubuntu branding. + * Colin Watson + - Unfuzzy and/or update most translations. + - Get the location of the CD-ROM archive from a debconf question rather + than just using /cdrom; this is a little hacky, but provides a hook + for archive-copier. + + -- Colin Watson Thu, 12 Aug 2004 17:16:27 +0100 + +base-installer (0.087ubuntu1) warty; urgency=low + + * Create ubd devices in create_devices() if installing under UML + + -- Matt Zimmerman Thu, 8 Jul 2004 11:28:32 -0700 + base-installer (0.087) unstable; urgency=low * Otavio Salvador diff -pruN 1.158/debian/control 1.158ubuntu7/debian/control --- 1.158/debian/control 2013-07-13 06:01:02.000000000 +0000 +++ 1.158ubuntu7/debian/control 2014-02-13 16:55:42.000000000 +0000 @@ -1,22 +1,24 @@ Source: base-installer Section: debian-installer Priority: required -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Petter Reinholdtsen , Colin Watson , dann frazier , Steve Langasek , Christian Perrier Build-Depends: debhelper (>= 9), libdebconfclient0-dev (>= 0.46), libdebian-installer4-dev (>= 0.41) -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/base-installer.git -Vcs-Git: git://anonscm.debian.org/d-i/base-installer.git +XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/base-installer.git +XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/base-installer.git +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/base-installer/ubuntu Package: base-installer Package-Type: udeb -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, di-utils-mapdevfs, di-utils (>= 1.48), rootskel (>= 1.19) +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, di-utils-mapdevfs, di-utils (>= 1.68), rootskel (>= 1.19) Description: base system installation framework Package: bootstrap-base Package-Type: udeb Architecture: any -Depends: ${shlibs:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb (>= 1.0.7), gpgv-udeb, debian-archive-keyring-udeb, archdetect +Depends: ${shlibs:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb (>= 1.0.7), gpgv-udeb, ubuntu-keyring-udeb, archdetect Provides: kernel-installer, installed-base XB-Installer-Menu-Item: 6500 Description: Install the base system diff -pruN 1.158/debian/rules 1.158ubuntu7/debian/rules --- 1.158/debian/rules 2015-11-26 04:00:39.000000000 +0000 +++ 1.158ubuntu7/debian/rules 2016-05-03 23:36:46.000000000 +0000 @@ -33,9 +33,9 @@ override_dh_install-arch: dh_install if [ -e "kernel/$(DEB_HOST_ARCH).sh" ]; then \ install -D -m644 "kernel/$(DEB_HOST_ARCH).sh" \ - debian/bootstrap-base/usr/lib/base-installer/kernel.sh; \ + debian/base-installer/usr/lib/base-installer/kernel.sh; \ fi override_dh_installdebconf-arch: dh_installdebconf - (echo ; cat debian/templates.gen) >> debian/bootstrap-base/DEBIAN/templates + (echo ; cat debian/templates.gen) >> debian/base-installer/DEBIAN/templates diff -pruN 1.158/debian/templates-arch 1.158ubuntu7/debian/templates-arch --- 1.158/debian/templates-arch 2014-10-13 03:00:21.000000000 +0000 +++ 1.158ubuntu7/debian/templates-arch 2019-04-23 11:29:39.000000000 +0000 @@ -1,3 +1,7 @@ +Template: base-installer/kernel/override-image +Type: string +Description: always use this kernel image (for preseeding) + Template: base-installer/kernel/linux/initrd-2.6 Type: boolean Default: true @@ -28,12 +32,9 @@ Template: base-installer/kernel/linux/li Type: boolean Default: true Default[alpha]: false -Default[i386]: false -Default[amd64]: false Default[ia64]: false Default[mips]: false Default[mipsel]: false Default[m68k]: false -Default[hppa]: true Description: for internal use only Kernel needs a link in /boot/ (linux only) diff -pruN 1.158/kernel/amd64.sh 1.158ubuntu7/kernel/amd64.sh --- 1.158/kernel/amd64.sh 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/amd64.sh 2020-04-14 22:39:38.000000000 +0000 @@ -4,19 +4,38 @@ arch_get_kernel_flavour () { arch_check_usable_kernel () { case "$1" in - *-dbg) - return 1 - ;; - *-amd64 | *-amd64-*) - # Allow any other hyphenated suffix - return 0 - ;; - *) - return 1 - ;; + *-unsigned-*|*-18.04|*-18.04-edge|*-oem-osp1|*-oem) + return 1 + ;; esac + if echo "$1" | grep -Eq -- "-(server|generic|oem|lowlatency|virtual|xen|preempt|rt)(-.*)?$"; then return 0; fi + + return 1 } + arch_get_kernel () { - echo "linux-image-amd64" + + echo "linux-generic" + echo "linux-image-generic" + + echo "linux-generic-hwe-20.04" + echo "linux-image-generic-hwe-20.04" + + echo "linux-lowlatency" + echo "linux-image-lowlatency" + + echo "linux-lowlatency-hwe-20.04" + echo "linux-image-lowlatency-hwe-20.04" + + echo "linux-oem-20.04" + echo "linux-image-oem-20.04" + + echo "linux-virtual" + echo "linux-image-virtual" + echo "linux-image-extra-virtual" + + echo "linux-virtual-hwe-20.04" + echo "linux-image-virtual-hwe-20.04" + echo "linux-image-extra-virtual-hwe-20.04" } diff -pruN 1.158/kernel/arm64.sh 1.158ubuntu7/kernel/arm64.sh --- 1.158/kernel/arm64.sh 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/arm64.sh 2020-04-14 22:45:49.000000000 +0000 @@ -1,19 +1,28 @@ arch_get_kernel_flavour () { - echo "arm64" + echo "$MACHINE" return 0 } arch_check_usable_kernel () { - case "$1" in - *-dbg) - return 1 - ;; - *) - return 0 - ;; - esac + return 0 } arch_get_kernel () { - echo "linux-image-arm64" + echo "linux-generic" + echo "linux-image-generic" + + echo "linux-generic-hwe-20.04" + echo "linux-image-generic-hwe-20.04" + + echo "linux-raspi" + echo "linux-image-raspi" + + echo "linux-virtual" + echo "linux-image-virtual" + echo "linux-image-extra-virtual" + + echo "linux-virtual-hwe-20.04" + echo "linux-image-virtual-hwe-20.04" + echo "linux-image-extra-virtual-hwe-20.04" + } diff -pruN 1.158/kernel/armhf.sh 1.158ubuntu7/kernel/armhf.sh --- 1.158/kernel/armhf.sh 2015-06-05 03:00:46.000000000 +0000 +++ 1.158ubuntu7/kernel/armhf.sh 2020-04-14 22:43:37.000000000 +0000 @@ -8,7 +8,7 @@ arch_has_lpae () { arch_get_kernel_flavour () { case "$SUBARCH" in - omap|mx5|vexpress) + keystone|omap|omap4|mx5|vexpress) echo "$SUBARCH armmp" return 0 ;; generic) @@ -33,20 +33,29 @@ arch_check_usable_kernel () { set -- $2 while [ $# -ge 1 ]; do TRY="$1" - case "$NAME" in - *-dbg) + case "$TRY:$NAME" in + *:*-dbg) return 1 ;; - *-"$TRY"-lpae | *-"$TRY"-lpae-*) + *:*-"$TRY"-lpae | *:*-"$TRY"-lpae-*) # Allow any other hyphenated suffix if test `arch_has_lpae` = y ; then return 0 fi ;; - *-"$TRY" | *-"$TRY"-*) + *:*-"$TRY" | *:*-"$TRY"-*) # Allow any other hyphenated suffix return 0 ;; + armmp-lpae:*-generic-lpae | armmp-lpae:*-generic-lpae-*) + return 0 + ;; + armmp:*-generic-lpae | armmp:*-generic-lpae-*) + # Don't allow -generic-lpae for non-lpae + ;; + armmp:*-generic | armmp:*-generic-*) + return 0 + ;; esac shift done @@ -55,12 +64,25 @@ arch_check_usable_kernel () { arch_get_kernel () { case "$KERNEL_MAJOR" in - 2.6|3.*|4.*) + 2.6|3.*|4.*|5.*) imgbase="linux-image" set -- $1 while [ $# -ge 1 ]; do - echo "$imgbase-$1" + case $1 in + armmp) + echo "linux-generic" + echo "linux-image-generic" + ;; + armmp-lpae) + echo "linux-generic-lpae" + echo "linux-image-generic-lpae" + ;; + *) + echo "linux-$1" + echo "linux-image-$1" + ;; + esac shift done ;; diff -pruN 1.158/kernel/i386.sh 1.158ubuntu7/kernel/i386.sh --- 1.158/kernel/i386.sh 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/i386.sh 2016-05-03 23:36:46.000000000 +0000 @@ -18,7 +18,7 @@ arch_check_usable_kernel () { set -- $2 while [ $# -ge 1 ]; do - case "$NAME" in + case "$1:$NAME" in *-dbg) return 1 ;; @@ -26,10 +26,16 @@ arch_check_usable_kernel () { # Don't allow -pae suffix, as this requires an # extra CPU feature ;; - *-"$1" | *-"$1"-*) + *:*-"$1" | *:*-"$1"-*) # Allow any other hyphenated suffix return 0 ;; + 686-*:*-generic | 686-*:*-generic-*) + return 0 + ;; + 686-*:*-virtual | 686-*:*-virtual-*) + return 0 + ;; esac shift done @@ -41,7 +47,15 @@ arch_get_kernel () { set -- $1 while [ $# -ge 1 ]; do - echo "$imgbase-$1" + case $1 in + 686-*) + echo "linux-generic" + echo "linux-image-generic" + echo "linux-virtual" + echo "linux-image-virtual" + break + ;; + esac shift done } diff -pruN 1.158/kernel/powerpc.sh 1.158ubuntu7/kernel/powerpc.sh --- 1.158/kernel/powerpc.sh 2015-06-05 03:00:46.000000000 +0000 +++ 1.158ubuntu7/kernel/powerpc.sh 2016-09-19 21:42:00.000000000 +0000 @@ -2,17 +2,23 @@ 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 ppc970*|power3|power4*|power5*|power6*|power7*|power8*) - family=powerpc64 ;; + family=generic ;; cell|i-star|s-star|pa6t|rs64-*) - family=powerpc64 ;; + family=generic ;; + e500mc) + echo powerpc-e500mc + return 0 ;; + e500*) + echo powerpc-e500 + return 0 ;; *) family=powerpc ;; esac case "$SUBARCH" in - powermac*|chrp*|pasemi|ps3) + powermac*|prep|chrp*|pasemi) echo "$family" ;; - prep) - echo prep ;; + ps3|cell) + echo generic ;; amiga) echo apus ;; *) @@ -29,9 +35,7 @@ arch_check_usable_kernel () { } arch_get_kernel () { - CPUS="$(ls "$OFCPUS" 2>/dev/null | grep -ci @[0-9])" || CPUS=1 - if [ "$CPUS" ] && [ "$CPUS" -gt 1 ] && \ - [ "$1" != "powerpc64" ] && [ "$1" != "prep" ] ; then + if [ "$1" = "powerpc" ]; then SMP=-smp else SMP= @@ -40,8 +44,10 @@ arch_get_kernel () { case "$KERNEL_MAJOR" in 2.6|3.*|4.*) if [ "$SMP" ]; then + echo "linux-$1$SMP" echo "linux-image-$1$SMP" fi + echo "linux-$1" echo "linux-image-$1" ;; *) diff -pruN 1.158/kernel/ppc64el.sh 1.158ubuntu7/kernel/ppc64el.sh --- 1.158/kernel/ppc64el.sh 2014-09-20 07:33:08.000000000 +0000 +++ 1.158ubuntu7/kernel/ppc64el.sh 2020-04-14 22:45:18.000000000 +0000 @@ -1,5 +1,5 @@ arch_get_kernel_flavour () { - echo powerpc64le + echo generic return 0 } @@ -8,5 +8,17 @@ arch_check_usable_kernel () { } arch_get_kernel () { - echo "linux-image-powerpc64le" + echo "linux-generic" + echo "linux-image-generic" + + echo "linux-generic-hwe-20.04" + echo "linux-image-generic-hwe-20.04" + + echo "linux-virtual" + echo "linux-image-virtual" + echo "linux-image-extra-virtual" + + echo "linux-virtual-hwe-20.04" + echo "linux-image-virtual-hwe-20.04" + echo "linux-image-extra-virtual-hwe-20.04" } diff -pruN 1.158/kernel/s390x.sh 1.158ubuntu7/kernel/s390x.sh --- 1.158/kernel/s390x.sh 2012-08-12 01:01:47.000000000 +0000 +++ 1.158ubuntu7/kernel/s390x.sh 2020-04-14 22:45:08.000000000 +0000 @@ -4,16 +4,23 @@ arch_get_kernel_flavour () { } arch_check_usable_kernel () { - case "$1" in - *-s390x-tape) - # Bastian Blank says: "-s390-tape is only a kernel - # image without any logic and modules" - return 1 ;; - *) - return 0 ;; - esac + if echo "$1" | grep -Eq -- "-(generic|virtual)(-.*)?$"; then return 0; fi + + return 1 } arch_get_kernel () { - echo "linux-image-$1" + echo "linux-generic" + echo "linux-image-generic" + + echo "linux-generic-hwe-20.04" + echo "linux-image-generic-hwe-20.04" + + echo "linux-virtual" + echo "linux-image-virtual" + echo "linux-image-extra-virtual" + + echo "linux-virtual-hwe-20.04" + echo "linux-image-virtual-hwe-20.04" + echo "linux-image-extra-virtual-hwe-20.04" } diff -pruN 1.158/kernel/tests/amd64/cittagazze.test 1.158ubuntu7/kernel/tests/amd64/cittagazze.test --- 1.158/kernel/tests/amd64/cittagazze.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/amd64/cittagazze.test 2020-04-15 12:24:20.000000000 +0000 @@ -2,10 +2,26 @@ cpuinfo cittagazze.cpuinfo majors 2.6 flavour amd64 kernel-2.6 \ - linux-image-amd64 + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-lowlatency \ + linux-image-lowlatency \ + linux-lowlatency-hwe-20.04 \ + linux-image-lowlatency-hwe-20.04 \ + linux-oem-20.04 \ + linux-image-oem-20.04 \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-amd64 \ - linux-image-2.6.18-4-amd64 -unusable \ - linux-image-amd64-dbg \ - linux-image-3.16-4-amd64-dbg + 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 -pruN 1.158/kernel/tests/arm64/foundation.test 1.158ubuntu7/kernel/tests/arm64/foundation.test --- 1.158/kernel/tests/arm64/foundation.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/arm64/foundation.test 2020-04-15 12:22:15.000000000 +0000 @@ -1,12 +1,22 @@ subarch generic cpuinfo foundation.cpuinfo -flavour arm64 +flavour generic majors 3.10 -machine aarch64 +machine generic kernel-3.10 \ - linux-image-arm64 + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-raspi \ + linux-image-raspi \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-arm64 \ - linux-image-3.14-1-arm64 -unusable \ - linux-image-3.14-1-arm64-dbg + linux-generic \ + linux-image-generic \ + linux-image-3.13.0-12-generic diff -pruN 1.158/kernel/tests/arm64/mustang.test 1.158ubuntu7/kernel/tests/arm64/mustang.test --- 1.158/kernel/tests/arm64/mustang.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/arm64/mustang.test 2020-04-15 12:22:33.000000000 +0000 @@ -1,12 +1,22 @@ subarch generic cpuinfo mustang.cpuinfo -flavour arm64 +flavour generic majors 3.10 -machine aarch64 +machine generic kernel-3.10 \ - linux-image-arm64 + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-raspi \ + linux-image-raspi \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-arm64 \ - linux-image-3.14-1-arm64 -unusable \ - linux-image-3.14-1-arm64-dbg + linux-generic \ + linux-image-generic \ + linux-image-3.13.0-12-generic diff -pruN 1.158/kernel/tests/arm64/qemu-virt.test 1.158ubuntu7/kernel/tests/arm64/qemu-virt.test --- 1.158/kernel/tests/arm64/qemu-virt.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/arm64/qemu-virt.test 2020-04-15 12:22:52.000000000 +0000 @@ -1,12 +1,22 @@ subarch generic cpuinfo qemu-virt.cpuinfo -flavour arm64 +flavour generic majors 3.10 -machine aarch64 +machine generic kernel-3.10 \ - linux-image-arm64 + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-raspi \ + linux-image-raspi \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-arm64 \ - linux-image-3.14-1-arm64 -unusable \ - linux-image-3.14-1-arm64-dbg + linux-generic \ + linux-image-generic \ + linux-image-3.13.0-12-generic diff -pruN 1.158/kernel/tests/armhf/efikamx.test 1.158ubuntu7/kernel/tests/armhf/efikamx.test --- 1.158/kernel/tests/armhf/efikamx.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/efikamx.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,14 +2,20 @@ subarch mx5 cpuinfo efikamx.cpuinfo majors 2.6 flavour mx5 armmp -kernel-2.6 linux-image-mx5 linux-image-armmp +kernel-2.6 \ + linux-mx5 \ + linux-image-mx5 \ + linux-generic \ + linux-image-generic usable \ + linux-mx5 \ linux-image-mx5 \ + linux-image-2.6.38-4-mx5 linux-image-2.6.38-4-mx5 \ - linux-image-armmp \ - linux-image-2.6.38-4-armmp + linux-image-generic \ + linux-image-2.6.38-4-generic unusable \ - linux-image-armmp-lpae \ + linux-image-generic-lpae \ linux-image-iop32x \ linux-image-netwinder \ linux-image-orion5x \ diff -pruN 1.158/kernel/tests/armhf/highbank.test 1.158ubuntu7/kernel/tests/armhf/highbank.test --- 1.158/kernel/tests/armhf/highbank.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/highbank.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,10 +3,12 @@ cpuinfo highbank.cpuinfo majors 3.10 flavour armmp kernel-3.10 \ - linux-image-armmp + linux-generic \ + linux-image-generic usable \ - linux-image-armmp \ - linux-image-3.10-3-armmp + linux-generic \ + linux-image-generic \ + linux-image-3.13.0-8-generic unusable \ linux-image-armmp-lpae \ linux-image-iop32x \ diff -pruN 1.158/kernel/tests/armhf/midway-no-lpae.test 1.158ubuntu7/kernel/tests/armhf/midway-no-lpae.test --- 1.158/kernel/tests/armhf/midway-no-lpae.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/midway-no-lpae.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,10 +3,12 @@ cpuinfo midway-no-lpae.cpuinfo majors 3.10 flavour armmp kernel-3.10 \ - linux-image-armmp + linux-generic \ + linux-image-generic usable \ - linux-image-armmp \ - linux-image-3.10-3-armmp + linux-generic \ + linux-image-generic \ + linux-image-3.13.0-8-generic unusable \ linux-image-armmp-lpae \ linux-image-iop32x \ diff -pruN 1.158/kernel/tests/armhf/midway.test 1.158ubuntu7/kernel/tests/armhf/midway.test --- 1.158/kernel/tests/armhf/midway.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/midway.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,13 +3,15 @@ cpuinfo midway.cpuinfo majors 3.10 flavour armmp-lpae armmp kernel-3.10 \ - linux-image-armmp-lpae \ - linux-image-armmp + linux-generic-lpae \ + linux-image-generic-lpae \ + linux-generic \ + linux-image-generic usable \ - linux-image-armmp \ - linux-image-3.10-3-armmp \ - linux-image-armmp-lpae \ - linux-image-3.10-3-armmp-lpae + linux-generic \ + linux-image-generic \ + linux-image-3.13.0-8-generic \ + linux-image-3.13.0-8-generic-lpae unusable \ linux-image-iop32x \ linux-image-netwinder \ diff -pruN 1.158/kernel/tests/armhf/omap4.cpuinfo 1.158ubuntu7/kernel/tests/armhf/omap4.cpuinfo --- 1.158/kernel/tests/armhf/omap4.cpuinfo 1970-01-01 00:00:00.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/omap4.cpuinfo 2011-06-16 19:53:06.000000000 +0000 @@ -0,0 +1,17 @@ +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 -pruN 1.158/kernel/tests/armhf/omap4.test 1.158ubuntu7/kernel/tests/armhf/omap4.test --- 1.158/kernel/tests/armhf/omap4.test 1970-01-01 00:00:00.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/omap4.test 2014-02-14 14:14:43.000000000 +0000 @@ -0,0 +1,31 @@ +subarch omap4 +cpuinfo omap4.cpuinfo +majors 2.6 +flavour omap4 armmp +kernel-2.6 \ + linux-omap4 \ + linux-image-omap4 \ + linux-generic \ + linux-image-generic +usable \ + linux-image-generic \ + linux-image-11-generic \ + 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 -pruN 1.158/kernel/tests/armhf/vexpress.test 1.158ubuntu7/kernel/tests/armhf/vexpress.test --- 1.158/kernel/tests/armhf/vexpress.test 2014-11-01 04:00:35.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/armhf/vexpress.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,12 +2,16 @@ subarch vexpress cpuinfo vexpress.cpuinfo majors 2.6 flavour vexpress armmp -kernel-2.6 linux-image-vexpress linux-image-armmp +kernel-2.6 \ + linux-vexpress \ + linux-image-vexpress \ + linux-generic \ + linux-image-generic usable \ linux-image-vexpress \ linux-image-3.2.0-4-vexpress \ - linux-image-armmp \ - linux-image-3.2.0-4-armmp + linux-image-generic \ + linux-image-3.2.0-4-generic unusable \ linux-image-armmp-lpae \ linux-image-iop32x \ diff -pruN 1.158/kernel/tests/i386/amd-k7-old.test 1.158ubuntu7/kernel/tests/i386/amd-k7-old.test --- 1.158/kernel/tests/i386/amd-k7-old.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/amd-k7-old.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,9 +2,10 @@ cpuinfo amd-k7-old.cpuinfo majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ linux-image-586 \ linux-image-686 \ diff -pruN 1.158/kernel/tests/i386/cittagazze.test 1.158ubuntu7/kernel/tests/i386/cittagazze.test --- 1.158/kernel/tests/i386/cittagazze.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/cittagazze.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,19 +2,23 @@ cpuinfo cittagazze.cpuinfo majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ + linux-generic \ + linux-image-generic \ linux-image-586 \ linux-image-686 \ linux-image-686-pae \ linux-image-3.16-4-586 \ linux-image-2.6.25-1-686 \ + linux-image-2.6.36-1-generic \ linux-image-2.6.38-1-686-pae unusable \ linux-image-amd64 \ linux-image-2.6.25-1-amd64 \ linux-image-686-pae-dbg \ linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686 +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/oqo1.test 1.158ubuntu7/kernel/tests/i386/oqo1.test --- 1.158/kernel/tests/i386/oqo1.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/oqo1.test 2016-05-03 23:36:46.000000000 +0000 @@ -1,19 +1,9 @@ cpuinfo oqo1.cpuinfo majors 2.6 flavour 686 586 -kernel-2.6 \ - linux-image-686 \ - linux-image-586 -usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-3.16-1-586 \ - linux-image-2.6.18-1-686 +kernel-2.6 unusable \ - linux-image-686-pae \ - linux-image-amd64 \ - linux-image-2.6.38-1-686-pae \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/pentium-3.test 1.158ubuntu7/kernel/tests/i386/pentium-3.test --- 1.158/kernel/tests/i386/pentium-3.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/pentium-3.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,19 +2,12 @@ cpuinfo pentium-3.cpuinfo majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-686-pae \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 \ - linux-image-2.6.38-1-686-pae -unusable \ - linux-image-amd64 \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/pentium-4M-bigmem-2.test 1.158ubuntu7/kernel/tests/i386/pentium-4M-bigmem-2.test --- 1.158/kernel/tests/i386/pentium-4M-bigmem-2.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/pentium-4M-bigmem-2.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,19 +3,12 @@ machine i686 majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-686-pae \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 \ - linux-image-2.6.38-1-686-pae -unusable \ - linux-image-amd64 \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic env KERNEL_FLAVOUR 686 diff -pruN 1.158/kernel/tests/i386/pentium-4M-bigmem.test 1.158ubuntu7/kernel/tests/i386/pentium-4M-bigmem.test --- 1.158/kernel/tests/i386/pentium-4M-bigmem.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/pentium-4M-bigmem.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,19 +3,12 @@ machine i686 majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-686-pae \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 \ - linux-image-2.6.38-1-686-pae -unusable \ - linux-image-amd64 \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686-pae + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic-pae diff -pruN 1.158/kernel/tests/i386/pentium-4M.test 1.158ubuntu7/kernel/tests/i386/pentium-4M.test --- 1.158/kernel/tests/i386/pentium-4M.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/pentium-4M.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,19 +3,12 @@ machine i686 majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-686-pae \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 \ - linux-image-2.6.38-1-686-pae -unusable \ - linux-image-amd64 \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/pentium-d-2p.test 1.158ubuntu7/kernel/tests/i386/pentium-d-2p.test --- 1.158/kernel/tests/i386/pentium-d-2p.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/pentium-d-2p.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,20 +2,12 @@ cpuinfo pentium-d-2p.cpuinfo majors 2.6 flavour 686-pae amd64 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-amd64 \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-686-pae \ - linux-image-amd64 \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 \ - linux-image-2.6.38-1-686-pae \ - linux-image-2.6.18-1-amd64 -unusable \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/pentium.test 1.158ubuntu7/kernel/tests/i386/pentium.test --- 1.158/kernel/tests/i386/pentium.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/pentium.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,18 +2,9 @@ cpuinfo pentium.cpuinfo machine i586 majors 2.6 flavour 586 -kernel-2.6 \ - linux-image-586 -usable \ - linux-image-586 \ - linux-image-3.16-4-586 +kernel-2.6 unusable \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-amd64 \ - linux-image-2.6.38-1-686-pae \ - linux-image-2.6.18-1-686 \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 586 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/via-c3-nehemiah.test 1.158ubuntu7/kernel/tests/i386/via-c3-nehemiah.test --- 1.158/kernel/tests/i386/via-c3-nehemiah.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/via-c3-nehemiah.test 2016-05-03 23:36:46.000000000 +0000 @@ -1,19 +1,9 @@ cpuinfo via-c3-nehemiah.cpuinfo majors 2.6 flavour 686 586 -kernel-2.6 \ - linux-image-686 \ - linux-image-586 -usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 +kernel-2.6 unusable \ - linux-image-686-pae \ - linux-image-amd64 \ - linux-image-2.6.38-1-686-pae \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 686 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/via-c3-Samuel-2.test 1.158ubuntu7/kernel/tests/i386/via-c3-Samuel-2.test --- 1.158/kernel/tests/i386/via-c3-Samuel-2.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/via-c3-Samuel-2.test 2016-05-03 23:36:46.000000000 +0000 @@ -2,18 +2,9 @@ cpuinfo via-c3-Samuel-2.cpuinfo machine i686 majors 2.6 flavour 586 -kernel-2.6 \ - linux-image-586 -usable \ - linux-image-586 \ - linux-image-3.16-4-586 +kernel-2.6 unusable \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-686-amd64 \ - linux-image-2.6.38-1-686-pae \ - linux-image-2.6.18-1-686 \ - linux-image-18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg -env KERNEL_FLAVOUR 586 + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/i386/via-c7-Esther.test 1.158ubuntu7/kernel/tests/i386/via-c7-Esther.test --- 1.158/kernel/tests/i386/via-c7-Esther.test 2015-10-11 03:00:33.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/i386/via-c7-Esther.test 2016-05-03 23:36:46.000000000 +0000 @@ -3,18 +3,12 @@ machine i686 majors 2.6 flavour 686-pae 686 586 kernel-2.6 \ - linux-image-686-pae \ - linux-image-686 \ - linux-image-586 + linux-generic \ + linux-image-generic \ + linux-virtual \ + linux-image-virtual usable \ - linux-image-586 \ - linux-image-686 \ - linux-image-3.16-4-586 \ - linux-image-2.6.18-1-686 \ - linux-image-686-pae \ - linux-image-2.6.38-1-686-pae -unusable \ - linux-image-amd64 \ - linux-image-2.6.18-1-amd64 \ - linux-image-686-pae-dbg \ - linux-image-3.16-4-686-pae-dbg + linux-generic \ + linux-image-generic \ + linux-image-2.6.36-1-generic +env KERNEL_FLAVOUR generic diff -pruN 1.158/kernel/tests/powerpc/chrp_ibm.test 1.158ubuntu7/kernel/tests/powerpc/chrp_ibm.test --- 1.158/kernel/tests/powerpc/chrp_ibm.test 2012-04-04 01:01:46.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/chrp_ibm.test 2016-09-19 21:43:20.000000000 +0000 @@ -1,18 +1,18 @@ subarch chrp_ibm cpuinfo chrp_ibm.cpuinfo majors 2.6 -flavour powerpc64 +flavour generic kernel-2.6 \ - linux-image-powerpc64 + linux-generic \ + linux-image-generic usable \ - linux-image-powerpc64 \ - linux-image-2.6.18-4-powerpc64 + linux-generic \ + linux-image-generic \ + linux-image-2.6.20-15-generic unusable \ + linux-powerpc \ + linux-powerpc-smp \ linux-image-powerpc \ - linux-image-powerpc-miboot \ linux-image-powerpc-smp \ - linux-image-prep \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-miboot \ - linux-image-2.6.18-4-powerpc-smp \ - linux-image-2.6.18-4-prep + linux-image-2.6.20-15-powerpc \ + linux-image-2.6.20-15-powerpc-smp diff -pruN 1.158/kernel/tests/powerpc/e500mc.cpuinfo 1.158ubuntu7/kernel/tests/powerpc/e500mc.cpuinfo --- 1.158/kernel/tests/powerpc/e500mc.cpuinfo 1970-01-01 00:00:00.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/e500mc.cpuinfo 2012-11-16 15:58:52.000000000 +0000 @@ -0,0 +1,53 @@ +processor : 0 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 1 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 2 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 3 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 4 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 5 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 6 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +processor : 7 +cpu : e500mc +clock : 1500.000000MHz +revision : 2.0 (pvr 8023 0020) +bogomips : 100.00 + +total bogomips : 800.00 +timebase : 50000000 +platform : P4080 DS +model : servergy,jade-rev3 +Memory : 8192 MB diff -pruN 1.158/kernel/tests/powerpc/e500mc.test 1.158ubuntu7/kernel/tests/powerpc/e500mc.test --- 1.158/kernel/tests/powerpc/e500mc.test 1970-01-01 00:00:00.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/e500mc.test 2016-09-19 21:38:39.000000000 +0000 @@ -0,0 +1,21 @@ +subarch unknown +cpuinfo e500mc.cpuinfo +majors 2.6 +flavour powerpc-e500mc +kernel-2.6 \ + linux-powerpc-e500mc \ + linux-image-powerpc-e500mc +usable \ + linux-powerpc-e500mc \ + linux-image-powerpc-e500mc \ + linux-image-3.7.0-0-powerpc-e500mc +unusable \ + linux-powerpc \ + linux-powerpc-smp \ + linux-generic \ + linux-image-powerpc \ + linux-image-powerpc-smp \ + linux-image-generic \ + linux-image-3.7.0-0-powerpc \ + linux-image-3.7.0-0-powerpc-smp \ + linux-image-3.7.0-0-generic diff -pruN 1.158/kernel/tests/powerpc/g5.test 1.158ubuntu7/kernel/tests/powerpc/g5.test --- 1.158/kernel/tests/powerpc/g5.test 2012-04-04 01:01:46.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/g5.test 2016-09-19 21:43:29.000000000 +0000 @@ -1,17 +1,18 @@ subarch powermac_newworld cpuinfo g5.cpuinfo majors 2.6 -flavour powerpc64 -kernel-2.6 linux-image-powerpc64 +flavour generic +kernel-2.6 \ + linux-generic \ + linux-image-generic usable \ - linux-image-powerpc64 \ - linux-image-2.6.18-4-powerpc64 + linux-generic \ + linux-image-generic \ + linux-image-2.6.20-15-generic unusable \ + linux-powerpc \ + linux-powerpc-smp \ linux-image-powerpc \ - linux-image-powerpc-miboot \ linux-image-powerpc-smp \ - linux-image-prep \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-miboot \ - linux-image-2.6.18-4-powerpc-smp \ - linux-image-2.6.18-4-prep + linux-image-2.6.20-15-powerpc \ + linux-image-2.6.20-15-powerpc-smp diff -pruN 1.158/kernel/tests/powerpc/powermac7,3.test 1.158ubuntu7/kernel/tests/powerpc/powermac7,3.test --- 1.158/kernel/tests/powerpc/powermac7,3.test 2012-04-04 01:01:46.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/powermac7,3.test 2016-09-19 21:43:39.000000000 +0000 @@ -1,17 +1,18 @@ subarch powermac_newworld cpuinfo powermac7,3.cpuinfo majors 2.6 -flavour powerpc64 -kernel-2.6 linux-image-powerpc64 +flavour generic +kernel-2.6 \ + linux-generic \ + linux-image-generic usable \ - linux-image-powerpc64 \ - linux-image-2.6.18-4-powerpc64 + linux-generic \ + linux-image-generic \ + linux-image-2.6.20-15-generic unusable \ + linux-powerpc \ + linux-powerpc-smp \ linux-image-powerpc \ - linux-image-powerpc-miboot \ linux-image-powerpc-smp \ - linux-image-prep \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-miboot \ - linux-image-2.6.18-4-powerpc-smp \ - linux-image-2.6.18-4-prep + linux-image-2.6.20-15-powerpc \ + linux-image-2.6.20-15-powerpc-smp diff -pruN 1.158/kernel/tests/powerpc/powermac_newworld-smp.test 1.158ubuntu7/kernel/tests/powerpc/powermac_newworld-smp.test --- 1.158/kernel/tests/powerpc/powermac_newworld-smp.test 2012-12-22 02:01:56.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/powermac_newworld-smp.test 2016-09-19 21:39:45.000000000 +0000 @@ -4,7 +4,9 @@ ofcpus powermac_newworld-smp/ majors 2.6 flavour powerpc kernel-2.6 \ + linux-powerpc-smp \ linux-image-powerpc-smp \ + linux-powerpc \ linux-image-powerpc usable \ linux-image-powerpc \ @@ -14,7 +16,7 @@ usable \ linux-image-2.6.18-4-powerpc-miboot \ linux-image-2.6.18-4-powerpc-smp unusable \ - linux-image-powerpc64 \ + linux-image-generic \ linux-image-prep \ - linux-image-2.6.18-4-powerpc64 \ + linux-image-2.6.18-4-generic \ linux-image-2.6.18-4-prep diff -pruN 1.158/kernel/tests/powerpc/powermac_newworld.test 1.158ubuntu7/kernel/tests/powerpc/powermac_newworld.test --- 1.158/kernel/tests/powerpc/powermac_newworld.test 2012-12-22 02:01:56.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/powermac_newworld.test 2016-09-19 21:38:39.000000000 +0000 @@ -3,16 +3,19 @@ cpuinfo powermac_newworld.cpuinfo ofcpus powermac_newworld/ majors 2.6 flavour powerpc -kernel-2.6 linux-image-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-miboot \ linux-image-powerpc-smp \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-miboot \ - linux-image-2.6.18-4-powerpc-smp + linux-image-2.6.20-15-powerpc \ + linux-image-2.6.20-15-powerpc-smp unusable \ - linux-image-powerpc64 \ - linux-image-prep \ - linux-image-2.6.18-4-powerpc64 \ - linux-image-2.6.18-4-prep + linux-generic \ + linux-image-generic \ + linux-image-2.6.20-15-generic diff -pruN 1.158/kernel/tests/powerpc/powerstackII.test 1.158ubuntu7/kernel/tests/powerpc/powerstackII.test --- 1.158/kernel/tests/powerpc/powerstackII.test 2012-04-04 01:01:46.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/powerstackII.test 2016-09-19 21:38:39.000000000 +0000 @@ -1,16 +1,20 @@ subarch prep cpuinfo powerstackII.cpuinfo majors 2.6 -flavour prep +flavour powerpc kernel-2.6 \ - linux-image-prep + linux-powerpc-smp \ + linux-image-powerpc-smp \ + linux-powerpc \ + linux-image-powerpc usable \ - linux-image-prep \ - linux-image-2.6.18-4-prep -unusable \ + linux-powerpc \ + linux-powerpc-smp \ linux-image-powerpc \ linux-image-powerpc-smp \ - linux-image-powerpc64 \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-smp \ - linux-image-2.6.18-4-powerpc64 + linux-image-2.6.20-15-powerpc \ + linux-image-2.6.20-15-powerpc-smp +unusable \ + linux-generic \ + linux-image-generic \ + linux-image-2.6.20-15-generic diff -pruN 1.158/kernel/tests/powerpc/ps3.test 1.158ubuntu7/kernel/tests/powerpc/ps3.test --- 1.158/kernel/tests/powerpc/ps3.test 2012-04-04 01:01:46.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/ps3.test 2016-09-19 21:43:53.000000000 +0000 @@ -1,17 +1,18 @@ subarch ps3 cpuinfo ps3.cpuinfo majors 2.6 -flavour powerpc64 -kernel-2.6 linux-image-powerpc64 +flavour generic +kernel-2.6 \ + linux-generic \ + linux-image-generic usable \ - linux-image-powerpc64 \ - linux-image-2.6.18-4-powerpc64 + linux-generic \ + linux-image-generic \ + linux-image-2.6.24-16-generic unusable \ + linux-powerpc \ + linux-powerpc-smp \ linux-image-powerpc \ - linux-image-powerpc-miboot \ linux-image-powerpc-smp \ - linux-image-prep \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-miboot \ - linux-image-2.6.18-4-powerpc-smp \ - linux-image-2.6.18-4-prep + linux-image-2.6.24-16-powerpc \ + linux-image-2.6.24-16-powerpc-smp diff -pruN 1.158/kernel/tests/powerpc/rs64-iv.test 1.158ubuntu7/kernel/tests/powerpc/rs64-iv.test --- 1.158/kernel/tests/powerpc/rs64-iv.test 2012-04-04 01:01:46.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/powerpc/rs64-iv.test 2016-09-19 21:44:03.000000000 +0000 @@ -1,18 +1,18 @@ subarch chrp_ibm cpuinfo rs64-iv.cpuinfo majors 2.6 -flavour powerpc64 +flavour generic kernel-2.6 \ - linux-image-powerpc64 + linux-generic \ + linux-image-generic usable \ - linux-image-powerpc64 \ - linux-image-2.6.18-4-powerpc64 + linux-generic \ + linux-image-generic \ + linux-image-2.6.20-15-generic unusable \ + linux-powerpc \ + linux-powerpc-smp \ linux-image-powerpc \ - linux-image-powerpc-miboot \ linux-image-powerpc-smp \ - linux-image-prep \ - linux-image-2.6.18-4-powerpc \ - linux-image-2.6.18-4-powerpc-miboot \ - linux-image-2.6.18-4-powerpc-smp \ - linux-image-2.6.18-4-prep + linux-image-2.6.20-15-powerpc \ + linux-image-2.6.20-15-powerpc-smp diff -pruN 1.158/kernel/tests/ppc64el/postal.test 1.158ubuntu7/kernel/tests/ppc64el/postal.test --- 1.158/kernel/tests/ppc64el/postal.test 2014-09-20 07:33:08.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/ppc64el/postal.test 2020-04-15 12:25:40.000000000 +0000 @@ -1,9 +1,18 @@ subarch chrp_ibm cpuinfo postal.cpuinfo majors 2.6 -flavour powerpc64le +flavour generic kernel-2.6 \ - linux-image-powerpc64le + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-powerpc64le \ - linux-image-3.14-1-powerpc64le + linux-image-generic \ + linux-image-3.14-1-generic diff -pruN 1.158/kernel/tests/ppc64el/powernv.test 1.158ubuntu7/kernel/tests/ppc64el/powernv.test --- 1.158/kernel/tests/ppc64el/powernv.test 2014-09-20 07:33:08.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/ppc64el/powernv.test 2020-04-15 12:25:55.000000000 +0000 @@ -1,9 +1,18 @@ subarch chrp_ibm cpuinfo powernv.cpuinfo majors 2.6 -flavour powerpc64le +flavour generic kernel-2.6 \ - linux-image-powerpc64le + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-powerpc64le \ - linux-image-3.14-1-powerpc64le + linux-image-generic \ + linux-image-3.14-1-generic diff -pruN 1.158/kernel/tests/s390x/iic.test 1.158ubuntu7/kernel/tests/s390x/iic.test --- 1.158/kernel/tests/s390x/iic.test 2012-08-12 01:01:48.000000000 +0000 +++ 1.158ubuntu7/kernel/tests/s390x/iic.test 2020-04-15 12:26:43.000000000 +0000 @@ -3,8 +3,15 @@ cpuinfo iic.cpuinfo flavour s390x majors 2.6 kernel-2.6 \ - linux-image-s390x + linux-generic \ + linux-image-generic \ + linux-generic-hwe-20.04 \ + linux-image-generic-hwe-20.04 \ + linux-virtual \ + linux-image-virtual \ + linux-image-extra-virtual \ + linux-virtual-hwe-20.04 \ + linux-image-virtual-hwe-20.04 \ + linux-image-extra-virtual-hwe-20.04 usable \ - linux-image-s390x -unusable \ - linux-image-s390x-tape + linux-image-generic diff -pruN 1.158/library.sh 1.158ubuntu7/library.sh --- 1.158/library.sh 2014-07-08 05:10:21.000000000 +0000 +++ 1.158ubuntu7/library.sh 2020-04-14 22:47:21.000000000 +0000 @@ -40,6 +40,8 @@ IFS_ORIG="$IFS" NL=" " +TITLE_TEMPLATE=debian-installer/bootstrap-base/title + log() { logger -t base-installer "$@" } @@ -307,7 +309,11 @@ get_mirror_info () { MIRROR="" DIRECTORY="/cdrom/" if [ -s /cdrom/.disk/base_components ]; then - COMPONENTS=`grep -v '^#' /cdrom/.disk/base_components | tr '\n' , | sed 's/,$//'` + if db_get apt-setup/restricted && [ "$RET" = false ]; then + COMPONENTS=`grep -v '^#' /cdrom/.disk/base_components | egrep -v '^(restricted|multiverse)$' | tr '\n' , | sed 's/,$//'` + else + COMPONENTS=`grep -v '^#' /cdrom/.disk/base_components | tr '\n' , | sed 's/,$//'` + fi else COMPONENTS="*" fi @@ -335,7 +341,11 @@ get_mirror_info () { db_get mirror/$PROTOCOL/directory || mirror_error=1 DIRECTORY="$RET" - COMPONENTS="main" + if db_get apt-setup/restricted && [ "$RET" = false ]; then + COMPONENTS="main" + else + COMPONENTS="main,restricted" + fi if [ "$mirror_error" = 1 ] || [ -z "$PROTOCOL" ] || [ -z "$MIRROR" ]; then exit_error base-installer/cannot_install @@ -345,9 +355,15 @@ get_mirror_info () { kernel_update_list () { # Use 'uniq' to avoid listing the same kernel more then once - chroot /target apt-cache search "^(kernel|$KERNEL_NAME)-image" | \ - cut -d" " -f1 | grep -v "linux-image-2.6" | uniq > "$KERNEL_LIST.unfiltered" - kernels=`sort -r "$KERNEL_LIST.unfiltered" | tr '\n' ' ' | sed -e 's/ $//'` + (set +e; + # Hack to get the metapackages in the right order; should be + # replaced by something better at some point. + chroot /target apt-cache search ^linux- | grep '^linux-\(amd64\|686\|k7\|generic\|lowlatency\|server\|virtual\|preempt\|rt\|xen\|oem-20.04\|power\|cell\|omap\|omap4\|keystone\)'; + chroot /target apt-cache search ^linux-image- | grep -v '^linux-image-[2-9]\.'; + chroot /target apt-cache search ^kfreebsd-image; + chroot /target apt-cache search ^gnumach-image) | \ + cut -d" " -f1 | uniq > "$KERNEL_LIST.unfiltered" + kernels=`< "$KERNEL_LIST.unfiltered" tr '\n' ' ' | sed -e 's/ $//'` for candidate in $kernels; do if [ -n "$FLAVOUR" ]; then if arch_check_usable_kernel "$candidate" "$FLAVOUR"; then @@ -370,13 +386,25 @@ kernel_present () { pick_kernel () { kernel_update_list - db_settitle debian-installer/bootstrap-base/title + db_settitle "$TITLE_TEMPLATE" + + # Check for overrides + if db_get base-installer/kernel/override-image && [ "$RET" ]; then + if kernel_present "$RET"; then + KERNEL="$RET" + info "Using kernel '$KERNEL'" + db_set base-installer/kernel/image "$KERNEL" + return + else + warning "Kernel override '$RET' not present" + fi + fi # For now, only present kernels we believe to be usable. We may have # to rethink this later, but if there are no usable kernels it # should be accompanied by an error message. The default must still # be usable if possible. - kernels=$(sort "$KERNEL_LIST" | tr '\n' ',' | sed -e 's/,$//') + kernels=`< "$KERNEL_LIST" tr '\n' ',' | sed -e 's/,$//'` info "Found kernels '$kernels'" @@ -442,18 +470,10 @@ pick_kernel () { # No recommendations available; try to guess. kernels="$(echo "$kernels" | sed 's/,/\n/g')" - # Try to default to running kernel version. - KVERS=$(uname -r | cut -d'-' -f 1) - KERNEL="$(echo "$kernels" | grep -- "-$KVERS" | head -n 1)" - if [ -z "$KERNEL" ]; then - # If possible, find one with at least the same major number - # as the currently running kernel. - KERNEL="$(echo "$kernels" | grep -- "-$KERNEL_MAJOR" | head -n 1)" - if [ -z "$KERNEL" ]; then - # Take the first on the list. - KERNEL=$(echo "$kernels" | head -n 1) - fi - fi + # Take the first on the list. kernel_update_list orders the + # list in such a way that the metapackages always come + # first, in the right order. + KERNEL=$(echo "$kernels" | head -n 1) fi if [ "$KERNEL" ]; then @@ -480,7 +500,7 @@ install_kernel_linux () { return fi - target_kernel_major="$(echo "$KERNEL" | sed 's/^kernel-image-//; s/^linux-image-//; s/-.*//' | cut -d . -f 1,2)" + target_kernel_major="$(echo "$KERNEL" | sed 's/^kernel-image-//; s/^linux-\(\|signed-\)image-//; s/-.*//' | cut -d . -f 1,2)" case $target_kernel_major in 2.?) ;; [3-9].*) @@ -518,7 +538,7 @@ install_kernel_linux () { fi else warning "Failed to get debconf answer 'base-installer/kernel/linux/link_in_boot'." - link_in_boot=no + link_in_boot=yes fi # Create configuration file for kernel-package @@ -542,10 +562,10 @@ EOF if [ "$do_initrd" = yes ]; then rd_generator=initramfs-tools - # initramfs-tools needs busybox pre-installed (and only - # recommends it) - if ! log-output -t base-installer apt-install busybox; then - db_subst base-installer/kernel/failed-package-install PACKAGE busybox + # initramfs-tools needs busybox-initramfs pre-installed (and + # only recommends it) + if ! log-output -t base-installer apt-install busybox-initramfs; then + db_subst base-installer/kernel/failed-package-install PACKAGE busybox-initramfs exit_error base-installer/kernel/failed-package-install fi @@ -575,7 +595,7 @@ EOF db_get base-installer/kernel/linux/initramfs-tools/driver-policy db_set base-installer/initramfs-tools/driver-policy "$RET" fi - db_settitle debian-installer/bootstrap-base/title + db_settitle "$TITLE_TEMPLATE" db_input medium base-installer/initramfs-tools/driver-policy || true if ! db_go; then db_progress stop @@ -665,7 +685,35 @@ EOF db_progress INFO base-installer/section/install_kernel_package log-output -t base-installer apt-install "$KERNEL" || kernel_install_failed=$? - # Advance progress bar to 90% of allocated space for install_kernel_linux + db_get base-installer/kernel/headers + if [ "$RET" = true ]; then + # Advance progress bar to 80% of allocated space for install_kernel_linux + update_progress 80 100 + + # Install kernel headers if possible + HEADERS="$(echo "$KERNEL" | sed 's/linux\(-image\|\)/linux-headers/')" + db_subst base-installer/section/install_kernel_package SUBST0 "$HEADERS" + db_progress INFO base-installer/section/install_kernel_package + log-output -t base-installer apt-install "$HEADERS" || true + fi + + db_get base-installer/kernel/backports-modules + if [ "$RET" ]; then + BACKPORTS_MODULES="$RET" + + # Advance progress bar to 85% of allocated space for install_kernel_linux + update_progress 85 100 + + # Install kernel backports modules if possible + for backports_module in $BACKPORTS_MODULES; do + LBM="$(echo "$KERNEL" | sed "s/linux\\(-image\\|\\)/linux-backports-modules-$backports_module-$DISTRIBUTION/")" + db_subst base-installer/section/install_kernel_package SUBST0 "$LBM" + db_progress INFO base-installer/section/install_kernel_package + log-output -t base-installer apt-install "$LBM" || true + done + fi + + # Advance progress bar to 90% of allocated space for install_linux update_progress 90 100 if [ -f /target/etc/kernel-img.conf.$$ ]; then @@ -867,15 +915,83 @@ EOT chroot /target apt-cdrom add $APT_SOURCES + echo "deb $APTSOURCE $DISTRIBUTION-updates $COMPONENTS" >> $APT_SOURCES + if db_get apt-setup/security_host; then + SECMIRROR="$RET" + else + SECMIRROR="$MIRROR" + fi + if db_get apt-setup/security_path; then + SECDIRECTORY="$RET" + else + SECDIRECTORY=/ubuntu + fi + + if [ "$MIRROR" = ports.ubuntu.com ]; then + # Awful Ubuntu-specific hack. *-security suites for ports + # architectures aren't available on security.ubuntu.com, only on + # ports.ubuntu.com. + SECMIRROR="$MIRROR" + SECDIRECTORY="$DIRECTORY" + fi + + echo "deb $PROTOCOL://$SECMIRROR$SECDIRECTORY $DISTRIBUTION-security $COMPONENTS" >> $APT_SOURCES + if db_get apt-setup/proposed && [ "$RET" = true ]; then + echo "deb $APTSOURCE $DISTRIBUTION-proposed $COMPONENTS" >> $APT_SOURCES + fi + if db_get apt-setup/overlay && [ "$RET" = true ]; then + db_get apt-setup/overlay_host + overlay_host="$RET" + db_get apt-setup/overlay_directory + overlay_directory="$RET" + db_get apt-setup/overlay_components + overlay_components="$RET" + + echo "deb $PROTOCOL://$overlay_host$overlay_directory $DISTRIBUTION $overlay_components" >> $APT_SOURCES + fi + if db_get apt-setup/local0/repository; then + repository="${RET#deb }" + echo "deb $repository" >> $APT_SOURCES + fi fi } cleanup () { rm -f "$KERNEL_LIST" "$KERNEL_LIST.unfiltered" } + +configure_apt_overlay () { + if db_get apt-setup/overlay && [ "$RET" = true ]; then + if db_get apt-setup/overlay_early_apt_pkg_install && [ "$RET" ]; then + early_pkg_list=$RET + + # We need to run apt-get update to get the PPA's package list + # Don't check error codes here; we will have a GPG error + log-output -t base-installer chroot /target apt-get update + + # Install our packages + # + # We force GPG checks and assume the packages we install + # will give us our keyring. At this pount, we've already + # run debootstrap, and haven't checked its GPG key + # so its sane to force this through. + # + # apt_update will check all the keys it has for all releases + log-output -t base-installer chroot /target \ + apt-get -o APT::Get::AllowUnauthenticated=true install $early_pkg_list || apt_overlay_install_failed=$? + + if [ "$apt_overlay_install_failed" ]; then + warning "apt overlay install failed: $apt_overlay_install_failed" + fi + fi + fi +}