[RFC] Patch to disable GTK in installer images
Hello,
To avoid delaying the installer release we intend to disable the GTK
frontend for this Alpha1 release. So far, I started to work on the
patch for it.
We need to disable it at:
- amd64
- i386
- powerpc
I guess I did it but would be nice to have a review on the patch
before commiting it. My idea is to commit it and upload installer.
Once installer is built in all arches revert it back to force testing
of GTK frontend in daily images again.
Comments?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
From 0001b43a2dd30d59c645aeaa00c561d720122510 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
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 | 2 +-
installer/build/config/amd64/cdrom-xen.cfg | 6 +-----
installer/build/config/amd64/cdrom.cfg | 2 +-
installer/build/config/amd64/hd-media.cfg | 7 +------
installer/build/config/amd64/netboot-xen.cfg | 8 +++-----
installer/build/config/i386.cfg | 2 +-
installer/build/config/powerpc/powerpc.cfg | 2 +-
installer/build/config/powerpc/powerpc64.cfg | 2 +-
installer/debian/changelog | 4 ++++
9 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/installer/build/config/amd64.cfg b/installer/build/config/amd64.cfg
index da8f361..22e6baa 100644
--- a/installer/build/config/amd64.cfg
+++ b/installer/build/config/amd64.cfg
@@ -1,4 +1,4 @@
-MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
+MEDIUM_SUPPORTED = cdrom cdrom-xen netboot 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 97b4c32..dd87293 100644
--- a/installer/build/config/amd64/cdrom-xen.cfg
+++ b/installer/build/config/amd64/cdrom-xen.cfg
@@ -1,5 +1,3 @@
-TYPE=cdrom/gtk
-
EXTRANAME=cdrom/xen/
MANIFEST-KERNEL = "kernel image for installing under Xen"
@@ -8,6 +6,4 @@ MANIFEST-XENCFG = "example Xen configuration"
TARGET = $(KERNEL) $(INITRD) xen_config
SYMLINK_KERNEL = ../vmlinuz
-SYMLINK_INITRD = ../gtk/initrd.gz
-
-EXTRATARGETS = build_cdrom_gtk
+SYMLINK_INITRD = ../initrd.gz
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..982286c 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 = ""
# 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,
@@ -11,11 +11,6 @@ MEDIA_TYPE = bootable drive
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)
-
MANIFEST-BOOT = "256 mb image (compressed) for USB memory stick"
MANIFEST-INITRD = "for use on USB memory sticks"
MANIFEST-KERNEL = "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 075af41..cc8c28e 100644
--- a/installer/build/config/amd64/netboot-xen.cfg
+++ b/installer/build/config/amd64/netboot-xen.cfg
@@ -1,5 +1,3 @@
-TYPE=netboot/gtk
-
EXTRANAME=netboot/xen/
MANIFEST-KERNEL = "kernel image for installing under Xen"
@@ -7,7 +5,7 @@ MANIFEST-INITRD = "initrd for installing under Xen"
MANIFEST-XENCFG = "example Xen configuration"
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
-EXTRATARGETS = build_netboot-gtk
+EXTRATARGETS = build_netboot
diff --git a/installer/build/config/i386.cfg b/installer/build/config/i386.cfg
index 686ef0b..76fc0ea 100644
--- a/installer/build/config/i386.cfg
+++ b/installer/build/config/i386.cfg
@@ -1,4 +1,4 @@
-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_EXTRA = monolithic
# The version of the kernel to use.
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 <fjp@debian.org> Sun, 08 Nov 2009 04:17:16 +0100
debian-installer (20090123) unstable; urgency=low
--
1.6.5.2.155.gbb47
Reply to: