Hello all, Here goes the patch for last review before I commit it.
After think about what Frans said, that it can take longer before we have g-i working again, I followed his suggestion and went further and redoing the patch commenting the stuff out instead of dropping it. I got a machine with disk space to build cowbuilder chroots for amd64 and i386, so I tested both builds. I also found a broken in my previous patch regarding hd-media for amd64 (and as consequence for i386) that is fixed as well. Cheers, -- Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
From 1f1215c3dc357becf77820af46fe4bf263a4cff6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <[email protected]> Date: Wed, 25 Nov 2009 17:23:25 -0200 Subject: [PATCH] Disable GTK+ based images due #557387. This ought to be reverted once GTK+ DFB backend is fixed. --- installer/build/config/amd64.cfg | 3 ++- installer/build/config/amd64/cdrom-xen.cfg | 9 ++++++--- installer/build/config/amd64/cdrom.cfg | 2 +- installer/build/config/amd64/hd-media.cfg | 8 ++++---- installer/build/config/amd64/netboot-xen.cfg | 12 ++++++++---- installer/build/config/i386.cfg | 3 ++- installer/build/config/i386/cdrom-xen.cfg | 6 ++++-- installer/build/config/i386/cdrom.cfg | 2 +- installer/build/config/i386/cdrom/isolinux.cfg | 5 +++-- installer/build/config/i386/hd-media.cfg | 8 ++++---- installer/build/config/i386/netboot-xen.cfg | 3 ++- installer/build/config/powerpc/powerpc.cfg | 2 +- installer/build/config/powerpc/powerpc64.cfg | 2 +- installer/debian/changelog | 4 ++++ 14 files changed, 43 insertions(+), 26 deletions(-) diff --git a/installer/build/config/amd64.cfg b/installer/build/config/amd64.cfg index da8f361..5dba11a 100644 --- a/installer/build/config/amd64.cfg +++ b/installer/build/config/amd64.cfg @@ -1,4 +1,5 @@ -MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media +MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-xen hd-media +#MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media MEDIUM_SUPPORTED_EXTRA = monolithic # The version of the kernel to use. diff --git a/installer/build/config/amd64/cdrom-xen.cfg b/installer/build/config/amd64/cdrom-xen.cfg index 2b4fd1b..d65750c 100644 --- a/installer/build/config/amd64/cdrom-xen.cfg +++ b/installer/build/config/amd64/cdrom-xen.cfg @@ -1,4 +1,5 @@ -TYPE=cdrom/gtk +TYPE=cdrom/isolinux +#TYPE=cdrom/gtk EXTRANAME=cdrom/xen/ @@ -9,6 +10,8 @@ MANIFEST-XENCFG = "example Xen configuration" XEN_INSTALL_METHOD = cdrom TARGET = $(KERNEL) $(INITRD) xen_config SYMLINK_KERNEL = ../vmlinuz -SYMLINK_INITRD = ../gtk/initrd.gz +SYMLINK_INITRD = ../initrd.gz +#SYMLINK_INITRD = ../gtk/initrd.gz -EXTRATARGETS = build_cdrom_gtk +EXTRATARGETS = build_cdrom +#EXTRATARGETS = build_cdrom_gtk diff --git a/installer/build/config/amd64/cdrom.cfg b/installer/build/config/amd64/cdrom.cfg index 5678ba5..99026cd 100644 --- a/installer/build/config/amd64/cdrom.cfg +++ b/installer/build/config/amd64/cdrom.cfg @@ -1,5 +1,5 @@ # el-torito is too large at the moment, so is disabled. -FLAVOUR_SUPPORTED = isolinux gtk #el-torito +FLAVOUR_SUPPORTED = isolinux #gtk #el-torito MEDIA_TYPE = CD-ROM diff --git a/installer/build/config/amd64/hd-media.cfg b/installer/build/config/amd64/hd-media.cfg index f145d2d..44bd76f 100644 --- a/installer/build/config/amd64/hd-media.cfg +++ b/installer/build/config/amd64/hd-media.cfg @@ -1,4 +1,4 @@ -FLAVOUR_SUPPORTED = "" gtk +FLAVOUR_SUPPORTED = "" #gtk # Not really a floppy, this is a 239 mb image, large enough to put a # netinst iso in, and small enough to fit on a mid-range memory stick, @@ -12,9 +12,9 @@ GZIPPED = .gz EXTRANAME = hd-media/ # Add the gtk images on to the bootable image. -EXTRATARGETS = build_hd-media_gtk -INITRD_GTK = dest/hd-media/gtk/initrd.gz -TARGET = $(KERNEL) $(INITRD) $(BOOT) +#EXTRATARGETS = build_hd-media_gtk +#INITRD_GTK = dest/hd-media/gtk/initrd.gz +#TARGET = $(KERNEL) $(INITRD) $(BOOT) MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick" MANIFEST-INITRD = "for use on USB memory sticks" diff --git a/installer/build/config/amd64/netboot-xen.cfg b/installer/build/config/amd64/netboot-xen.cfg index 0997d9f..c74b1ed 100644 --- a/installer/build/config/amd64/netboot-xen.cfg +++ b/installer/build/config/amd64/netboot-xen.cfg @@ -1,4 +1,5 @@ -TYPE=netboot/gtk +TYPE=netboot +#TYPE=netboot/gtk EXTRANAME=netboot/xen/ @@ -8,7 +9,10 @@ MANIFEST-XENCFG = "example Xen configuration" XEN_INSTALL_METHOD = network TARGET = $(KERNEL) $(INITRD) xen_config -SYMLINK_KERNEL = ../gtk/debian-installer/amd64/linux -SYMLINK_INITRD = ../gtk/debian-installer/amd64/initrd.gz +SYMLINK_KERNEL = ../debian-installer/amd64/linux +SYMLINK_INITRD = ../debian-installer/amd64/initrd.gz +#SYMLINK_KERNEL = ../gtk/debian-installer/amd64/linux +#SYMLINK_INITRD = ../gtk/debian-installer/amd64/initrd.gz -EXTRATARGETS = build_netboot-gtk +EXTRATARGETS = build_netboot +#EXTRATARGETS = build_netboot_gtk diff --git a/installer/build/config/i386.cfg b/installer/build/config/i386.cfg index 686ef0b..45fa827 100644 --- a/installer/build/config/i386.cfg +++ b/installer/build/config/i386.cfg @@ -1,4 +1,5 @@ -MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media #floppy +MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-xen hd-media #floppy +#MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media #floppy MEDIUM_SUPPORTED_EXTRA = monolithic # The version of the kernel to use. diff --git a/installer/build/config/i386/cdrom-xen.cfg b/installer/build/config/i386/cdrom-xen.cfg index 12df916..96615ab 100644 --- a/installer/build/config/i386/cdrom-xen.cfg +++ b/installer/build/config/i386/cdrom-xen.cfg @@ -1,6 +1,8 @@ KERNELVERSION = $(BASEVERSION)-686-bigmem -TYPE=cdrom/gtk -include config/i386/cdrom/gtk.cfg +TYPE=cdrom/isolinux +include config/i386/cdrom/isolinux.cfg +#TYPE=cdrom/gtk +#include config/i386/cdrom/gtk.cfg EXTRANAME=cdrom/xen/ MANIFEST-KERNEL = "kernel image for installing under Xen" MANIFEST-INITRD = "initrd for installing under Xen" diff --git a/installer/build/config/i386/cdrom.cfg b/installer/build/config/i386/cdrom.cfg index 5678ba5..99026cd 100644 --- a/installer/build/config/i386/cdrom.cfg +++ b/installer/build/config/i386/cdrom.cfg @@ -1,5 +1,5 @@ # el-torito is too large at the moment, so is disabled. -FLAVOUR_SUPPORTED = isolinux gtk #el-torito +FLAVOUR_SUPPORTED = isolinux #gtk #el-torito MEDIA_TYPE = CD-ROM diff --git a/installer/build/config/i386/cdrom/isolinux.cfg b/installer/build/config/i386/cdrom/isolinux.cfg index c2576c4..78e2721 100644 --- a/installer/build/config/i386/cdrom/isolinux.cfg +++ b/installer/build/config/i386/cdrom/isolinux.cfg @@ -11,6 +11,7 @@ MANIFEST-DEBIAN_CD_INFO = "isolinux config files for CD" TYPE = cdrom/isolinux # Add the gtk images on to the isolinux info. -INITRD_GTK = dest/cdrom/gtk/initrd.gz +#INITRD_GTK = dest/cdrom/gtk/initrd.gz -EXTRATARGETS = build_cdrom_gtk +EXTRATARGETS = build_cdrom +#EXTRATARGETS = build_cdrom_gtk diff --git a/installer/build/config/i386/hd-media.cfg b/installer/build/config/i386/hd-media.cfg index f145d2d..44bd76f 100644 --- a/installer/build/config/i386/hd-media.cfg +++ b/installer/build/config/i386/hd-media.cfg @@ -1,4 +1,4 @@ -FLAVOUR_SUPPORTED = "" gtk +FLAVOUR_SUPPORTED = "" #gtk # Not really a floppy, this is a 239 mb image, large enough to put a # netinst iso in, and small enough to fit on a mid-range memory stick, @@ -12,9 +12,9 @@ GZIPPED = .gz EXTRANAME = hd-media/ # Add the gtk images on to the bootable image. -EXTRATARGETS = build_hd-media_gtk -INITRD_GTK = dest/hd-media/gtk/initrd.gz -TARGET = $(KERNEL) $(INITRD) $(BOOT) +#EXTRATARGETS = build_hd-media_gtk +#INITRD_GTK = dest/hd-media/gtk/initrd.gz +#TARGET = $(KERNEL) $(INITRD) $(BOOT) MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick" MANIFEST-INITRD = "for use on USB memory sticks" diff --git a/installer/build/config/i386/netboot-xen.cfg b/installer/build/config/i386/netboot-xen.cfg index 0b56b76..ec38c3c 100644 --- a/installer/build/config/i386/netboot-xen.cfg +++ b/installer/build/config/i386/netboot-xen.cfg @@ -1,5 +1,6 @@ KERNELVERSION = $(BASEVERSION)-686-bigmem -TYPE=netboot/gtk +TYPE=netboot +#TYPE=netboot/gtk include config/i386/netboot.cfg EXTRANAME=netboot/xen/ MANIFEST-KERNEL = "kernel image for installing under Xen" diff --git a/installer/build/config/powerpc/powerpc.cfg b/installer/build/config/powerpc/powerpc.cfg index 31d24c2..9f93120 100644 --- a/installer/build/config/powerpc/powerpc.cfg +++ b/installer/build/config/powerpc/powerpc.cfg @@ -1,4 +1,4 @@ -MEDIUM_SUPPORTED = cdrom netboot netboot-gtk hd-media # floppy +MEDIUM_SUPPORTED = cdrom netboot hd-media # floppy MEDIUM_SUPPORTED_EXTRA = monolithic # The version of the kernel to use. diff --git a/installer/build/config/powerpc/powerpc64.cfg b/installer/build/config/powerpc/powerpc64.cfg index a9d398b..b2e9f16 100644 --- a/installer/build/config/powerpc/powerpc64.cfg +++ b/installer/build/config/powerpc/powerpc64.cfg @@ -1,4 +1,4 @@ -MEDIUM_SUPPORTED = cdrom netboot netboot-gtk +MEDIUM_SUPPORTED = cdrom netboot MEDIUM_SUPPORTED_EXTRA = monolithic # The version of the kernel to use. diff --git a/installer/debian/changelog b/installer/debian/changelog index 6f03823..21deb9c 100644 --- a/installer/debian/changelog +++ b/installer/debian/changelog @@ -152,6 +152,10 @@ debian-installer (2009xxxx) UNRELEASED; urgency=low [ Joey Hess ] * Remove upx from build-deps, has not been used for over a year. + [ Otavio Salvador ] + * Disable GTK+ based images due #557387. This ought to be reverted + once GTK+ DFB backend is fixed. + -- Frans Pop <[email protected]> Sun, 08 Nov 2009 04:17:16 +0100 debian-installer (20090123) unstable; urgency=low -- 1.6.5.2.155.gbb47
