diff options
| author | Christian T. Steigies <cts@debian.org> | 2007-05-17 16:10:03 +0000 |
|---|---|---|
| committer | Christian T. Steigies <cts@debian.org> | 2007-05-17 16:10:03 +0000 |
| commit | 3cc7bbe61ec3c4f8342dbdc9484400729f51ec7d (patch) | |
| tree | ab5a24c24f40b65e8e813530049b0e500f3dc1ab | |
| parent | 668954d9271f4eb21863d5fc8af09324d25f059d (diff) | |
| download | kernel_replicant_linux-3cc7bbe61ec3c4f8342dbdc9484400729f51ec7d.tar.gz kernel_replicant_linux-3cc7bbe61ec3c4f8342dbdc9484400729f51ec7d.tar.bz2 kernel_replicant_linux-3cc7bbe61ec3c4f8342dbdc9484400729f51ec7d.zip | |
fix atari-scc patch and m68k install target
svn path=/dists/trunk/linux-2.6/; revision=8595
| -rw-r--r-- | debian/patches/bugfix/m68k/633-atari_scc.diff | 8 | ||||
| -rw-r--r-- | debian/rules.real | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/patches/bugfix/m68k/633-atari_scc.diff b/debian/patches/bugfix/m68k/633-atari_scc.diff index 11897918653e..66a74f2bfb7f 100644 --- a/debian/patches/bugfix/m68k/633-atari_scc.diff +++ b/debian/patches/bugfix/m68k/633-atari_scc.diff @@ -23,11 +23,11 @@ Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> drivers/char/atari_scc.c | 1701 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1702 insertions(+) ---- linux-m68k-2.6.21.orig/drivers/char/Makefile -+++ linux-m68k-2.6.21/drivers/char/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_DIGIEPCA) += epca.o - obj-$(CONFIG_SPECIALIX) += specialix.o +--- linux-2.6-2.6.21.orig/drivers/char/Makefile 2007-05-17 17:59:28.000000000 +0200 ++++ linux-2.6-2.6.21/drivers/char/Makefile 2007-05-17 18:00:10.000000000 +0200 +@@ -30,6 +30,7 @@ obj-$(CONFIG_MOXA_INTELLIO) += moxa.o + obj-$(CONFIG_SIBYTE_SB1250_DUART) += sb1250_duart.o obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o +obj-$(CONFIG_ATARI_SCC) += atari_scc.o generic_serial.o obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o diff --git a/debian/rules.real b/debian/rules.real index a9ab72e45c51..c2bed46ac9c0 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -422,8 +422,10 @@ install-image-amd64-$(SUBARCH)-$(FLAVOUR)-plain_image \ 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-m68k-$(SUBARCH)-$(FLAVOUR)-plain_image: + install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION) + +install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image: install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION) install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image: |