[kernel] r8193 - in dists/trunk/linux-2.6/debian: . patches/debian
patches/series
Bastian Blank
waldi at alioth.debian.org
Tue Jan 16 15:52:59 CET 2007
Author: waldi
Date: Tue Jan 16 15:52:58 2007
New Revision: 8193
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/version.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
* debian/changelog: Set version to 2.6.20~rc5-1~experimental.1.
* debian/patches/debian/version.patch: Update.
* debian/patches/series/1~experimental.1: Disable efika patches.
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Tue Jan 16 15:52:58 2007
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.20~rc4-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.20~rc5-1~experimental.1) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* mipsel: Drop DECstation support (both r3k-kn02 and r4k-kn04).
Modified: dists/trunk/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/version.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/version.patch Tue Jan 16 15:52:58 2007
@@ -1,35 +1,31 @@
-diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
-index 92ea774..bbab264 100644
---- a/fs/proc/proc_misc.c
-+++ b/fs/proc/proc_misc.c
-@@ -254,10 +254,18 @@ static int version_read_proc(char *page, char **start, off_t off,
- {
- int len;
-
-- /* FIXED STRING! Don't touch! */
- len = snprintf(page, PAGE_SIZE,
- "%s version %s"
+diff --git a/init/version.c b/init/version.c
+index 6c01ec1..e1833e5 100644
+--- a/init/version.c
++++ b/init/version.c
+@@ -34,12 +34,31 @@ struct uts_namespace init_uts_ns = {
+ };
+ EXPORT_SYMBOL_GPL(init_uts_ns);
+
+-/* FIXED STRINGS! Don't touch! */
+ const char linux_banner[] =
+- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
++ "Linux version " UTS_RELEASE
+#ifdef LINUX_COMPILE_SYSTEM_OFFICIAL
-+ " (" LINUX_COMPILE_SYSTEM_DISTRIBUTION " "
-+ LINUX_COMPILE_SYSTEM_VERSION ")"
-+ " (" LINUX_COMPILE_SYSTEM_MAINTAINER ")"
++ " (" LINUX_COMPILE_SYSTEM_DISTRIBUTION " "
++ LINUX_COMPILE_SYSTEM_VERSION ")"
++ " (" LINUX_COMPILE_SYSTEM_MAINTAINER ")"
+#else
+# ifdef LINUX_COMPILE_SYSTEM_VERSION
-+ " (" LINUX_COMPILE_SYSTEM_VERSION ")"
++ " (" LINUX_COMPILE_SYSTEM_VERSION ")"
+# endif
- " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
++ " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+#endif
- " (" LINUX_COMPILER ")"
- " %s\n",
- utsname()->sysname,
-diff --git a/init/main.c b/init/main.c
-index 2b1cdaa..f860297 100644
---- a/init/main.c
-+++ b/init/main.c
-@@ -484,7 +484,16 @@ void __init __attribute__((weak)) smp_setup_processor_id(void)
++ " (" LINUX_COMPILER ")"
++ " " UTS_VERSION "\n";
- static const char linux_banner[] =
- "Linux version " UTS_RELEASE
+ const char linux_proc_banner[] =
+ "%s version %s"
+#ifdef LINUX_COMPILE_SYSTEM_OFFICIAL
+ " (" LINUX_COMPILE_SYSTEM_DISTRIBUTION " "
+ LINUX_COMPILE_SYSTEM_VERSION ")"
@@ -40,10 +36,7 @@
+# endif
" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+#endif
- " (" LINUX_COMPILER ")"
- " " UTS_VERSION "\n";
-
-diff --git a/init/version.c b/init/version.c
+ " (" LINUX_COMPILER ") %s\n";
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index d7b8a38..87035a0 100755
--- a/scripts/mkcompile_h
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Tue Jan 16 15:52:58 2007
@@ -27,34 +27,3 @@
+ bugfix/Makefile-localversion-backup.patch
+ bugfix/drivers-bus_to_virt.patch
-+ features/powerpc/efika/0001-powerpc-serial-Dispose-irq-mapping-when-done-in-mpc52xx_serial.c.txt
-+ features/powerpc/efika/0002-powerpc-52xx-Don-t-use-device_initcall-to-probe-of_platform_bus.txt
-+ features/powerpc/efika/0004-powerpc-Use-common-52xx-of_platform-probe-code-for-EFIKA.txt
-+ features/powerpc/efika/0005-powerpc-Restore-proper-link-order-in-platform.txt
-+ features/powerpc/efika/0006-Rework-the-OHCI-quirk-mecanism-as-suggested-by-David.txt
-+ features/powerpc/efika/0007-Implement-support-for-split-endian-OHCI.txt
-+ features/powerpc/efika/0008-ohci-Rework-bus-glue-integration-to-allow-several-at-once.txt
-+ features/powerpc/efika/0009-ohci-Add-support-for-OHCI-controller-on-the-of_platform-bus.txt
-+ features/powerpc/efika/0010-libata-Add-support-for-the-MPC52xx-ATA-controller.txt
-+ features/powerpc/efika/0011-ohci-Whitespace-and-typo-fix-in-ohci-ppc-of.c.txt
-+ features/powerpc/efika/0012-ata-Fix-pata_mpc52xx.c-compatible-list.txt
-+ features/powerpc/efika/0013-powerpc-serial-Fix-mpc52xx_uart.c-compatible-list.txt
-+ features/powerpc/efika/0014-powerpc-Small-cleanup-of-EFIKA-platform.txt
-+ features/powerpc/efika/0015-powerpc-Add-a-unified-uevent-handler-for-bus-based-on-of_device.txt
-+ features/powerpc/efika/0016-macintosh-Use-the-new-of_device-common-uevent-handler.txt
-+ features/powerpc/efika/0017-powerpc-Add-uevent-handler-for-of_platform_bus.txt
-+ features/powerpc/efika/0018-powerpc-Add-uevent-handler-for-ibmebus.txt
-+ features/powerpc/efika/0019-MPC5200-Bestcomm-platform-driver.txt
-+ features/powerpc/efika/0020-Fec-MPC5200-eth-driver.txt
-+ features/powerpc/efika/0021-POWERPC-Copy-bestcomm-support-files-into-arch-powerpc.txt
-+ features/powerpc/efika/0022-MPC52xx-PCI-now-working-on-lite5200.-ugly-but-working.txt
-+ features/powerpc/efika/0023-POWERPC-Make-FEC-work-on-the-lite5200.txt
-+ features/powerpc/efika/0024-Add-missing-function-prototype.txt
-+ features/powerpc/efika/0025-POWERPC-Misc-EFIKA-fixups-for-rtas-chrp.txt
-+ features/powerpc/efika/0026-POWERPC-Cleanup-mpc52xx-PCI-support.txt
-+ features/powerpc/efika/0027-POWERPC-Change-name-of-mpc52xx-pci-support-file-in-Makefile.txt
-+ features/powerpc/efika/0028-POWERPC-Change-link-order-so-mpc52xx-fec-always-shows-up-as-eth0.txt
-+ features/powerpc/efika/0029-POWERPC-Fixup-pr_print-format-for-mpc52xx-pci-support.txt
-+ features/powerpc/efika/0030-POWERPC-Add-mpc52xx-lite5200-PCI-support.txt
-+ features/powerpc/efika/0031-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt
-+ features/powerpc/efika/0033-Fix-the-bestcomm-interrupt-property-fixes-the-ethernet-driver.txt
More information about the Kernel-svn-changes
mailing list