From df7affc8aa86e95085c1c537d2a78bbfe755fce2 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 1 Mar 2013 15:07:35 +0000 Subject: [PATCH] [mips,mipsel] Disable VGA_CONSOLE and ignore the corresponding ABI change. It is completely broken on MIPS. svn path=/dists/sid/linux/; revision=19878 --- debian/changelog | 8 ++++++++ debian/config/mips/config | 5 +++++ debian/config/mips/config.4kc-malta | 2 -- debian/config/mips/config.5kc-malta | 2 -- debian/config/mips/config.r4k-ip22 | 1 - debian/config/mips/config.r5k-ip32 | 1 - debian/config/mips/config.sb1-bcm91250a | 1 - debian/config/mips/config.sb1a-bcm91480b | 1 - debian/config/mips/defines | 5 +++++ debian/config/mipsel/config | 5 +++++ debian/config/mipsel/config.loongson-2f | 1 - debian/config/mipsel/config.r5k-cobalt | 5 ----- debian/config/mipsel/defines | 5 +++++ 13 files changed, 28 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d615c58c..d490e3afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux (3.2.39-2) UNRELEASED; urgency=high + + [ Aurelien Jarno] + * [mips,mipsel] Disable VGA_CONSOLE and ignore the corresponding ABI + change. It is completely broken on MIPS. + + -- Ben Hutchings Wed, 27 Feb 2013 03:48:30 +0000 + linux (3.2.39-2) unstable; urgency=high * [s390,s390x] virtio: Ignore ABI changes in 3.2.39 (fixes FTBFS) diff --git a/debian/config/mips/config b/debian/config/mips/config index c69fede01..017d3971f 100644 --- a/debian/config/mips/config +++ b/debian/config/mips/config @@ -7,3 +7,8 @@ CONFIG_CPU_BIG_ENDIAN=y ## end choice # CONFIG_RAPIDIO is not set +## +## file: drivers/video/console/Kconfig +## +# CONFIG_VGA_CONSOLE is not set + diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index b1b25bf36..65a445411 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1034,8 +1034,6 @@ CONFIG_FB_VIRTUAL=m ## ## file: drivers/video/console/Kconfig ## -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 441b71628..b5ebd67a3 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1038,8 +1038,6 @@ CONFIG_FB_VIRTUAL=m ## ## file: drivers/video/console/Kconfig ## -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index 92d62f9d7..7a0ad0c1e 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -457,7 +457,6 @@ CONFIG_FB=y ## ## file: drivers/video/console/Kconfig ## -# CONFIG_VGA_CONSOLE is not set # CONFIG_MDA_CONSOLE is not set CONFIG_SGI_NEWPORT_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 4ff39a62b..449af7d3a 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -572,7 +572,6 @@ CONFIG_FB_GBE_MEM=4 ## ## file: drivers/video/console/Kconfig ## -# CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 919d8f2b2..73c5f78b0 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -723,7 +723,6 @@ CONFIG_FB_TRIDENT=m ## ## file: drivers/video/console/Kconfig ## -# CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 9f63c3149..affe4bc6e 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -729,7 +729,6 @@ CONFIG_FB_TRIDENT=m ## ## file: drivers/video/console/Kconfig ## -# CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set diff --git a/debian/config/mips/defines b/debian/config/mips/defines index ee65d8872..41578b35c 100644 --- a/debian/config/mips/defines +++ b/debian/config/mips/defines @@ -1,3 +1,8 @@ +[abi] +ignore-changes: +# vgacon is broken and unusable on MIPS + vgacon_* + [base] flavours: r4k-ip22 diff --git a/debian/config/mipsel/config b/debian/config/mipsel/config index 5c423891b..736311e49 100644 --- a/debian/config/mipsel/config +++ b/debian/config/mipsel/config @@ -6,3 +6,8 @@ CONFIG_CPU_LITTLE_ENDIAN=y ## end choice +## +## file: drivers/video/console/Kconfig +## +# CONFIG_VGA_CONSOLE is not set + diff --git a/debian/config/mipsel/config.loongson-2f b/debian/config/mipsel/config.loongson-2f index 72f280edb..80d4e63cb 100644 --- a/debian/config/mipsel/config.loongson-2f +++ b/debian/config/mipsel/config.loongson-2f @@ -128,6 +128,5 @@ CONFIG_BACKLIGHT_GENERIC=m ## ## file: drivers/video/console/Kconfig ## -# CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 8db8b9a98..7e45b50cb 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -695,11 +695,6 @@ CONFIG_USB_MON=y CONFIG_FB=m CONFIG_FB_COBALT=m -## -## file: drivers/video/console/Kconfig -## -# CONFIG_VGA_CONSOLE is not set - ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines index c96622ee0..1a111fb29 100644 --- a/debian/config/mipsel/defines +++ b/debian/config/mipsel/defines @@ -1,3 +1,8 @@ +[abi] +ignore-changes: +# vgacon is broken and unusable on MIPS + vgacon_* + [base] flavours: r5k-cobalt