Author: cts
Date: Tue May 15 20:37:10 2007
New Revision: 8586
Log:
fix image type plain building for m68k
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/disable-mac-broken-config-options.diff
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
dists/trunk/linux-2.6/debian/rules.real
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/disable-mac-broken-config-options.diff
==============================================================================
--- (empty file)
+++
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/disable-mac-broken-config-options.diff
Tue May 15 20:37:10 2007
@@ -0,0 +1,21 @@
+Index: linux-2.6-2.6.21/drivers/parport/Kconfig
+===================================================================
+--- linux-2.6-2.6.21.orig/drivers/parport/Kconfig 2007-05-13
20:53:39.000000000 +0200
++++ linux-2.6-2.6.21/drivers/parport/Kconfig 2007-05-13 20:58:46.000000000
+0200
+@@ -9,6 +9,7 @@
+
+ config PARPORT
+ tristate "Parallel port support"
++ depends on (!MAC || BROKEN)
+ ---help---
+ If you want to use devices connected to your machine's parallel port
+ (the connector at the computer with 25 holes), e.g. printer, ZIP
+@@ -34,7 +35,7 @@
+
+ config PARPORT_PC
+ tristate "PC-style hardware"
+- depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
++ depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV &&
(!MAC || BROKEN)
+ ---help---
+ You should say Y here if you have a PC-style parallel port. All
+ IBM PC compatible computers and some Alphas have PC-style
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra Tue May
15 20:37:10 2007
@@ -46,7 +46,7 @@
+ bugfix/m68k/630-extern-cleanup.diff m68k
#+ bugfix/m68k/633-atari_scc.diff m68k
+ bugfix/m68k/130-adbraw.diff m68k
-+ bugfix/m68k/133-arch.diff m68k
+#+ bugfix/m68k/133-arch.diff m68k
+ bugfix/m68k/134-atari-fat.diff m68k
+ bugfix/m68k/141-ide.diff m68k
+ bugfix/m68k/143-ioext.diff m68k
@@ -70,3 +70,4 @@
+ bugfix/m68k/via-pmu68k-dead-code.diff m68k
+ bugfix/m68k/dmasound_paula.diff m68k
++ bugfix/m68k/disable-mac-broken-config-options.diff m68k
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Tue May 15 20:37:10 2007
@@ -422,7 +422,8 @@
install-image-i386-$(SUBARCH)-$(FLAVOUR)-plain_image:
cp '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage'
$(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image:
+install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image \
+install-image-m68k-$(SUBARCH)-$(FLAVOUR)-plain_image:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image:
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
