tieto team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1687
committer: Colin Watson <cjwatson@xxxxxxxxxxxxx>
branch nick: ubuntu
timestamp: Fri 2012-05-04 09:57:07 +0100
message:
  Remove the non-pae builds on i386, since the kernel no longer builds the
  -generic flavour there.
removed:
  build/config/i386/cdrom/non-pae.cfg
  build/config/i386/hd-media/non-pae.cfg
  build/config/i386/netboot/non-pae.cfg
modified:
  build/config/i386/cdrom.cfg
  build/config/i386/hd-media.cfg
  build/config/i386/netboot.cfg
  debian/changelog


--
lp:~ubuntu-core-dev/debian-installer/ubuntu
https://code.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu

Your team Tieto is subscribed to branch lp:~ubuntu-core-dev/debian-installer/ubuntu.
To unsubscribe from this branch go to https://code.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu/+edit-subscription

=== modified file 'build/config/i386/cdrom.cfg'
--- build/config/i386/cdrom.cfg	2012-03-15 18:41:26 +0000
+++ build/config/i386/cdrom.cfg	2012-05-04 08:57:07 +0000
@@ -1,5 +1,5 @@
 # el-torito is too large at the moment, so is disabled.
-FLAVOUR_SUPPORTED = isolinux gtk non-pae #el-torito
+FLAVOUR_SUPPORTED = isolinux gtk #el-torito
 
 MEDIA_TYPE = CD-ROM
 

=== removed file 'build/config/i386/cdrom/non-pae.cfg'
--- build/config/i386/cdrom/non-pae.cfg	2012-03-15 18:41:26 +0000
+++ build/config/i386/cdrom/non-pae.cfg	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
-
-MANIFEST-KERNEL = "kernel for use with isolinux to build a CD (non-PAE)"
-MANIFEST-INITRD = "initrd for use with isolinux to build a CD (non-PAE)"
-MANIFEST-DEBIAN_CD_INFO = "isolinux help screens for CD (non-PAE)"
-
-TYPE = cdrom/isolinux/non-pae
-
-EXTRANAME = non-pae/
-
-KERNELVERSION = $(BASEVERSION)-generic

=== modified file 'build/config/i386/hd-media.cfg'
--- build/config/i386/hd-media.cfg	2012-04-11 23:35:36 +0000
+++ build/config/i386/hd-media.cfg	2012-05-04 08:57:07 +0000
@@ -1,4 +1,4 @@
-FLAVOUR_SUPPORTED = "" gtk non-pae
+FLAVOUR_SUPPORTED = "" gtk
 
 # Not really a floppy, this is a 783 mb image, large enough to put an
 # Ubuntu iso in, and small enough to fit on a mid-range memory stick, 

=== removed file 'build/config/i386/hd-media/non-pae.cfg'
--- build/config/i386/hd-media/non-pae.cfg	2012-04-11 23:36:19 +0000
+++ build/config/i386/hd-media/non-pae.cfg	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-MANIFEST-BOOT = "800 mb image (compressed) for USB memory stick (non-PAE)"
-MANIFEST-INITRD = "for use on USB memory sticks (non-PAE)"
-MANIFEST-KERNEL = "for use on USB memory sticks (non-PAE)"
-
-EXTRANAME = non-pae/
-
-KERNELVERSION = $(BASEVERSION)-generic

=== modified file 'build/config/i386/netboot.cfg'
--- build/config/i386/netboot.cfg	2012-04-04 16:10:02 +0000
+++ build/config/i386/netboot.cfg	2012-05-04 08:57:07 +0000
@@ -1,4 +1,4 @@
-FLAVOUR_SUPPORTED = "" non-pae
+FLAVOUR_SUPPORTED = ""
 
 MEDIA_TYPE = netboot image
 

=== removed file 'build/config/i386/netboot/non-pae.cfg'
--- build/config/i386/netboot/non-pae.cfg	2011-12-15 15:33:29 +0000
+++ build/config/i386/netboot/non-pae.cfg	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-EXTRANAME = non-pae/
-
-KERNELVERSION = $(BASEVERSION)-generic

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-04 08:38:49 +0000
+++ debian/changelog	2012-05-04 08:57:07 +0000
@@ -1,3 +1,10 @@
+debian-installer (20101020ubuntu139) UNRELEASED; urgency=low
+
+  * Remove the non-pae builds on i386, since the kernel no longer builds the
+    -generic flavour there.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Fri, 04 May 2012 09:56:05 +0100
+
 debian-installer (20101020ubuntu138) quantal; urgency=low
 
   * Move to 3.4.0-1 kernels.